From 8b14e1e649e98fdb819b5483b8aa16085c5269db Mon Sep 17 00:00:00 2001 From: dcq Date: Tue, 4 May 2004 14:16:44 +0000 Subject: [PATCH] DCQ : merge --- src/BuildGUI/BuildGUI_EdgeDlg.cxx | 5 ++- src/GEOMGUI/GeometryGUI_Swig.cxx | 1 + src/GEOMToolsGUI/GEOMToolsGUI.cxx | 16 +++++--- .../GenerationGUI_FillingDlg.cxx | 17 +++++++- src/GenerationGUI/GenerationGUI_PipeDlg.cxx | 5 ++- src/GenerationGUI/GenerationGUI_PrismDlg.cxx | 5 ++- src/GenerationGUI/GenerationGUI_RevolDlg.cxx | 39 ++++++++++++++++--- src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx | 5 ++- src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx | 5 ++- src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx | 5 ++- src/MeasureGUI/MeasureGUI_DistanceDlg.cxx | 9 ++++- src/MeasureGUI/MeasureGUI_InertiaDlg.cxx | 5 ++- src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx | 5 ++- src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx | 5 ++- src/MeasureGUI/MeasureGUI_WhatisDlg.cxx | 9 +++-- src/OperationGUI/OperationGUI_ChamferDlg.cxx | 2 + src/OperationGUI/OperationGUI_FilletDlg.cxx | 1 + src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx | 5 ++- src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx | 5 ++- src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx | 5 ++- src/RepairGUI/RepairGUI.cxx | 5 ++- src/RepairGUI/RepairGUI_OrientationDlg.cxx | 5 ++- .../TransformationGUI_MirrorDlg.cxx | 5 ++- .../TransformationGUI_MultiRotationDlg.cxx | 5 ++- .../TransformationGUI_MultiTranslationDlg.cxx | 5 ++- .../TransformationGUI_RotationDlg.cxx | 5 ++- .../TransformationGUI_ScaleDlg.cxx | 5 ++- .../TransformationGUI_TranslationDlg.cxx | 5 ++- 28 files changed, 156 insertions(+), 38 deletions(-) diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx index f5b403f0d..770cc70b3 100644 --- a/src/BuildGUI/BuildGUI_EdgeDlg.cxx +++ b/src/BuildGUI/BuildGUI_EdgeDlg.cxx @@ -26,12 +26,15 @@ // Module : GEOM // $Header$ -using namespace std; #include "BuildGUI_EdgeDlg.h" #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BuildGUI_EdgeDlg() // purpose : Constructs a BuildGUI_EdgeDlg which is a child of 'parent', with the diff --git a/src/GEOMGUI/GeometryGUI_Swig.cxx b/src/GEOMGUI/GeometryGUI_Swig.cxx index 81e1f1b45..bb7159bbb 100644 --- a/src/GEOMGUI/GeometryGUI_Swig.cxx +++ b/src/GEOMGUI/GeometryGUI_Swig.cxx @@ -264,6 +264,7 @@ const char* GEOM_Swig::getShapeTypeString(const char* IOR) case TopAbs_SHAPE: { return "Shape" ;} } + return 0; } diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index 78944ec91..e4aab6706 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header: -using namespace std; #include "GEOMToolsGUI.h" #include "QAD_Config.h" @@ -61,6 +60,10 @@ using namespace std; #include "GEOMToolsGUI_NbIsosDlg.h" // Method ISOS adjustement #include "GEOMToolsGUI_TransparencyDlg.h" // Method TRANSPARENCY adjustement +#include "utilities.h" + +using namespace std; + //======================================================================= // function : GEOMToolsGUI() // purpose : Constructor @@ -151,7 +154,7 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent) { if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC) break; - + OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); Handle (AIS_InteractiveContext) ic = v3d->getAISContext(); @@ -792,7 +795,7 @@ bool GEOMToolsGUI::Import(int aState) QString nameShape = QAD_Tools::getFileNameFromPath(file,false) + QString("_%1").arg(myGeomGUI->myNbGeom++); - if(myGeomBase->Display(aShape, strdup(nameShape.latin1()))) { + if(myGeomBase->Display(aShape, (char*)nameShape.latin1())) { QAD_Application::getDesktop()->getActiveStudy()->setMessage( tr("GEOM_INF_LOADED").arg(QAD_Tools::getFileNameFromPath( file )) ); QAD_Application::getDesktop()->putInfo( tr("GEOM_PRP_READY")); } @@ -840,7 +843,7 @@ bool GEOMToolsGUI::Export(int aState) QApplication::setOverrideCursor( Qt::waitCursor ); // Standard_Boolean result = BRepTools::Write(Shape->Shape(), strdup(file.latin1()) ); try { - myGeom->ExportBREP(strdup( file.latin1()), aShape); + myGeom->ExportBREP((char*)file.latin1(), aShape); } catch (const SALOME::SALOME_Exception& S_ex) { QtCatchCorbaException(S_ex); @@ -867,7 +870,7 @@ bool GEOMToolsGUI::Export(int aState) if ( !file.isEmpty() && !aShape->_is_nil() ) { QApplication::setOverrideCursor( Qt::waitCursor ); try { - myGeom->ExportIGES(strdup( file.latin1()), aShape); + myGeom->ExportIGES((char*)file.latin1(), aShape); } catch (const SALOME::SALOME_Exception& S_ex) { QtCatchCorbaException(S_ex); @@ -913,7 +916,7 @@ bool GEOMToolsGUI::Export(int aState) QApplication::setOverrideCursor( Qt::waitCursor ) ; try { - myGeom->ExportSTEP(strdup( file.latin1()), aShape); + myGeom->ExportSTEP((char*)file.latin1(), aShape); } catch (const SALOME::SALOME_Exception& S_ex) { QtCatchCorbaException(S_ex); @@ -939,6 +942,7 @@ bool GEOMToolsGUI::Export(int aState) } QApplication::restoreOverrideCursor() ; + return true; } diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx index fc32ef980..85d0203b8 100644 --- a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx @@ -26,9 +26,9 @@ // Module : GEOM // $Header$ -using namespace std; #include "GenerationGUI_FillingDlg.h" +#include "QAD_WaitCursor.h" #include "QAD_Config.h" #include @@ -38,8 +38,14 @@ using namespace std; #include #include #include +#include #include #include +#include + +#include "utilities.h" + +using namespace std; //================================================================================= // class : GenerationGUI_FillingDlg() @@ -210,10 +216,14 @@ void GenerationGUI_FillingDlg::SelectionIntoArgument() return; if(myEditCurrentArgument == GroupPoints->LineEdit1 && mySectionShape.ShapeType() == TopAbs_COMPOUND) { - myEditCurrentArgument->setText(aString); myGeomShape = myGeomBase->ConvertIOinGEOMShape(IO, testResult); if(!testResult) return; + // mySectionShape should be a compound of edges + for ( TopoDS_Iterator it( mySectionShape ); it.More(); it.Next() ) + if ( it.Value().ShapeType() != TopAbs_EDGE ) + return; + myEditCurrentArgument->setText(aString); myOkSectionShape = true; } @@ -319,6 +329,8 @@ void GenerationGUI_FillingDlg::ValueChangedInSpinBox(double newValue) //================================================================================= void GenerationGUI_FillingDlg::MakeFillingSimulationAndDisplay() { + QAD_WaitCursor wc; + myGeomBase->EraseSimulationShape(); mySimulationTopoDs.Nullify(); @@ -336,6 +348,7 @@ void GenerationGUI_FillingDlg::MakeFillingSimulationAndDisplay() if( Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE) return; C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last); + if (C.IsNull()) continue; C = new Geom_TrimmedCurve(C, First, Last); Section.AddCurve(C) ; i++ ; diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx index d1bc9969e..adb21593b 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "GenerationGUI_PipeDlg.h" #include @@ -38,6 +37,10 @@ using namespace std; #include #endif +#include "utilities.h" + +using namespace std; + //================================================================================= // class : GenerationGUI_PipeDlg() // purpose : Constructs a GenerationGUI_PipeDlg which is a child of 'parent', with the diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx index b9c8057ec..90fc67b70 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx @@ -26,12 +26,15 @@ // Module : GEOM // $Header$ -using namespace std; #include "GenerationGUI_PrismDlg.h" #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : GenerationGUI_PrismDlg() // purpose : Constructs a GenerationGUI_PrismDlg which is a child of 'parent', with the diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx index 69d69205c..0aa52712c 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx @@ -26,13 +26,18 @@ // Module : GEOM // $Header$ -using namespace std; #include "GenerationGUI_RevolDlg.h" #include #include #include #include "QAD_Config.h" +#include +#include + +#include "utilities.h" + +using namespace std; //================================================================================= // class : GenerationGUI_RevolDlg() @@ -157,6 +162,32 @@ void GenerationGUI_RevolDlg::ClickOnApply() return; } +//======================================================================= +//function : isAcceptableBase +//purpose : return true if theBase can be used as algo argument +//======================================================================= + +static bool isAcceptableBase(const TopoDS_Shape& theBase) +{ + switch ( theBase.ShapeType() ) { + case TopAbs_VERTEX: + case TopAbs_EDGE: + case TopAbs_WIRE: + case TopAbs_FACE: + case TopAbs_SHELL: + return true; + case TopAbs_SOLID: + case TopAbs_COMPSOLID: + return false; + case TopAbs_COMPOUND: { + TopExp_Explorer exp( theBase, TopAbs_SOLID); + return !exp.More(); + } + default: + return false; + } + return false; +} //================================================================================= // function : SelectionIntoArgument() @@ -189,8 +220,7 @@ void GenerationGUI_RevolDlg::SelectionIntoArgument() myGeomShape = myGeomBase->ConvertIOinGEOMShape(IO, testResult); if(!testResult) return; - TopAbs_ShapeEnum aType = S.ShapeType(); - if(aType != TopAbs_VERTEX && aType != TopAbs_EDGE && aType != TopAbs_WIRE && aType != TopAbs_FACE && aType != TopAbs_SHELL && aType != TopAbs_COMPOUND) + if( !isAcceptableBase( S )) return; myEditCurrentArgument->setText(aString); myOkBase = true; @@ -318,8 +348,7 @@ void GenerationGUI_RevolDlg::MakeRevolutionSimulationAndDisplay() myGeomBase->EraseSimulationShape(); mySimulationTopoDs.Nullify(); - TopAbs_ShapeEnum aType = myBase.ShapeType(); - if(aType != TopAbs_VERTEX && aType != TopAbs_EDGE && aType != TopAbs_WIRE && aType != TopAbs_FACE && aType != TopAbs_SHELL && aType !=TopAbs_COMPOUND) + if (!isAcceptableBase( myBase )) return; try { diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx index fc9feffb6..838f140e7 100644 --- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx @@ -26,12 +26,15 @@ // Module : GEOM // $Header$ -using namespace std; #include "MeasureGUI_BndBoxDlg.h" #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : MeasureGUI_BndBoxDlg() // purpose : Constructs a MeasureGUI_BndBoxDlg which is a child of 'parent', with the diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx index 691fd8694..2ddbc82f0 100644 --- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "MeasureGUI_CenterMassDlg.h" #include @@ -34,6 +33,10 @@ using namespace std; #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : MeasureGUI_CenterMassDlg() // purpose : Constructs a MeasureGUI_CenterMassDlg which is a child of 'parent', with the diff --git a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx index fa6d776ca..407824be7 100644 --- a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx @@ -26,13 +26,16 @@ // Module : GEOM // $Header$ -using namespace std; #include "MeasureGUI_CheckShapeDlg.h" #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : MeasureGUI_CheckShapeDlg() // purpose : Constructs a MeasureGUI_CheckShapeDlg which is a child of 'parent', with the diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx index d527eee7f..f33a3415b 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "MeasureGUI_DistanceDlg.h" #include "QAD_RightFrame.h" @@ -42,6 +41,10 @@ using namespace std; #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : MeasureGUI_DistanceDlg() // purpose : Constructs a MeasureGUI_DistanceDlg which is a child of 'parent', with the @@ -322,7 +325,9 @@ void MeasureGUI_DistanceDlg::MakeDistanceSimulationAndDisplay(const TopoDS_Shape gp_Pln gp_P = gce_MP.Value(); Handle(Geom_Plane) P = new Geom_Plane(gp_P); - Handle(AIS_LengthDimension) Distance = new AIS_LengthDimension(V1, V2, P, Dist, TCollection_ExtendedString(strdup(S))); + char* aCopyS = CORBA::string_dup(S); + Handle(AIS_LengthDimension) Distance = new AIS_LengthDimension(V1, V2, P, Dist, TCollection_ExtendedString(aCopyS)); + delete(aCopyS); GroupC1->LineEdit3->setText(S); diff --git a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx index e8c796ad8..8ceaea053 100644 --- a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx @@ -25,13 +25,16 @@ // Author : Lucien PIGNOLONI // Module : GEOM -using namespace std; #include "MeasureGUI_InertiaDlg.h" #include #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : MeasureGUI_InertiaDlg() // purpose : Constructs a MeasureGUI_InertiaDlg which is a child of 'parent', with the diff --git a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx index 93f2da25f..04b810b89 100644 --- a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "MeasureGUI_MaxToleranceDlg.h" #include @@ -35,6 +34,10 @@ using namespace std; #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : MeasureGUI_MaxToleranceDlg() // purpose : Constructs a MeasureGUI_MaxToleranceDlg which is a child of 'parent', with the diff --git a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx index 934551b84..ede6403fa 100644 --- a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "MeasureGUI_PropertiesDlg.h" #include @@ -34,6 +33,10 @@ using namespace std; #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : MeasureGUI_PropertiesDlg() // purpose : Constructs a MeasureGUI_PropertiesDlg which is a child of 'parent', with the diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx index 6c3f1a91c..3fddd8492 100644 --- a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "MeasureGUI_WhatisDlg.h" #include @@ -39,6 +38,10 @@ using namespace std; #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : MeasureGUI_WhatisDlg() // purpose : Constructs a MeasureGUI_WhatisDlg which is a child of 'parent', with the @@ -216,11 +219,11 @@ void MeasureGUI_WhatisDlg::CalculateWhatis(const TopoDS_Shape& S) if ( S.ShapeType() == TopAbs_EDGE ) { if( BRep_Tool::Degenerated(TopoDS::Edge(S)) ) { - Astr = Astr + " " + strdup(SelectedName.latin1()) + " is a degenerated edge \n"; + Astr = Astr + " " + CORBA::string_dup(SelectedName.latin1()) + " is a degenerated edge \n"; } } - Astr = Astr + " Number of shapes in " + strdup(SelectedName.latin1()) + " : \n"; + Astr = Astr + " Number of shapes in " + CORBA::string_dup(SelectedName.latin1()) + " : \n"; try { int iType, nbTypes [TopAbs_SHAPE]; diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx index 3698d3ffa..b4a171f40 100644 --- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx +++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx @@ -32,6 +32,8 @@ using namespace std; #include "DisplayGUI.h" #include "QAD_MessageBox.h" +#include +#include #include #include #include diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx index d9da9cdae..6f81cae0f 100644 --- a/src/OperationGUI/OperationGUI_FilletDlg.cxx +++ b/src/OperationGUI/OperationGUI_FilletDlg.cxx @@ -32,6 +32,7 @@ using namespace std; #include "DisplayGUI.h" #include "QAD_MessageBox.h" +#include #include #include #include diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx index 641feabfe..f9af4748d 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "PrimitiveGUI_ConeDlg.h" #include @@ -36,6 +35,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : PrimitiveGUI_ConeDlg() // purpose : Constructs a PrimitiveGUI_ConeDlg which is a child of 'parent', with the diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx index 4eaf7d976..d12e8dc42 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "PrimitiveGUI_CylinderDlg.h" #include @@ -35,6 +34,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : PrimitiveGUI_CylinderDlg() // purpose : Constructs a PrimitiveGUI_CylinderDlg which is a child of 'parent', with the diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx index 3a2c44ff9..90aa6db8b 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "PrimitiveGUI_TorusDlg.h" #include @@ -34,6 +33,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : PrimitiveGUI_TorusDlg() // purpose : Constructs a PrimitiveGUI_TorusDlg which is a child of 'parent', with the diff --git a/src/RepairGUI/RepairGUI.cxx b/src/RepairGUI/RepairGUI.cxx index b13756881..ab9be2e20 100644 --- a/src/RepairGUI/RepairGUI.cxx +++ b/src/RepairGUI/RepairGUI.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header: -using namespace std; #include "RepairGUI.h" #include "QAD_RightFrame.h" @@ -38,6 +37,10 @@ using namespace std; #include "RepairGUI_SuppressFacesDlg.h" // Method SUPPRESS FACES #include "RepairGUI_SuppressHoleDlg.h" // Method SUPPRESS HOLE +#include "utilities.h" + +using namespace std; + //======================================================================= // function : RepairGUI() // purpose : Constructor diff --git a/src/RepairGUI/RepairGUI_OrientationDlg.cxx b/src/RepairGUI/RepairGUI_OrientationDlg.cxx index 6571d351c..fd88ba8ab 100644 --- a/src/RepairGUI/RepairGUI_OrientationDlg.cxx +++ b/src/RepairGUI/RepairGUI_OrientationDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "RepairGUI_OrientationDlg.h" #include @@ -36,6 +35,10 @@ using namespace std; #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : RepairGUI_OrientationDlg() // purpose : Constructs a RepairGUI_OrientationDlg which is a child of 'parent', with the diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx index ef5b63648..5b9d8126f 100644 --- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx @@ -26,13 +26,16 @@ // Module : GEOM // $Header$ -using namespace std; #include "TransformationGUI_MirrorDlg.h" #include #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : TransformationGUI_MirrorDlg() // purpose : Constructs a TransformationGUI_MirrorDlg which is a child of 'parent', with the diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx index 479bd0116..2d7b5aae1 100644 --- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "TransformationGUI_MultiRotationDlg.h" #include @@ -42,6 +41,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : TransformationGUI_MultiRotationDlg() // purpose : Constructs a TransformationGUI_MultiRotationDlg which is a child of 'parent', with the diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx index 39646b6e3..9a78c2ecb 100644 --- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "TransformationGUI_MultiTranslationDlg.h" #include @@ -39,6 +38,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : TransformationGUI_MultiTranslationDlg() // purpose : Constructs a TransformationGUI_MultiTranslationDlg which is a child of 'parent', with the diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx index 6fefe1d78..6d61325c3 100644 --- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx @@ -26,13 +26,16 @@ // Module : GEOM // $Header$ -using namespace std; #include "TransformationGUI_RotationDlg.h" #include #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : TransformationGUI_RotationDlg() // purpose : Constructs a TransformationGUI_RotationDlg which is a child of 'parent', with the diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx index 3edcbf8b0..96b875d8b 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx @@ -26,11 +26,14 @@ // Module : GEOM // $Header$ -using namespace std; #include "TransformationGUI_ScaleDlg.h" #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : TransformationGUI_ScaleDlg() // purpose : Constructs a TransformationGUI_ScaleDlg which is a child of 'parent', with the diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx index 2a38b49eb..59f6e60d1 100644 --- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx @@ -26,12 +26,15 @@ // Module : GEOM // $Header$ -using namespace std; #include "TransformationGUI_TranslationDlg.h" #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : TransformationGUI_TranslationDlg() // purpose : Constructs a TransformationGUI_TranslationDlg which is a child of 'parent', with the -- 2.39.2