first executable version

diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h
index 6a1b6fa9b054cab14274291e9aefe0b85a485e57..84b301d7d467dccc33519032ba98b4d9a1466aca 100644 (file)
--- a/src/BasicGUI/BasicGUI_CurveDlg.h
+++ b/src/BasicGUI/BasicGUI_CurveDlg.h
@@ -63,7 +63,7 @@ private :
 
     DlgRef_1Sel_QTD* GroupPoints;
     GEOM::ListOfGO_var myPoints;
-    list<GEOM::GEOM_Object_var> myOrderedSel;//!< This list used for managing orderes selection
+    std::list<GEOM::GEOM_Object_var> myOrderedSel;//!< This list used for managing orderes selection
 
 private slots:
     void ClickOnOk();

diff --git a/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h b/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h
index 0f7fbc84b01d1203bb1a80555ed6a8726196acab..1d856dbf5648aa484a3d43b55b74864f1d77263c 100644 (file)
--- a/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h
+++ b/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h
@@ -10,6 +10,8 @@
 #ifndef DLGREF_1SEL5SPIN1CHECK_QTD_H
 #define DLGREF_1SEL5SPIN1CHECK_QTD_H
 
+#include "GEOM_DlgRef.hxx"
+
 #include <qvariant.h>
 #include <qwidget.h>
 
@@ -24,7 +26,7 @@ class QSpinBox;
 class QCheckBox;
 class QLineEdit;
 
-class DlgRef_1Sel5Spin1Check_QTD : public QWidget
+class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin1Check_QTD : public QWidget
 {
     Q_OBJECT
 

diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx b/src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx
index a17d55e415f0a3be9e7965ed877d64c5099b32fc..f310e22875832bebd68e316ac4ae4d1d4a2002e3 100755 (executable)
--- a/src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx
+++ b/src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx
@@ -1,41 +1,41 @@
-//  File   : DlgRef_2Sel2Spin.cxx\r
-//  Author : Dmitry MATVEITCHEV\r
-//  Module : GEOM\r
-//  $Header: \r
-\r
-#include "DlgRef_2Sel3Spin2Rb.h"\r
-#include <iostream.h>\r
-\r
-#include <qlayout.h>\r
-#include <qspinbox.h>\r
-#include <qgroupbox.h>\r
-#include <qradiobutton.h>\r
-\r
-/* \r
- *  Constructs a DlgRef_2Sel3Spin2Rb which is a child of 'parent', with the \r
- *  name 'name' and widget flags set to 'f' \r
- */\r
-DlgRef_2Sel3Spin2Rb::DlgRef_2Sel3Spin2Rb(QWidget* parent,  const char* name, WFlags fl)\r
-  :DlgRef_2Sel3Spin2Rb_QTD(parent, name, fl)\r
-{\r
-  SpinBox1->close(TRUE);\r
-  SpinBox2->close(TRUE);\r
-  SpinBox3->close(TRUE);\r
-  RadioButton1->setChecked(true);\r
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");\r
-  Layout2->addMultiCellWidget(SpinBox_DX, 0, 0, 2, 4);\r
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");\r
-  Layout2->addWidget(SpinBox_DY, 1, 2);\r
-  SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");\r
-  Layout2->addWidget(SpinBox_DZ, 1, 4);\r
-  SpinBox_DY->setEnabled(false);\r
-  SpinBox_DZ->setEnabled(false);\r
-}\r
-\r
-/*  \r
- *  Destroys the object and frees any allocated resources\r
- */\r
-DlgRef_2Sel3Spin2Rb::~DlgRef_2Sel3Spin2Rb()\r
-{\r
-    // no need to delete child widgets, Qt does it all for us\r
-}\r
+//  File   : DlgRef_2Sel2Spin.cxx
+//  Author : Dmitry MATVEITCHEV
+//  Module : GEOM
+//  $Header: 
+
+#include "DlgRef_2Sel3Spin2Rb.h"
+#include <iostream>
+
+#include <qlayout.h>
+#include <qspinbox.h>
+#include <qgroupbox.h>
+#include <qradiobutton.h>
+
+/* 
+ *  Constructs a DlgRef_2Sel3Spin2Rb which is a child of 'parent', with the 
+ *  name 'name' and widget flags set to 'f' 
+ */
+DlgRef_2Sel3Spin2Rb::DlgRef_2Sel3Spin2Rb(QWidget* parent,  const char* name, WFlags fl)
+  :DlgRef_2Sel3Spin2Rb_QTD(parent, name, fl)
+{
+  SpinBox1->close(TRUE);
+  SpinBox2->close(TRUE);
+  SpinBox3->close(TRUE);
+  RadioButton1->setChecked(true);
+  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
+  Layout2->addMultiCellWidget(SpinBox_DX, 0, 0, 2, 4);
+  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
+  Layout2->addWidget(SpinBox_DY, 1, 2);
+  SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
+  Layout2->addWidget(SpinBox_DZ, 1, 4);
+  SpinBox_DY->setEnabled(false);
+  SpinBox_DZ->setEnabled(false);
+}
+
+/*  
+ *  Destroys the object and frees any allocated resources
+ */
+DlgRef_2Sel3Spin2Rb::~DlgRef_2Sel3Spin2Rb()
+{
+    // no need to delete child widgets, Qt does it all for us
+}

diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb.h b/src/DlgRef/DlgRef_2Sel3Spin2Rb.h
index e651662f7dab7db48bfc80823efd7972e5944c71..cc145fd791aaf51652515eb040564b9ee0c0a150 100755 (executable)
--- a/src/DlgRef/DlgRef_2Sel3Spin2Rb.h
+++ b/src/DlgRef/DlgRef_2Sel3Spin2Rb.h
@@ -1,34 +1,27 @@
-//  File   : DlgRef_2Sel3Spin2Rb.h\r
-//  Author : Dmitry MATVEITCHEV\r
-//  Module : GEOM\r
-//  $Header: \r
-\r
-#ifndef DLGREF_2SEL3SPIN2RB_H\r
-#define DLGREF_2SEL3SPIN2RB_H\r
-\r
-#include "DlgRef_2Sel3Spin2Rb_QTD.h"\r
-#include "DlgRef_SpinBox.h"\r
-//#if defined WNT \r
-//#include <SALOME_WNT.hxx>\r
-//#else\r
-//#define SALOME_WNT_EXPORT\r
-//#endif\r
-#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS\r
-#define DLGREF_WNT_EXPORT __declspec( dllexport )\r
-#else\r
-#define DLGREF_WNT_EXPORT\r
-#endif\r
-class DLGREF_WNT_EXPORT DlgRef_2Sel3Spin2Rb : public DlgRef_2Sel3Spin2Rb_QTD\r
-{ \r
-    Q_OBJECT\r
-\r
-public:\r
-    DlgRef_2Sel3Spin2Rb(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);\r
-    ~DlgRef_2Sel3Spin2Rb();\r
-\r
-    DlgRef_SpinBox* SpinBox_DX;\r
-    DlgRef_SpinBox* SpinBox_DY;\r
-    DlgRef_SpinBox* SpinBox_DZ;\r
-};\r
-\r
-#endif // DLGREF_2SEL3SPIN2RB_H\r
+//  File   : DlgRef_2Sel3Spin2Rb.h
+//  Author : Dmitry MATVEITCHEV
+//  Module : GEOM
+//  $Header: 
+
+#ifndef DLGREF_2SEL3SPIN2RB_H
+#define DLGREF_2SEL3SPIN2RB_H
+
+#include "GEOM_DlgRef.hxx"
+
+#include "DlgRef_2Sel3Spin2Rb_QTD.h"
+#include "DlgRef_SpinBox.h"
+
+class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin2Rb : public DlgRef_2Sel3Spin2Rb_QTD
+{ 
+    Q_OBJECT
+
+public:
+    DlgRef_2Sel3Spin2Rb(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
+    ~DlgRef_2Sel3Spin2Rb();
+
+    DlgRef_SpinBox* SpinBox_DX;
+    DlgRef_SpinBox* SpinBox_DY;
+    DlgRef_SpinBox* SpinBox_DZ;
+};
+
+#endif // DLGREF_2SEL3SPIN2RB_H

diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h b/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h
index 89f145afff57ddb403c37145632c26e3feb5f673..aedbcbb1d3213b08030086391691ee01e27117ac 100755 (executable)
--- a/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h
+++ b/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h
@@ -10,6 +10,8 @@
 #ifndef DLGREF_2SEL3SPIN2RB_QTD_H
 #define DLGREF_2SEL3SPIN2RB_QTD_H
 
+#include "GEOM_DlgRef.hxx"
+
 #include <qvariant.h>
 #include <qwidget.h>
 
@@ -24,7 +26,7 @@ class QLabel;
 class QRadioButton;
 class QSpinBox;
 
-class DlgRef_2Sel3Spin2Rb_QTD : public QWidget
+class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin2Rb_QTD : public QWidget
 {
     Q_OBJECT
 

diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx
index 5bc00d051795d4b49d45d75a3f86787baf6da654..a7e620041e5233502d99e85355e6226ff5c8ca9b 100644 (file)
--- a/src/GEOM/GEOM_Engine.cxx
+++ b/src/GEOM/GEOM_Engine.cxx
@@ -58,8 +58,11 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
+using namespace std;
+
 static GEOM_Engine* TheEngine = NULL;
 
+
 static TCollection_AsciiString BuildIDFromObject(Handle(GEOM_Object)& theObject)
 {
   TCollection_AsciiString anID(theObject->GetDocID()), anEntry;

diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx
index fe9ed8e66325a95f737904e62d9b33bd61f263e9..410b6608db874c3b47ca22fb430c1344cc3882be 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx
@@ -32,7 +32,6 @@
 
 #include <vector>
 
-
 class GEOMAlgo_FinderShapeOnQuad: public GEOMAlgo_FinderShapeOn1
 {
 public:
@@ -51,10 +50,10 @@ protected:
 
 private:
 
-  bool                         myConcaveQuad;
-  vector<bool>                 myConcaveSide;
-  vector<gp_Pnt>               myPoints;
-  vector<GeomAdaptor_Surface>  myPlanes;
-  gp_Vec                       myQuadNormal;
+  bool                              myConcaveQuad;
+  std::vector<bool>                 myConcaveSide;
+  std::vector<gp_Pnt>               myPoints;
+  std::vector<GeomAdaptor_Surface>  myPlanes;
+  gp_Vec                            myQuadNormal;
 };
 #endif