Windows porting

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 

src/BuildGUI/BuildGUI_ShellDlg.h

@@ -63,7 +63,6 @@ private slots:
     void ClickOnOk();
     bool ClickOnApply();
     void SetEditCurrentArgument();
-    void LineEditReturnPressed();
     void SelectionIntoArgument();
     void ActivateThisDialog();
 

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);

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

src/DlgRef/DlgRef_Skeleton_QTD.h

@@ -21,22 +21,13 @@ class QLineEdit;
 class QPushButton;
 class QRadioButton;
 
-
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
-#if defined DLGREF_EXPORTS
+#define DLGREF_WNT_EXPORT __declspec( dllexport )
-#if defined WIN32
-#define DLGREF_EXPORT __declspec( dllexport )
 #else
-#define DLGREF_EXPORT
+#define DLGREF_WNT_EXPORT
-#endif
-#else
-#if defined WNT
-#define DLGREF_EXPORT __declspec( dllimport )
-#else
-#define DLGREF_EXPORT
-#endif
 #endif
 
-class DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog
+class DLGREF_WNT_EXPORT DlgRef_Skeleton_QTD : public QDialog
 { 
     Q_OBJECT
 

src/OBJECT/GEOM_AISShape.hxx

@@ -58,8 +58,12 @@ class Prs3d_Presentation;
 class SALOME_InteractiveObject;
 class TopoDS_Shape;
 
-
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
-class GEOM_AISShape : public SALOME_AISShape {
+#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);
+	GEOM_AISShape(const TopoDS_Shape& shape, const Standard_CString aName);
-Standard_EXPORT   Standard_Boolean hasIO() ;
+	Standard_Boolean hasIO() ;
-Standard_EXPORT   void setIO(const Handle(SALOME_InteractiveObject)& name) ;
+	void setIO(const Handle(SALOME_InteractiveObject)& name) ;
-Standard_EXPORT   void setName(const Standard_CString aName) ;
+	void setName(const Standard_CString aName) ;
-Standard_EXPORT   Standard_CString getName() ;
+	Standard_CString getName() ;
-Standard_EXPORT   Handle_SALOME_InteractiveObject getIO() ;
+	Handle_SALOME_InteractiveObject getIO() ;
-Standard_EXPORT   void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight );
+	void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight );
-Standard_EXPORT   ~GEOM_AISShape();
+	~GEOM_AISShape();
 
-Standard_EXPORT   void SetTransparency(const Standard_Real aValue);
+	void SetTransparency(const Standard_Real aValue);
-Standard_EXPORT   void SetShadingColor(const Quantity_Color &aCol);
+	void SetShadingColor(const Quantity_Color &aCol);
 
-Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+	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_();
+	friend Handle_Standard_Type& GEOM_AISShape_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
+	const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean	      IsKind(const Handle(Standard_Type)&) const;
+	Standard_Boolean	      IsKind(const Handle(Standard_Type)&) const;
 
 protected:
 

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;
 
 //=======================================================================

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 

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

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

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()

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,11 +47,10 @@ using namespace std;
 #include <qapplication.h>
 #include <qlabel.h>
 
+using namespace std;
+
 #define DEFAULT_TOLERANCE_VALUE 1e-07
 
-
-
-
 //=================================================================================
 // class    : RepairGUI_GlueDlg()
 // purpose  : Constructs a RepairGUI_GlueDlg  which is a child of 'parent', with the

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()

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()

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()

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()

src/RepairGUI/RepairGUI_ShapeProcessDlg.h

@@ -134,7 +134,6 @@ private slots:
     void             lineEditReturnPressed();
     void             selectionChanged();
     void             selectClicked();
-    void             activateSelection();
     void             operationChanged();
     void             advOptionToggled(bool);
 };             

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

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;
 
 //=======================================================================