From: szy <szy@opencascade.com>
Date: Mon, 22 Aug 2005 11:23:41 +0000 (+0000)
Subject: Windows porting
X-Git-Tag: T_3_0_2a1~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2907b7dd397a0d4bc078fdcf056eb9cfebe13797;p=modules%2Fgeom.git

Windows porting
---

diff --git a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h
index d1b8893b3..ac7fad08b 100644
--- 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 cc145e319..8cd0a46da 100644
--- 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 470d62d83..ccf88983c 100644
--- 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 d19f64043..38dfc0703 100644
--- 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 89e9d149c..7bd7e50f8 100644
--- 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 367e8b55d..0624d581f 100644
--- 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 9dbbd5f5d..000ebb03b 100644
--- 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 306593117..a10517a0c 100644
--- 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 bcf59c686..aa7fb3dbd 100644
--- 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 6d239c330..0ac29240b 100644
--- 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 f4ac68984..b4876de4c 100644
--- 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 a3964d921..0a6614894 100644
--- 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 e1da9d6ac..1610f9149 100644
--- 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 e0dff7b5b..a63b514b6 100644
--- 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 4e90069bd..081ac7ab9 100644
--- 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 32ec46fbd..6ffba6e31 100644
--- 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"