Windows porting

diff --git a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h
index d1b8893b38a4c9475d5927fbdd8df2c10a807bf5..ac7fad08b8596be33ba550a09740e94e1c9467be 100644 (file)
--- a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h
+++ b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h
@@ -21,7 +21,13 @@ class QLineEdit;
 class QPushButton;
 class QRadioButton;
 
-class DlgRef_1Sel1Check1List_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_1Sel1Check1List_QTD : public QWidget
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_1Sel5Spin.h b/src/DlgRef/DlgRef_1Sel5Spin.h
index cc145e319328dacbdb17048f1bf928383c1b174f..8cd0a46dae8d5fd49cbe8cf8d2c6d6d452b9fb29 100644 (file)
--- a/src/DlgRef/DlgRef_1Sel5Spin.h
+++ b/src/DlgRef/DlgRef_1Sel5Spin.h
@@ -32,7 +32,13 @@
 #include "DlgRef_1Sel5Spin_QTD.h"
 #include "DlgRef_SpinBox.h"
 
-class DlgRef_1Sel5Spin : public DlgRef_1Sel5Spin_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_1Sel5Spin : public DlgRef_1Sel5Spin_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_1Spin.h b/src/DlgRef/DlgRef_1Spin.h
index 470d62d83b403a0f6b376e5754e128524529c069..ccf88983c47bae1eebf864b89888214751f65121 100644 (file)
--- a/src/DlgRef/DlgRef_1Spin.h
+++ b/src/DlgRef/DlgRef_1Spin.h
@@ -31,8 +31,12 @@
 
 #include "DlgRef_1Spin_QTD.h"
 #include "DlgRef_SpinBox.h"
-
-class DlgRef_1Spin : public DlgRef_1Spin_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_1Spin : public DlgRef_1Spin_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_1Spin_QTD.h b/src/DlgRef/DlgRef_1Spin_QTD.h
index d19f64043a7999550435518c33d748eed632cefe..38dfc0703907f6e4a100553a691944e982fd4bb7 100644 (file)
--- a/src/DlgRef/DlgRef_1Spin_QTD.h
+++ b/src/DlgRef/DlgRef_1Spin_QTD.h
@@ -17,8 +17,12 @@ class QGridLayout;
 class QGroupBox;
 class QLabel;
 class QSpinBox;
-
-class DlgRef_1Spin_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_1Spin_QTD : public QWidget
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check.h b/src/DlgRef/DlgRef_2Sel1Spin2Check.h
index 89e9d149c2c3c51519e1291082056597fba04d71..7bd7e50f83b277b7825a552547284040e7e20a74 100644 (file)
--- a/src/DlgRef/DlgRef_2Sel1Spin2Check.h
+++ b/src/DlgRef/DlgRef_2Sel1Spin2Check.h
@@ -32,7 +32,12 @@
 #include "DlgRef_2Sel1Spin2Check_QTD.h"
 #include "DlgRef_SpinBox.h"
 
-class DlgRef_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_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_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_2Sel3Spin.h b/src/DlgRef/DlgRef_2Sel3Spin.h
index 367e8b55d05d41a5d193e5a8c2e0b55f3b7e3822..0624d581f7ea138047b6d0262eb7486f3c0ccfa1 100644 (file)
--- a/src/DlgRef/DlgRef_2Sel3Spin.h
+++ b/src/DlgRef/DlgRef_2Sel3Spin.h
@@ -32,7 +32,13 @@
 #include "DlgRef_2Sel3Spin_QTD.h"
 #include "DlgRef_SpinBox.h"
 
-class DlgRef_2Sel3Spin : public DlgRef_2Sel3Spin_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_2Sel3Spin : public DlgRef_2Sel3Spin_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_2Sel3Spin_QTD.h b/src/DlgRef/DlgRef_2Sel3Spin_QTD.h
index 9dbbd5f5dba6d071491febece1f25efbe5425148..000ebb03b53eef054ea1a31056e304c069e680dd 100644 (file)
--- a/src/DlgRef/DlgRef_2Sel3Spin_QTD.h
+++ b/src/DlgRef/DlgRef_2Sel3Spin_QTD.h
@@ -19,8 +19,12 @@ class QLabel;
 class QLineEdit;
 class QPushButton;
 class QSpinBox;
-
-class DlgRef_2Sel3Spin_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_2Sel3Spin_QTD : public QWidget
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_2Spin.h b/src/DlgRef/DlgRef_2Spin.h
index 306593117b22cf4715023de1b68a2a08861ff7f1..a10517a0c333c104dec0f657c73bd29b07475b60 100644 (file)
--- a/src/DlgRef/DlgRef_2Spin.h
+++ b/src/DlgRef/DlgRef_2Spin.h
@@ -31,8 +31,12 @@
 
 #include "DlgRef_2Spin_QTD.h"
 #include "DlgRef_SpinBox.h"
-
-class DlgRef_2Spin : public DlgRef_2Spin_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_2Spin : public DlgRef_2Spin_QTD
 { 
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_2Spin_QTD.h b/src/DlgRef/DlgRef_2Spin_QTD.h
index bcf59c686d8292b59c4ddc0189306dac11a8fb98..aa7fb3dbd61129ea3fb516fefcbdf7bf36814ba5 100644 (file)
--- a/src/DlgRef/DlgRef_2Spin_QTD.h
+++ b/src/DlgRef/DlgRef_2Spin_QTD.h
@@ -17,8 +17,12 @@ class QGridLayout;
 class QGroupBox;
 class QLabel;
 class QSpinBox;
-
-class DlgRef_2Spin_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_2Spin_QTD : public QWidget
 { 
     Q_OBJECT
 

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h
index 6d239c3300bdcdd45f8e6f2618e4edd88b89623a..0ac29240ba27a10fce4cf0779ea4f888d5d4e0c4 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.h
@@ -35,12 +35,16 @@
 #include <SALOME_ListIO.hxx>
 
 #include <CORBA.h>
-
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define GEOMTOOLSGUI_WNT_EXPORT __declspec( dllexport )
+#else
+#define GEOMTOOLSGUI_WNT_EXPORT
+#endif
 //=================================================================================
 // class    : GEOMToolsGUI
 // purpose  :
 //=================================================================================
-class GEOMToolsGUI : public GEOMGUI
+class GEOMTOOLSGUI_WNT_EXPORT GEOMToolsGUI : public GEOMGUI
 {
 public :
   GEOMToolsGUI( GeometryGUI* ); // hide constructor to avoid direct creation

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx
index f4ac68984368dc762016faf980a29255f839b9ba..b4876de4c5085fafb2a63815b21b7f7cf0ffe7f7 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx
@@ -9,8 +9,8 @@
 //  Module : SALOME
 //  $Header$
 
-#include "GEOMToolsGUI_NameDlg.h"
 
+#include "GEOMToolsGUI_NameDlg.h"
 #include <SUIT_Session.h>
 #include <SUIT_Application.h>
 #include <SUIT_Desktop.h>
@@ -21,8 +21,8 @@
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-using namespace std;
 
+//using namespace std;
 /*!
   Constructor
 */

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
index a3964d921c7a219b5eef7ad35d425d4b84ea8de1..0a661489480e26f8ecfb97c8c60a49122210533a 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
@@ -26,9 +26,8 @@
 //  Module : GEOM
 //  $Header: 
 
-using namespace std;
-#include "GEOMToolsGUI_NbIsosDlg.h"
 
+#include "GEOMToolsGUI_NbIsosDlg.h"
 #include <SUIT_Tools.h>
 
 #include <qlabel.h>
@@ -36,6 +35,7 @@ using namespace std;
 #include <qgroupbox.h>
 #include <qlayout.h>
 #include <qspinbox.h>
+//using namespace std;
 
 //=================================================================================
 // class    : GEOMToolsGUI_NbIsosDlg()

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
index e1da9d6ac4c8f5cd8007088099090f8f7e215100..1610f9149b9602d83a5653aadaed3b7459b64815 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
@@ -25,7 +25,7 @@
 //  Author : Lucien PIGNOLONI
 //  Module : GEOM
 
-using namespace std;
+
 #include "GEOMToolsGUI_TransparencyDlg.h"
 #include "GEOMBase.h"
 #include "GEOM_AISShape.hxx"
@@ -62,7 +62,7 @@ using namespace std;
 #include <qgroupbox.h>
 
 #include <AIS_InteractiveContext.hxx>
-
+using namespace std;
 
 //=================================================================================
 // class    : GEOMBase_TransparencyDlg()

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h
index e0dff7b5bb6626465ccae544fd4d07a815d7aca4..a63b514b62d08244f95c1662889516eeaf867fdf 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h
@@ -30,7 +30,11 @@
 #define DIALOGBOX_TRANSPARENCYDLG_H
 
 #include <qdialog.h>
-
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define GEOMTOOLSGUI_WNT_EXPORT __declspec( dllexport )
+#else
+#define GEOMTOOLSGUI_WNT_EXPORT
+#endif
 class QSlider;
 
 //=================================================================================
@@ -38,7 +42,7 @@ class QSlider;
 // purpose  :
 //          : WARNING : that is a MODAL dialog.
 //=================================================================================
-class GEOMToolsGUI_TransparencyDlg : public QDialog
+class GEOMTOOLSGUI_WNT_EXPORT GEOMToolsGUI_TransparencyDlg : public QDialog
 { 
     Q_OBJECT
 
@@ -50,7 +54,7 @@ private :
   bool      myFirstInit ;   /* Inform for the first init  */
   QSlider*  mySlider; 
 
-private slots:      
+private slots: 
   void      ClickOnOk();
   void      ClickOnClose();
   void      ValueHasChanged( int ) ;

diff --git a/src/PrimitiveGUI/PrimitiveGUI.cxx b/src/PrimitiveGUI/PrimitiveGUI.cxx
index 4e90069bd1d69a9a222aa0688b74766ff11c1c8a..081ac7ab9412f510045dd51c418677dfb9311b5c 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI.cxx
@@ -26,7 +26,7 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
+
 #include "PrimitiveGUI.h"
 #include "GeometryGUI.h"
 
@@ -38,7 +38,7 @@ using namespace std;
 #include "PrimitiveGUI_SphereDlg.h"   // Method SPHERE
 #include "PrimitiveGUI_TorusDlg.h"    // Method TORUS
 #include "PrimitiveGUI_ConeDlg.h"     // Method CONE
-
+using namespace std;
 PrimitiveGUI* PrimitiveGUI::myGUIObject = 0;
 
 //=======================================================================

diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
index 32ec46fbdf82f908b1ed4d92a65f26527c254b64..6ffba6e31e8bf2307d5d1421d26049a696e9b427 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "PrimitiveGUI_SphereDlg.h"
 
 #include "SUIT_Desktop.h"