Windows porting

diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx
index dc1d3cd4ed59adb91c39fea969e46ef9233f623c..3b7a2c08a19ca852eec5d27c00cb3632bff895e5 100644 (file)
--- a/src/BuildGUI/BuildGUI_FaceDlg.cxx
+++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "BuildGUI_FaceDlg.h"
 #include "GEOMImpl_Types.hxx"
 
@@ -38,6 +37,8 @@ using namespace std;
 #include <qcheckbox.h>
 #include <qlabel.h>
 
+using namespace std;
+
 //=================================================================================
 // class    : BuildGUI_FaceDlg()
 // purpose  : Constructs a BuildGUI_FaceDlg which is a child of 'parent', with the 

diff --git a/src/BuildGUI/BuildGUI_ShellDlg.h b/src/BuildGUI/BuildGUI_ShellDlg.h
index c9f0282a559809ccc20bf1f229c7e85c39a23030..345fa7519c3847cb6432f30bdb27f3507f156d79 100644 (file)
--- a/src/BuildGUI/BuildGUI_ShellDlg.h
+++ b/src/BuildGUI/BuildGUI_ShellDlg.h
@@ -63,7 +63,6 @@ private slots:
     void ClickOnOk();
     bool ClickOnApply();
     void SetEditCurrentArgument();
-    void LineEditReturnPressed();
     void SelectionIntoArgument();
     void ActivateThisDialog();
 

diff --git a/src/BuildGUI/BuildGUI_SolidDlg.h b/src/BuildGUI/BuildGUI_SolidDlg.h
index 02bf806d6f629c66a953322077ee1fc78907d9be..c85fef5888084d19bfce2b0e47412429bc3377ee 100644 (file)
--- a/src/BuildGUI/BuildGUI_SolidDlg.h
+++ b/src/BuildGUI/BuildGUI_SolidDlg.h
@@ -64,7 +64,6 @@ private slots:
     void ClickOnOk();
     bool ClickOnApply();
     void SetEditCurrentArgument();
-    void LineEditReturnPressed();
     void SelectionIntoArgument();
     void ActivateThisDialog();
     void EnableNameField(bool toEnable);

diff --git a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h
index 909db129e485033d709731d4d0104a8197ceb163..1409779596948dc8d9b7b6e8c1908b1448a22073 100644 (file)
--- a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h
+++ b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h
@@ -21,7 +21,13 @@ class QListViewItem;
 class QPushButton;
 class QSpinBox;
 
-class DlgRef_1List1Spin1Btn_QTD : public QWidget
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
+#else
+#define DLGREF_WNT_EXPORT
+#endif
+
+class DLGREF_WNT_EXPORT DlgRef_1List1Spin1Btn_QTD : public QWidget
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_1Sel1Check_QTD.h b/src/DlgRef/DlgRef_1Sel1Check_QTD.h
index 4ff71d4bdb6018515b7b739d2b45d84508083b8a..0c5ad2b9930266eefdf7139c67470df93fc54c9f 100644 (file)
--- a/src/DlgRef/DlgRef_1Sel1Check_QTD.h
+++ b/src/DlgRef/DlgRef_1Sel1Check_QTD.h
@@ -20,7 +20,13 @@ class QLabel;
 class QLineEdit;
 class QPushButton;
 
-class DlgRef_1Sel1Check_QTD : public QWidget
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
+#else
+#define DLGREF_WNT_EXPORT
+#endif
+
+class DLGREF_WNT_EXPORT DlgRef_1Sel1Check_QTD : public QWidget
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check.h b/src/DlgRef/DlgRef_1Sel1Spin1Check.h
index 6d0b2d6e4facb0eb52fbe335624a941e89b038b0..c08788e0d27ceaafe9c2dfb294cc99e690d7eded 100644 (file)
--- a/src/DlgRef/DlgRef_1Sel1Spin1Check.h
+++ b/src/DlgRef/DlgRef_1Sel1Spin1Check.h
@@ -32,7 +32,13 @@
 #include "DlgRef_1Sel1Spin1Check_QTD.h"
 #include "DlgRef_SpinBox.h"
 
-class DlgRef_1Sel1Spin1Check : public DlgRef_1Sel1Spin1Check_QTD
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
+#else
+#define DLGREF_WNT_EXPORT
+#endif
+
+class DLGREF_WNT_EXPORT DlgRef_1Sel1Spin1Check : public DlgRef_1Sel1Spin1Check_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_1Sel_Ext.h b/src/DlgRef/DlgRef_1Sel_Ext.h
index 9b995ddcb7ba7ce925b8e034bc2147ed161b5c66..c973f00cd9d2e6d436c9f22324f96a85e150b944 100644 (file)
--- a/src/DlgRef/DlgRef_1Sel_Ext.h
+++ b/src/DlgRef/DlgRef_1Sel_Ext.h
@@ -13,7 +13,13 @@
 
 class QGridLayout;
 
-class DlgRef_1Sel_Ext : public DlgRef_1Sel_QTD
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
+#else
+#define DLGREF_WNT_EXPORT
+#endif
+
+class DLGREF_WNT_EXPORT DlgRef_1Sel_Ext : public DlgRef_1Sel_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check.h b/src/DlgRef/DlgRef_2Sel2Spin1Check.h
index b5bdba917dfb2024866e9b918f2a390b815d436a..53207585388a174b69fb3c0e07af16d1363026d8 100644 (file)
--- a/src/DlgRef/DlgRef_2Sel2Spin1Check.h
+++ b/src/DlgRef/DlgRef_2Sel2Spin1Check.h
@@ -32,7 +32,13 @@
 #include "DlgRef_2Sel2Spin1Check_QTD.h"
 #include "DlgRef_SpinBox.h"
 
-class DlgRef_2Sel2Spin1Check : public DlgRef_2Sel2Spin1Check_QTD
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
+#else
+#define DLGREF_WNT_EXPORT
+#endif
+
+class DLGREF_WNT_EXPORT DlgRef_2Sel2Spin1Check : public DlgRef_2Sel2Spin1Check_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check.h b/src/DlgRef/DlgRef_2Sel4Spin1Check.h
index 573097cc699a06ce7c59c96fbffcb23b6021933b..3dc1af1c4b265cf0a0e3adcb242979782ac15bf0 100644 (file)
--- a/src/DlgRef/DlgRef_2Sel4Spin1Check.h
+++ b/src/DlgRef/DlgRef_2Sel4Spin1Check.h
@@ -32,7 +32,13 @@
 #include "DlgRef_2Sel4Spin1Check_QTD.h"
 #include "DlgRef_SpinBox.h"
 
-class DlgRef_2Sel4Spin1Check : public DlgRef_2Sel4Spin1Check_QTD
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
+#else
+#define DLGREF_WNT_EXPORT
+#endif
+
+class DLGREF_WNT_EXPORT DlgRef_2Sel4Spin1Check : public DlgRef_2Sel4Spin1Check_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check.h b/src/DlgRef/DlgRef_3Sel3Spin1Check.h
index ba0a06515d6d2b3fd557ae7e3a4d591a9a6cc8f9..e4768659efee204e265dc3da0e1b01320628269a 100644 (file)
--- a/src/DlgRef/DlgRef_3Sel3Spin1Check.h
+++ b/src/DlgRef/DlgRef_3Sel3Spin1Check.h
@@ -32,7 +32,13 @@
 #include "DlgRef_3Sel3Spin1Check_QTD.h"
 #include "DlgRef_SpinBox.h"
 
-class DlgRef_3Sel3Spin1Check : public DlgRef_3Sel3Spin1Check_QTD
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
+#else
+#define DLGREF_WNT_EXPORT
+#endif
+
+class DLGREF_WNT_EXPORT DlgRef_3Sel3Spin1Check : public DlgRef_3Sel3Spin1Check_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check.h b/src/DlgRef/DlgRef_3Sel4Spin2Check.h
index d74915a198a9c61bbc47e8d8d5343c412425ce27..62708139e359788b002437d23d25d50901ba484e 100644 (file)
--- a/src/DlgRef/DlgRef_3Sel4Spin2Check.h
+++ b/src/DlgRef/DlgRef_3Sel4Spin2Check.h
@@ -32,7 +32,13 @@
 #include "DlgRef_3Sel4Spin2Check_QTD.h"
 #include "DlgRef_SpinBox.h"
 
-class DlgRef_3Sel4Spin2Check : public DlgRef_3Sel4Spin2Check_QTD
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
+#else
+#define DLGREF_WNT_EXPORT
+#endif
+
+class DLGREF_WNT_EXPORT DlgRef_3Sel4Spin2Check : public DlgRef_3Sel4Spin2Check_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h
index d757be902ec0150f4eacb0284d8e3d7648ad4355..4f298bc6c5305d14f5ff1fae837c6e0632992801 100644 (file)
--- a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h
+++ b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h
@@ -22,7 +22,13 @@ class QPushButton;
 class QCheckBox;
 class QPushButton;
 
-class DlgRef_4Sel1List1Check_QTD : public QWidget
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
+#else
+#define DLGREF_WNT_EXPORT
+#endif
+
+class DLGREF_WNT_EXPORT DlgRef_4Sel1List1Check_QTD : public QWidget
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.h b/src/DlgRef/DlgRef_Skeleton_QTD.h
index 83d3a10162fd79eeebe63d2cbb73d42f796909da..d1a2e3cf9f1d77d9d012dca564c6e850e731af71 100644 (file)
--- a/src/DlgRef/DlgRef_Skeleton_QTD.h
+++ b/src/DlgRef/DlgRef_Skeleton_QTD.h
@@ -21,22 +21,13 @@ class QLineEdit;
 class QPushButton;
 class QRadioButton;
 
-
-#if defined DLGREF_EXPORTS
-#if defined WIN32
-#define DLGREF_EXPORT __declspec( dllexport )
-#else
-#define DLGREF_EXPORT
-#endif
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
 #else
-#if defined WNT
-#define DLGREF_EXPORT __declspec( dllimport )
-#else
-#define DLGREF_EXPORT
-#endif
+#define DLGREF_WNT_EXPORT
 #endif
 
-class DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog
+class DLGREF_WNT_EXPORT DlgRef_Skeleton_QTD : public QDialog
 { 
     Q_OBJECT
 

diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx
index 8db765048fc51c53fb8c133f8126035058875260..96ae886bade3b4664db20a8101460cc6f75dd53b 100644 (file)
--- a/src/OBJECT/GEOM_AISShape.hxx
+++ b/src/OBJECT/GEOM_AISShape.hxx
@@ -58,8 +58,12 @@ class Prs3d_Presentation;
 class SALOME_InteractiveObject;
 class TopoDS_Shape;
 
-
-class GEOM_AISShape : public SALOME_AISShape {
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define OBJECT_WNT_EXPORT __declspec( dllexport )
+#else
+#define OBJECT_WNT_EXPORT
+#endif
+class  OBJECT_WNT_EXPORT GEOM_AISShape : public SALOME_AISShape {
 
 public:
 
@@ -81,27 +85,27 @@ public:
 //      }
  // Methods PUBLIC
  // 
-Standard_EXPORT   GEOM_AISShape(const TopoDS_Shape& shape, const Standard_CString aName);
-Standard_EXPORT   Standard_Boolean hasIO() ;
-Standard_EXPORT   void setIO(const Handle(SALOME_InteractiveObject)& name) ;
-Standard_EXPORT   void setName(const Standard_CString aName) ;
-Standard_EXPORT   Standard_CString getName() ;
-Standard_EXPORT   Handle_SALOME_InteractiveObject getIO() ;
-Standard_EXPORT   void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight );
-Standard_EXPORT   ~GEOM_AISShape();
-
-Standard_EXPORT   void SetTransparency(const Standard_Real aValue);
-Standard_EXPORT   void SetShadingColor(const Quantity_Color &aCol);
-
-Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+       GEOM_AISShape(const TopoDS_Shape& shape, const Standard_CString aName);
+       Standard_Boolean hasIO() ;
+       void setIO(const Handle(SALOME_InteractiveObject)& name) ;
+       void setName(const Standard_CString aName) ;
+       Standard_CString getName() ;
+       Handle_SALOME_InteractiveObject getIO() ;
+       void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight );
+       ~GEOM_AISShape();
+
+       void SetTransparency(const Standard_Real aValue);
+       void SetShadingColor(const Quantity_Color &aCol);
+
+       virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
                                      const Handle(Prs3d_Presentation)& aPresentation,
                                      const Standard_Integer aMode = 0) ;
 
  // Type management
  //
- Standard_EXPORT friend Handle_Standard_Type& GEOM_AISShape_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
+       friend Handle_Standard_Type& GEOM_AISShape_Type_();
+       const Handle(Standard_Type)& DynamicType() const;
+       Standard_Boolean              IsKind(const Handle(Standard_Type)&) const;
 
 protected:
 

diff --git a/src/OperationGUI/OperationGUI.cxx b/src/OperationGUI/OperationGUI.cxx
index b24f64e5549bf40b1534a6d782b76faac25a05ea..d9035a40fb42ff1985b61abd7c38f88508ef5ad6 100644 (file)
--- a/src/OperationGUI/OperationGUI.cxx
+++ b/src/OperationGUI/OperationGUI.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "OperationGUI.h"
 
 #include "SUIT_Session.h"
@@ -43,6 +42,8 @@ using namespace std;
 
 #include "OperationGUI_ClippingDlg.h"
 
+using namespace std;
+
 OperationGUI* OperationGUI::myGUIObject = 0;
 
 //=======================================================================

diff --git a/src/OperationGUI/OperationGUI_MaterialDlg.cxx b/src/OperationGUI/OperationGUI_MaterialDlg.cxx
index 82345576ad8da33a70e65895ae162c64911fd7a0..e63383883021af07f92de92c89ade559f0313885 100644 (file)
--- a/src/OperationGUI/OperationGUI_MaterialDlg.cxx
+++ b/src/OperationGUI/OperationGUI_MaterialDlg.cxx
@@ -25,7 +25,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "OperationGUI_MaterialDlg.h"
 #include "OperationGUI_PartitionDlg.h"
 
@@ -39,6 +38,8 @@ using namespace std;
 #include <qlistview.h>
 #include <qspinbox.h>
 
+using namespace std;
+
 //=================================================================================
 // class    : OperationGUI_MaterialDlg()
 // purpose  : Constructs a OperationGUI_MaterialDlg which is a child of 'parent', with the 

diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
index b609b0d65d20fc2a9d83806743548a9d4be757e4..ac98b0de8d06847dc3f09db891f77f0b39050098 100644 (file)
--- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
+++ b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "RepairGUI_CloseContourDlg.h"
 
 #include "SalomeApp_Application.h"
@@ -42,6 +41,8 @@ using namespace std;
 
 #include <qlabel.h>
 
+using namespace std;
+
 //=================================================================================
 // class    : RepairGUI_CloseContourDlg()
 // purpose  : Constructs a RepairGUI_CloseContourDlg  which is a child of 'parent', with the

diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
index e9f3730098ed1b03991a8b689e3d0d504f28b64f..04884566b62a564dc791cefdd136bd39cbb2e0c2 100644 (file)
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "RepairGUI_DivideEdgeDlg.h"
 
 #include "SalomeApp_Application.h"
@@ -40,6 +39,8 @@ using namespace std;
 
 #include <qlabel.h>
 
+using namespace std;
+
 //=================================================================================
 // class    : RepairGUI_DivideEdgeDlg()
 // purpose  : Constructs a RepairGUI_DivideEdgeDlg  which is a child of 'parent', with the

diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
index 96b5c2a1e142da226165714f53fb5f3ae6d919bf..04c2b19b0d26b42f421bea34a379de2772ef5163 100644 (file)
--- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "RepairGUI_FreeFacesDlg.h"
 
 #include "SalomeApp_Application.h"
@@ -56,6 +55,7 @@ using namespace std;
 #define MARGIN 10
 #define MIN_WIDTH 200
 
+using namespace std;
 
 //=================================================================================
 // class    : RepairGUI_FreeFacesDlg()

diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx
index 218697875369a2f35dda5e548b996bb07a4bd3d0..9988bb38d944f067e4223c6692c0babe707f780c 100644 (file)
--- a/src/RepairGUI/RepairGUI_GlueDlg.cxx
+++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "RepairGUI_GlueDlg.h"
 #include "DlgRef_1Sel_Ext.h"
 #include "GEOMImpl_Types.hxx"
@@ -48,10 +47,9 @@ using namespace std;
 #include <qapplication.h>
 #include <qlabel.h>
 
-#define DEFAULT_TOLERANCE_VALUE 1e-07
-
-
+using namespace std;
 
+#define DEFAULT_TOLERANCE_VALUE 1e-07
 
 //=================================================================================
 // class    : RepairGUI_GlueDlg()

diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
index 8cbf4835bc0cfbc162fa21d32f71141707dfbe70..4e8ecc34ef14c499b39af6fff40d2ebcee0b567f 100644 (file)
--- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "RepairGUI_RemoveHolesDlg.h"
 
 #include "SalomeApp_Application.h"
@@ -41,6 +40,7 @@ using namespace std;
 #include <TopAbs.hxx>
 #include <TColStd_MapOfInteger.hxx>
 
+using namespace std;
 
 //=================================================================================
 // class    : RepairGUI_RemoveHolesDlg()

diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
index 74167b21753c99ebb4f81f8313667fe4558289ca..db6fd60356c0a2e2b3d8f1fcccbe4bcfdcb4aec6 100644 (file)
--- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "RepairGUI_RemoveIntWiresDlg.h"
 
 #include "SalomeApp_Application.h"
@@ -39,6 +38,7 @@ using namespace std;
 #include <TopAbs.hxx>
 #include <TColStd_MapOfInteger.hxx>
 
+using namespace std;
 
 //=================================================================================
 // class    : RepairGUI_RemoveIntWiresDlg()

diff --git a/src/RepairGUI/RepairGUI_SewingDlg.cxx b/src/RepairGUI/RepairGUI_SewingDlg.cxx
index d8753363b86073e197ab51497794ea67ad3db62c..2bd0ee30a743d47e3c8946110ca769327eb94186 100644 (file)
--- a/src/RepairGUI/RepairGUI_SewingDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SewingDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "RepairGUI_SewingDlg.h"
 
 #include "SalomeApp_Application.h"
@@ -42,6 +41,7 @@ using namespace std;
 
 #define DEFAULT_TOLERANCE_VALUE 1e-07
 
+using namespace std;
 
 //=================================================================================
 // class    : RepairGUI_SewingDlg()

diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
index 63583ecb4216e327cf4e0006a102650d137cfe8c..cb30f82dcf714f5f717da09c8561fb21b75183cd 100755 (executable)
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
@@ -26,8 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
-
 #include "RepairGUI_ShapeProcessDlg.h"
 
 #include "GEOMImpl_Types.hxx"
@@ -45,6 +43,7 @@ using namespace std;
 #include <qlabel.h>
 #include <qmessagebox.h>
 
+using namespace std;
 
 //=================================================================================
 // class    : RepairGUI_ShapeProcessDlg()

diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h
index ffdbd536b21b6d7c0e737634502a3ffd629ef0b8..656ab7afae030f0327a77166d75af78f1ce595cb 100755 (executable)
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h
@@ -134,7 +134,6 @@ private slots:
     void             lineEditReturnPressed();
     void             selectionChanged();
     void             selectClicked();
-    void             activateSelection();
     void             operationChanged();
     void             advOptionToggled(bool);
 };             

diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
index d7a4dfab5f1d58fe02060460fd700d2c8de281ed..ee38297a102296ec7c7dcc578567b14dae12e918 100644 (file)
--- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "RepairGUI_SuppressFacesDlg.h"
 
 #include "SalomeApp_Application.h"
@@ -40,6 +39,8 @@ using namespace std;
 
 #include <qlabel.h>
 
+using namespace std;
+
 //=================================================================================
 // class    : RepairGUI_SuppressFacesDlg()
 // purpose  : Constructs a RepairGUI_SuppressFacesDlg  which is a child of 'parent', with the

diff --git a/src/TransformationGUI/TransformationGUI.cxx b/src/TransformationGUI/TransformationGUI.cxx
index 59cc9655d19b887b3bbe910597bca077587c4590..2c8b97a73082f59bcc7d625bfc059cb04613a840 100644 (file)
--- a/src/TransformationGUI/TransformationGUI.cxx
+++ b/src/TransformationGUI/TransformationGUI.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "TransformationGUI.h"
 #include "GeometryGUI.h"
 
@@ -42,6 +41,8 @@ using namespace std;
 #include "TransformationGUI_OffsetDlg.h"             // Method OFFSET
 #include "TransformationGUI_PositionDlg.h"           // Method POSITION
 
+using namespace std;
+
 TransformationGUI* TransformationGUI::myGUIObject = 0;
 
 //=======================================================================