first executable version

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

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
 

src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx

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

src/DlgRef/DlgRef_2Sel3Spin2Rb.h

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

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
 

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;

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;
+  bool                              myConcaveQuad;
-  vector<bool>                 myConcaveSide;
+  std::vector<bool>                 myConcaveSide;
-  vector<gp_Pnt>               myPoints;
+  std::vector<gp_Pnt>               myPoints;
-  vector<GeomAdaptor_Surface>  myPlanes;
+  std::vector<GeomAdaptor_Surface>  myPlanes;
-  gp_Vec                       myQuadNormal;
+  gp_Vec                            myQuadNormal;
 };
 #endif