DCQ : merge

diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
index f5b403f0dc63bd542cfe390846ba6d9da686a642..770cc70b35a34a44c4eaa3bdfb2efcc563230497 100644 (file)
--- 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 <BRepBuilderAPI_MakeEdge.hxx>
 #include <Precision.hxx>
 
+#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 81e1f1b457a983fd4f9b3d381eb7ed7015031792..bb7159bbbfbedc62252ab27305be82da77d38733 100644 (file)
--- 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 78944ec9152635244d0dfa7237906df5130203a9..e4aab67065924a01d7c15ce3d335ff6e9acd06da 100644 (file)
--- 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 fc32ef9806b878d94462c601ada321e4f798d93f..85d0203b82c6cfa78e130db405ff798ee4e3b209 100644 (file)
--- 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 <GeomFill_SectionGenerator.hxx>
@@ -38,8 +38,14 @@ using namespace std;
 #include <Geom_TrimmedCurve.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <TopExp_Explorer.hxx>
+#include <TopoDS_Iterator.hxx>
 #include <BRep_Tool.hxx>
 #include <Precision.hxx>
+#include <Standard_ErrorHandler.hxx>
+
+#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 d1bc9969e0a6bdbf3df5392a7664e86d48366cc1..adb21593b410145adf1f0e8feb3318ab5dd36f76 100644 (file)
--- 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 <TopoDS_Edge.hxx>
@@ -38,6 +37,10 @@ using namespace std;
 #include <BRepAlgoAPI.hxx>
 #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 b9c8057ec3e3b509cc3d18a1efc73cf334655d3a..90fc67b702bc9be7e1406354da0a6d3ea953e1bb 100644 (file)
--- 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 <BRepPrimAPI_MakePrism.hxx>
 #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 69d69205c3916b6fe683d8dee02cdf20b9e9caf6..0aa52712c9ba7579ab1ff49b4e94bc0cdfeb00de 100644 (file)
--- 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 <gp_Lin.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepPrimAPI_MakeRevol.hxx>
 #include "QAD_Config.h"
+#include <TopExp_Explorer.hxx>
+#include <Standard_ErrorHandler.hxx>
+
+#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 fc9feffb69b5dce97217f1eea714d843ca54c869..838f140e7d8d3cfb3944a67a40148955e0739a03 100644 (file)
--- 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 <BRepPrimAPI_MakeBox.hxx>
 #include <BRepBndLib.hxx>
 
+#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 691fd86942482e299baf219db03450dc7e360ef8..2ddbc82f04438c4cd74d08a004428bdfa4ed4b0c 100644 (file)
--- 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 <BRepBuilderAPI_MakeVertex.hxx>
@@ -34,6 +33,10 @@ using namespace std;
 #include <GProp_GProps.hxx>
 #include <GProp_PrincipalProps.hxx>
 
+#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 fa6d776ca3ab67150d0b6708b646ddf37fdac25a..407824be7705c9b825acbce81850f89e0f490866 100644 (file)
--- 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 <BRepCheck_Analyzer.hxx>
 
 #include <qtextedit.h>
 
+#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 d527eee7fa8d4566cafb0bc075f1c10222a29a21..f33a3415bddb389c9d85e78d2bb1111bed87155b 100644 (file)
--- 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 <gce_MakePln.hxx>
 #include <Precision.hxx>
 
+#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 e8c796ad81f9935915e85353fdcaaea8367b2b3f..8ceaea0538622c579f6f268ee1af2021e4667daf 100644 (file)
--- 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 <BRepGProp.hxx>
 #include <GProp_GProps.hxx>
 #include <GProp_PrincipalProps.hxx>
 
+#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 93f2da25f1ab34a4d54581cbf2e8da1f08e43ad0..04b810b891241a9d926406b0d565ee882dc78187 100644 (file)
--- 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 <TopoDS_Vertex.hxx>
@@ -35,6 +34,10 @@ using namespace std;
 #include <TopExp_Explorer.hxx>
 #include <BRep_Tool.hxx>
 
+#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 934551b8475de3b19aa57b667d892f0d86b288f9..ede6403fa4c68bfba7d3c7ce5a97a897ac30484f 100644 (file)
--- 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 <TopExp_Explorer.hxx>
@@ -34,6 +33,10 @@ using namespace std;
 #include <GProp_GProps.hxx>
 #include <GProp_PrincipalProps.hxx>
 
+#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 6c3f1a91ca566f415a4909390e620631177fd424..3fddd8492f54b33e27faf0efbfd94dc88c833b73 100644 (file)
--- 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 <TopTools_MapOfShape.hxx>
@@ -39,6 +38,10 @@ using namespace std;
 
 #include <BRep_Tool.hxx>
 
+#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 3698d3ffadc71b41aad21813cfd69b1cbc042e0f..b4a171f409589cd68f8110f1d73c7097e41f9ee2 100644 (file)
--- 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 <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
 #include <AIS_InteractiveContext.hxx>
 #include <BRepFilletAPI_MakeChamfer.hxx>
 #include <BRepTools.hxx>

diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx
index d9da9cdae4f486e2e89b84870c6fa55987b25e81..6f81cae0fd59cc268836c753bbae815cc7f24402 100644 (file)
--- 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 <TopoDS_Edge.hxx>
 #include <AIS_InteractiveContext.hxx>
 #include <TopExp_Explorer.hxx>
 #include <BRepFilletAPI_MakeFillet.hxx>

diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
index 641feabfea513232db7b9da948f4aa146d2a74d1..f9af4748de9a503a28ec4547259ed1a965c190e2 100644 (file)
--- 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 <gp_Lin.hxx>
@@ -36,6 +35,10 @@ using namespace std;
 #include <Precision.hxx>
 #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 4eaf7d976092e76b8cccfc5bc118fdfb0fdd0e8a..d12e8dc42542962f7f14b5b05a4a0402e8cf8997 100644 (file)
--- 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 <gp_Lin.hxx>
@@ -35,6 +34,10 @@ using namespace std;
 #include <Precision.hxx>
 #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 3a2c44ff92e6a9da65a89b0d1f820d47ca757833..90aa6db8b943e6f2cd074b66af564bb4ff06d6cd 100644 (file)
--- 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 <gp_Lin.hxx>
@@ -34,6 +33,10 @@ using namespace std;
 #include <BRepAdaptor_Curve.hxx>
 #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 b13756881d8701b45b7e67221a70ee501885f3b2..ab9be2e20347f8431c50e5e469db051afcb1eca9 100644 (file)
--- 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 6571d351c9ad4a4fbf9a7a4f1eb2bf0a7ad628dc..fd88ba8abfc5f204185de9815937e4a127b8c775 100644 (file)
--- 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 <Precision.hxx>
@@ -36,6 +35,10 @@ using namespace std;
 #include <BRepAdaptor_Surface.hxx>
 #include <TopExp_Explorer.hxx>
 
+#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 ef5b63648f4b0474793f2379260eb0db39e4f073..5b9d8126f56b8c087e65d4a8800b00491fac0bea 100644 (file)
--- 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 <BRepBuilderAPI_Transform.hxx>
 #include <Geom_Plane.hxx>
 #include <BRep_Tool.hxx>
 
+#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 479bd01164850eef6d0565c57bd2ef5ab7bf0a1d..2d7b5aae1dd7fbb7d64d1eb0fa99867e8364c723 100644 (file)
--- 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 <gp_Lin.hxx>
@@ -42,6 +41,10 @@ using namespace std;
 #include <BRepBuilderAPI_Transform.hxx>
 #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 39646b6e39b9e6b49aecb80b2c06fca314d58c4b..9a78c2ecbe4c7d0fee086ef57e8a9cda6ec3b56a 100644 (file)
--- 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 <gp_Lin.hxx>
@@ -39,6 +38,10 @@ using namespace std;
 #include <TopoDS_Compound.hxx>
 #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 6fefe1d7842a01917b8aa491ea07b0c50138a74d..6d61325c3ef205a1785781048e67dbd160c53ed3 100644 (file)
--- 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 <gp_Lin.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
 #include <BRepAdaptor_Curve.hxx>
 
+#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 3edcbf8b09a494d7ed4bd11f8bff69d8552801b5..96b875d8b974192eff4032ba2bd2368f18ec80ec 100644 (file)
--- 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 <BRepBuilderAPI_Transform.hxx>
 
+#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 2a38b49eb1688b1a42f9f9a3cd325a5da7137c57..59f6e60d142b87ea58f8fb3dcc11264af28dfa53 100644 (file)
--- 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 <BRepBuilderAPI_Transform.hxx>
 #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