first executable version

diff --git a/src/GEOMBase/GEOMBase_aWarningDlg.h b/src/GEOMBase/GEOMBase_aWarningDlg.h
index 6601062bbec1e63c621df5639d9f59cebb962d01..8e9da348155f4f7e13a6e6616d9f35a9056b3d1f 100644 (file)
--- a/src/GEOMBase/GEOMBase_aWarningDlg.h
+++ b/src/GEOMBase/GEOMBase_aWarningDlg.h
@@ -29,6 +29,8 @@
 #ifndef GEOMBase_aWarningDLG_H
 #define GEOMBase_aWarningDLG_H
 
+#include "GEOM_GEOMBase.hxx"
+
 #include <qdialog.h>
 #include <qwidget.h>
 
@@ -39,7 +41,7 @@ class QPushButton;
 // class    : GEOMBase_aWarningDlg
 // purpose  :
 //=================================================================================
-class GEOMBase_aWarningDlg : public QDialog
+class GEOMBASE_EXPORT GEOMBase_aWarningDlg : public QDialog
 { 
     Q_OBJECT
 

diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx
index 3e8eb2058c0d164fe2b3d97b64240038852f1254..4c2c919752ec41ced5ca3367065e33b6b4d5bbc8 100644 (file)
--- a/src/GEOMClient/GEOM_Client.cxx
+++ b/src/GEOMClient/GEOM_Client.cxx
@@ -53,11 +53,15 @@
 #include <unistd.h>
 #endif
 
+#include <string>
+
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 
 #define HST_CLIENT_LEN 256
 
+using namespace std;
+
 
 
 //=======================================================================

diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
index dc51f139ae70d214359c4ed67d56393ae9885298..87a3f74e7cc17a10dd83d4a40b245a28676eb02d 100644 (file)
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -173,7 +173,7 @@ protected:
 protected:
   Handle(SALOME_InteractiveObject) myIO;
   TopoDS_Shape                     myShape;
-  string                           myName;
+  std::string                      myName;
   int                              myType;
   SALOME_View*                     myViewFrame;
 

diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
index 252a39d7f963bf5f990e7d6890db520ad35b98ec..6be4c561b8c53fb8b1269fc09ddfef8d4b0c01c3 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
@@ -97,6 +97,8 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
+using namespace std;
+
 //=============================================================================
 /*!
  *   constructor:

diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
index 9b8414308680c72abcd14f2580eff28a77209592..e6d048104c793dd191759fdc00a31805c4835214 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
@@ -112,17 +112,17 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations {
 
   struct BCError {
     BCErrorType error;
-    list<int>   incriminated;
+    std::list<int>   incriminated;
   };
 
   Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound,
-                                             list<BCError>&      theErrors);
+                                             std::list<BCError>&      theErrors);
 
   Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound,
-                                          list<BCError>&      theErrors);
+                                          std::list<BCError>&      theErrors);
 
   Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object)  theCompound,
-                                         const list<BCError>& theErrors);
+                                         const std::list<BCError>& theErrors);
 
   Standard_EXPORT Handle(GEOM_Object) RemoveExtraEdges (Handle(GEOM_Object) theShape);
 

diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
index 34bb01148b69bdfbc849d39450086314b1edb93c..04ac4f3df2ec7d6be220739c8202edca41e04aba 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
@@ -36,7 +36,7 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations {
   Standard_EXPORT GEOMImpl_ICurvesOperations(GEOM_Engine* theEngine, int theDocID);
   Standard_EXPORT ~GEOMImpl_ICurvesOperations();
 
-  Standard_EXPORT Handle(GEOM_Object) MakePolyline (list<Handle(GEOM_Object)> thePoints);
+  Standard_EXPORT Handle(GEOM_Object) MakePolyline (std::list<Handle(GEOM_Object)> thePoints);
 
   Standard_EXPORT Handle(GEOM_Object) MakeCircleThreePnt (Handle(GEOM_Object) thePnt1,
                                                           Handle(GEOM_Object) thePnt2,
@@ -60,11 +60,11 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations {
                                                      Handle(GEOM_Object) thePnt3,
                                                      bool                theSense);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier        (list<Handle(GEOM_Object)> thePoints);
-  Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (list<Handle(GEOM_Object)> thePoints);
+  Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier        (std::list<Handle(GEOM_Object)> thePoints);
+  Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (std::list<Handle(GEOM_Object)> thePoints);
 
   Standard_EXPORT Handle(GEOM_Object) MakeSketcher (const TCollection_AsciiString& theCommand,
-                                                    list<double> theWorkingPlane);
+                                                    std::list<double> theWorkingPlane);
   Standard_EXPORT Handle(GEOM_Object) MakeSketcherOnPlane (const TCollection_AsciiString& theCommand,
                                                            Handle(GEOM_Object) theWorkingPlane);
 };

diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
index 9e67bc310d05025e5521f3604dd7e19523f96e04..47dde616fbaf8ead171ee137ea59c1a1072bdfe4 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
@@ -52,6 +52,8 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
+using namespace std;
+
 
 //=============================================================================
 /*!

diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
index 3b36d040fb0bcf835e3cc18fc28eb9e3e0654cef..0d4c57f095fe0e67bf2b95d8bd95ea7426675630 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
@@ -42,17 +42,17 @@ class GEOMImpl_IHealingOperations : public GEOM_IOperations {
                                     const Handle(TColStd_HArray1OfExtendedString)& theValues );
 
   // Retrieve default Shape Process parameters (from resource file)
-  Standard_EXPORT void GetShapeProcessParameters( list<string>& theOperations,
-                                  list<string>& theParams,
-                                  list<string>& theValues );
+  Standard_EXPORT void GetShapeProcessParameters( std::list<string>& theOperations,
+                                  std::list<std::string>& theParams,
+                                  std::list<std::string>& theValues );
 
   // Retrieve default Shape Process parameters for given operator
-  Standard_EXPORT bool GetOperatorParameters( const string theOperation, 
-                              list<string>& theParams,
-                              list<string>& theValues );
+  Standard_EXPORT bool GetOperatorParameters( const std::string theOperation, 
+                              std::list<std::string>& theParams,
+                              std::list<std::string>& theValues );
 
   // returns all parameters that are valid for the given operation (Shape Process operator)
-  Standard_EXPORT static bool GetParameters( const string theOperation, list<string>& theParams );                                      
+  Standard_EXPORT static bool GetParameters( const string theOperation, std::list<std::string>& theParams );                                      
 
   Standard_EXPORT Handle(GEOM_Object) SuppressFaces( Handle(GEOM_Object) theObject,
                                      const Handle(TColStd_HArray1OfInteger)& theFaces);

diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
index 479d1dc8b8180fb2325959382911e8d1b3e7aff6..bceffa675d784602c00dd35558884920cf2b19c6 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
@@ -36,15 +36,15 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations {
 
   Standard_EXPORT Handle(GEOM_Object) MakeFilletAll   (Handle(GEOM_Object) theShape, double theR);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletEdges (Handle(GEOM_Object) theShape, double theR,
-                                       list<int> theEdges);
+                                       std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletEdgesR1R2 (Handle(GEOM_Object) theShape,
                                                            double theR1, double theR2,
-                                                           list<int> theEdges);
+                                                           std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR,
-                                       list<int> theFaces);
+                                       std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletFacesR1R2 (Handle(GEOM_Object) theShape,
                                                            double theR1, double theR2,
-                                                           list<int> theFaces);
+                                                           std::list<int> theFaces);
 
   Standard_EXPORT Handle(GEOM_Object) MakeChamferAll   (Handle(GEOM_Object) theShape, double theD);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdge  (Handle(GEOM_Object) theShape,
@@ -55,16 +55,16 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations {
                                         int theFace1, int theFace2);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferFaces (Handle(GEOM_Object) theShape,
                                         double theD1, double theD2,
-                                        list<int> theFaces);
+                                        std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferFacesAD (Handle(GEOM_Object) theShape,
                                         double theD, double theAngle,
-                                        list<int> theFaces);
+                                        std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdges (Handle(GEOM_Object) theShape,
                                         double theD1, double theD2,
-                                        list<int> theEdges);
+                                        std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdgesAD (Handle(GEOM_Object) theShape,
                                         double theD, double theAngle,
-                                        list<int> theEdges);
+                                        std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeArchimede (Handle(GEOM_Object) theShape,
                                      double theWeight, double theWaterDensity,
                                      double theMeshingDeflection);

diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
index 4f09b784d91fdc481ba8c13eabf6f66bba81d48f..ff5f7a1377a2aa2bf2e67ab80244ec7e8b295d15 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
@@ -127,6 +127,8 @@
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <Precision.hxx>
 
+using namespace std;
+
 //=============================================================================
 /*!
  *   constructor:

diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
index 1e8cdc2c80a992099dbfac4be5e73e5cf41eae12..8e5c6067fb7fc74b726636573d91076032b4e85e 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
@@ -54,20 +54,20 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
   Standard_EXPORT Handle(GEOM_Object) MakeEdge (Handle(GEOM_Object) thePoint1,
                                 Handle(GEOM_Object) thePoint2);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeWire (list<Handle(GEOM_Object)> theEdgesAndWires);
+  Standard_EXPORT Handle(GEOM_Object) MakeWire (std::list<Handle(GEOM_Object)> theEdgesAndWires);
 
   Standard_EXPORT Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (list<Handle(GEOM_Object)> theWires,
+  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (std::list<Handle(GEOM_Object)> theWires,
                                      const bool isPlanarWanted);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeShell (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeShell (std::list<Handle(GEOM_Object)> theShapes);
 
   Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (list<Handle(GEOM_Object)> theShells);
+  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (std::list<Handle(GEOM_Object)> theShells);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeCompound (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeCompound (std::list<Handle(GEOM_Object)> theShapes);
 
   Standard_EXPORT Handle(GEOM_Object) MakeGlueFaces (Handle(GEOM_Object) theShape,
                                                     const Standard_Real theTolerance,
@@ -78,7 +78,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   Standard_EXPORT Handle(GEOM_Object) MakeGlueFacesByList (Handle(GEOM_Object) theShape,
                                                           const Standard_Real theTolerance,
-                                                          list<Handle(GEOM_Object)> theFaces,
+                                                          std::list<Handle(GEOM_Object)> theFaces,
                                                            const Standard_Boolean doKeepNonSolids);
 
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient) MakeExplode (Handle(GEOM_Object)    theShape,
@@ -285,7 +285,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
   Standard_EXPORT static bool CheckTriangulation (const TopoDS_Shape& theShape);
 
  private:
-  Handle(GEOM_Object) MakeShape (list<Handle(GEOM_Object)>      theShapes,
+  Handle(GEOM_Object) MakeShape (std::list<Handle(GEOM_Object)>      theShapes,
                                  const Standard_Integer         theObjectType,
                                  const Standard_Integer         theFunctionType,
                                  const TCollection_AsciiString& theMethodName);

diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc
index 3d5c87c468be22892a2cdb04f029c1dfb32e00e0..c3481a721cd89254c445d8fbb972fe70d1a024c5 100644 (file)
--- a/src/GEOM_I/GEOM_IOperations_i.cc
+++ b/src/GEOM_I/GEOM_IOperations_i.cc
@@ -18,14 +18,13 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #include "GEOM_IOperations_i.hh"
-
-#include "GEOM_Engine.hxx"
+#include "GEOM_Object.hxx"
+#include "GEOM_IOperations.hxx"
 
 #include "utilities.h"
 #include "OpUtil.hxx"
 #include "Utils_ExceptHandlers.hxx"
 
-#include <Standard_Stream.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Tool.hxx>
 

diff --git a/src/GEOM_I/GEOM_IOperations_i.hh b/src/GEOM_I/GEOM_IOperations_i.hh
index c425449dc8406c26a60d7679f446398ced3006a4..52f4c55b951730306c28893b65f777a22d57bf0a 100644 (file)
--- a/src/GEOM_I/GEOM_IOperations_i.hh
+++ b/src/GEOM_I/GEOM_IOperations_i.hh
@@ -17,16 +17,17 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #ifndef _GEOM_IOperations_i_HeaderFile
 #define _GEOM_IOperations_i_HeaderFile
 
+#include "GEOM_GEOM_I.hxx"
+
 #include "GEOMImpl_Gen.hxx"
 
 #include <SALOMEconfig.h>
-
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 #include "SALOME_GenericObj_i.hh" 
+
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Object_i.hh" 
 #include "GEOM_Object.hxx"

diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc
index 6d9bf7fcc7a6ef351c2438d21f763e05a17e5d8a..a8c79b8a5c6b1bb4f335b0474ff32cab42e72e00 100644 (file)
--- a/src/GEOM_I/GEOM_IShapesOperations_i.cc
+++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc
@@ -17,7 +17,8 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <Standard_Stream.hxx>
+#include "GEOM_Object.hxx"
+#include "GEOMImpl_IShapesOperations.hxx"
 
 #include "GEOM_IShapesOperations_i.hh"
 
@@ -25,12 +26,15 @@
 #include "OpUtil.hxx"
 #include "Utils_ExceptHandlers.hxx"
 
-#include "GEOM_Engine.hxx"
-#include "GEOM_Object.hxx"
-
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 
+#include <list>
+
+using namespace std;
+
+//#define GetObjectA GetObject
+
 //=============================================================================
 /*!
  *   constructor:

diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.hh b/src/GEOM_I/GEOM_IShapesOperations_i.hh
index de1b24be14b8895552248132c61bb1d9ef43b283..be1ac19b73ebb03e89c836d35a57ff36c47889fb 100644 (file)
--- a/src/GEOM_I/GEOM_IShapesOperations_i.hh
+++ b/src/GEOM_I/GEOM_IShapesOperations_i.hh
@@ -21,13 +21,12 @@
 #ifndef _GEOM_IShapesOperations_i_HeaderFile
 #define _GEOM_IShapesOperations_i_HeaderFile
 
-#include "GEOMImpl_Gen.hxx"
+#include "GEOM_GEOM_I.hxx"
 
 #include <SALOMEconfig.h>
-
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 #include "GEOM_IOperations_i.hh"
-#include "GEOM_Object_i.hh"
+#include "GEOMImpl_Gen.hxx"
 
 #include "GEOMImpl_IShapesOperations.hxx"
 

diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index 4a86443b64649dd578f5123654e9a25b3bff4c23..80537ccf66aa02103f3950dc52ed20e3673cf80d 100644 (file)
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -17,10 +17,7 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <Standard_OStream.hxx>
-
 #include <GEOM_Object_i.hh>
-//#include <GEOM_Gen_i.hh>
 #include <GEOM_ISubShape.hxx>
 #include <GEOMImpl_Types.hxx>
 
@@ -34,6 +31,7 @@
 #include <TDF_Label.hxx>
 #include <TCollection_AsciiString.hxx>
 
+#include <Standard_OStream.hxx>
 #include <BRepTools_ShapeSet.hxx>
 #include <BRepTools.hxx>
 #include <TopAbs.hxx>

diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh
index 56631b7f0e7e8f1493cb124374b2584722c5358f..7e9717bc5a22853c8878f34ba9a5e1d74fb66bcd 100644 (file)
--- a/src/GEOM_I/GEOM_Object_i.hh
+++ b/src/GEOM_I/GEOM_Object_i.hh
@@ -23,18 +23,17 @@
 
 #include "GEOM_GEOM_I.hxx"
 
-#include "GEOMImpl_Gen.hxx"
-
 #include <SALOMEconfig.h>
-#include CORBA_CLIENT_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(GEOM_Gen)
-
+#include CORBA_CLIENT_HEADER(SALOMEDS)
 #include "SALOME_GenericObj_i.hh"
 
+#include "GEOMImpl_Gen.hxx"
 #include "GEOM_Object.hxx"
 
 #include <TopoDS_Shape.hxx>
 
+
 class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual SALOME::GenericObj_i
 {
  public:

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index 5aafaee7cc99427dfbb32aefcd46516faf85ca34..cdf215c7d296a1057d82bdf50d0cab38d8271536 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -46,6 +46,9 @@
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TColStd_MapOfInteger.hxx>
 
+#include <string>
+using namespace std;
+
 
 GroupGUI_GroupDlg::GroupGUI_GroupDlg(Mode mode, GeometryGUI* theGeometryGUI, QWidget* parent)
   :GEOMBase_Skeleton( theGeometryGUI, parent, "GroupGUI_GroupDlg", false,

diff --git a/src/OBJECT/GEOM_DeviceActor.h b/src/OBJECT/GEOM_DeviceActor.h
index 85809daf54dad48e6bbdd94290d01c14124e52c5..6baa1819c34861f73eeeffdd943b717638ad90a0 100755 (executable)
--- a/src/OBJECT/GEOM_DeviceActor.h
+++ b/src/OBJECT/GEOM_DeviceActor.h
@@ -1,6 +1,7 @@
 #ifndef GEOM_DEVICEACTOR_H 
 #define GEOM_DEVICEACTOR_H 
- 
+
+#include "GEOM_OBJECT_defs.hxx"
 #include "GEOM_SmartPtr.h" 
  
 class vtkPoints; 
@@ -24,7 +25,7 @@ class vtkRenderer;
 #include <vtkObject.h> 
  
  
-class VTK_EXPORT GEOM_DeviceActor: public vtkObject 
+class GEOM_OBJECT_EXPORT GEOM_DeviceActor: public vtkObject 
 {  
 public: 
   vtkTypeMacro(GEOM_DeviceActor,vtkObject); 

diff --git a/src/OBJECT/GEOM_EdgeSource.h b/src/OBJECT/GEOM_EdgeSource.h
index 56813e0fb454df61c5c714be05828b93488991c5..adea7275696f7ee7cecd60638ae2f8a120218e44 100755 (executable)
--- a/src/OBJECT/GEOM_EdgeSource.h
+++ b/src/OBJECT/GEOM_EdgeSource.h
@@ -1,6 +1,7 @@
 #ifndef GEOM_EDGESOURCE_H 
 #define GEOM_EDGESOURCE_H 
- 
+
+#include "GEOM_OBJECT_defs.hxx"
 #include "GEOM_DeviceActor.h" 
  
 #include <TopoDS_Edge.hxx> 
@@ -11,7 +12,7 @@ typedef NCollection_Set<TopoDS_Edge> TEdgeSet;
 #include <vtkPolyDataSource.h> 
  
  
-class VTK_EXPORT GEOM_EdgeSource: public vtkPolyDataSource 
+class GEOM_OBJECT_EXPORT GEOM_EdgeSource: public vtkPolyDataSource 
 { 
 public: 
   vtkTypeMacro(GEOM_EdgeSource,vtkPolyDataSource); 

diff --git a/src/OBJECT/GEOM_FaceSource.h b/src/OBJECT/GEOM_FaceSource.h
index 8c03167af65c4007184ae356f4e84edb9a13c833..54d83a93894ad8b0baa0d0b16596f844bce333a0 100755 (executable)
--- a/src/OBJECT/GEOM_FaceSource.h
+++ b/src/OBJECT/GEOM_FaceSource.h
@@ -1,6 +1,7 @@
 #ifndef GEOM_FACESOURCE_H 
 #define GEOM_FACESOURCE_H 
  
+#include "GEOM_OBJECT_defs.hxx"
 #include "GEOM_DeviceActor.h" 
  
 #include <gp_Pnt.hxx>
@@ -15,7 +16,7 @@ class GEOM_FaceSource;
 typedef GEOM_SmartPtr<GEOM_FaceSource> PFaceSource; 
  
  
-class VTK_EXPORT GEOM_FaceSource: public vtkPolyDataSource 
+class GEOM_OBJECT_EXPORT GEOM_FaceSource: public vtkPolyDataSource 
 { 
 public: 
   vtkTypeMacro(GEOM_FaceSource,vtkPolyDataSource); 

diff --git a/src/OBJECT/GEOM_OBJECT_defs.hxx b/src/OBJECT/GEOM_OBJECT_defs.hxx
index 3377ce908a68b4195c6b8c0c91b73d075a5d3e00..3900b515241cc08fd01ec82b62f92b0ea0b777e2 100755 (executable)
--- a/src/OBJECT/GEOM_OBJECT_defs.hxx
+++ b/src/OBJECT/GEOM_OBJECT_defs.hxx
@@ -27,21 +27,13 @@
 #define _GEOM_OBJECT_defs_HXX_
 
 #ifdef WNT
- #if defined OBJECT_EXPORTS
-  #if defined WIN32
-   #define GEOM_OBJECT_EXPORT __declspec( dllexport )
-  #else
-   #define GEOM_OBJECT_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_OBJECT_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_OBJECT_EXPORT
-  #endif
- #endif
+# if defined GEOM_OBJECT_EXPORTS
+#   define GEOM_OBJECT_EXPORT __declspec( dllexport )
+# else
+#   define GEOM_OBJECT_EXPORT __declspec( dllimport )
+# endif
 #else
- #define GEOM_OBJECT_EXPORT
+# define GEOM_OBJECT_EXPORT
 #endif
 
 #endif

diff --git a/src/OBJECT/GEOM_ShadingFace.h b/src/OBJECT/GEOM_ShadingFace.h
index 4414f9f2944639b089e1022e722a9f67e8a5ea0c..e940de6983c312c5b2058a83dc7cd9040eacdd19 100755 (executable)
--- a/src/OBJECT/GEOM_ShadingFace.h
+++ b/src/OBJECT/GEOM_ShadingFace.h
@@ -1,10 +1,11 @@
 #ifndef GEOM_SHADINGFACE_H 
 #define GEOM_SHADINGFACE_H 
- 
+
+#include "GEOM_OBJECT_defs.hxx"
 #include "GEOM_FaceSource.h" 
  
  
-class VTK_EXPORT GEOM_ShadingFace: public GEOM_FaceSource 
+class GEOM_OBJECT_EXPORT GEOM_ShadingFace: public GEOM_FaceSource 
 { 
 public: 
   vtkTypeMacro(GEOM_ShadingFace,GEOM_FaceSource); 

diff --git a/src/OBJECT/GEOM_VertexSource.h b/src/OBJECT/GEOM_VertexSource.h
index 46a64f0dea9b51927a49427bca71d81e77a4fb5c..7d30f9a2a7271ab1d7cd46de1fe30e61b008145f 100755 (executable)
--- a/src/OBJECT/GEOM_VertexSource.h
+++ b/src/OBJECT/GEOM_VertexSource.h
@@ -1,6 +1,7 @@
 #ifndef GEOM_VERTEXSOURCE_H 
 #define GEOM_VERTEXSOURCE_H 
  
+#include "GEOM_OBJECT_defs.hxx"
 #include "GEOM_DeviceActor.h" 
  
 #include <TopoDS_Vertex.hxx> 
@@ -11,7 +12,7 @@ typedef NCollection_Set<TopoDS_Vertex> TVertexSet;
 #include <vtkPolyDataSource.h> 
  
  
-class VTK_EXPORT GEOM_VertexSource: public vtkPolyDataSource 
+class GEOM_OBJECT_EXPORT GEOM_VertexSource: public vtkPolyDataSource 
 { 
 public: 
   vtkTypeMacro(GEOM_VertexSource,vtkPolyDataSource); 

diff --git a/src/OBJECT/GEOM_WireframeFace.h b/src/OBJECT/GEOM_WireframeFace.h
index cdbe122b3a895f50da2d1840a43ecfaf2179675c..cb855669cbca329bf13d20dcb4f87282525a37b9 100755 (executable)
--- a/src/OBJECT/GEOM_WireframeFace.h
+++ b/src/OBJECT/GEOM_WireframeFace.h
@@ -1,6 +1,7 @@
 #ifndef GEOM_WIREFRAME_FACE_H 
 #define GEOM_WIREFRAME_FACE_H 
  
+#include "GEOM_OBJECT_defs.hxx"
 #include "GEOM_FaceSource.h" 
 
 #include <GeomAbs_IsoType.hxx>
@@ -9,7 +10,7 @@
 #include <vtkPolyDataSource.h> 
  
  
-class VTK_EXPORT GEOM_WireframeFace: public GEOM_FaceSource 
+class GEOM_OBJECT_EXPORT GEOM_WireframeFace: public GEOM_FaceSource 
 { 
 public: 
   vtkTypeMacro(GEOM_WireframeFace,GEOM_FaceSource);