From e22560c4dc95da9e877275ed2b8a30dba569712d Mon Sep 17 00:00:00 2001 From: szy Date: Tue, 23 Aug 2005 13:10:06 +0000 Subject: [PATCH] Windows porting --- src/BuildGUI/BuildGUI_FaceDlg.cxx | 3 +- src/BuildGUI/BuildGUI_ShellDlg.h | 1 - src/BuildGUI/BuildGUI_SolidDlg.h | 1 - src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h | 8 +++- src/DlgRef/DlgRef_1Sel1Check_QTD.h | 8 +++- src/DlgRef/DlgRef_1Sel1Spin1Check.h | 8 +++- src/DlgRef/DlgRef_1Sel_Ext.h | 8 +++- src/DlgRef/DlgRef_2Sel2Spin1Check.h | 8 +++- src/DlgRef/DlgRef_2Sel4Spin1Check.h | 8 +++- src/DlgRef/DlgRef_3Sel3Spin1Check.h | 8 +++- src/DlgRef/DlgRef_3Sel4Spin2Check.h | 8 +++- src/DlgRef/DlgRef_4Sel1List1Check_QTD.h | 8 +++- src/DlgRef/DlgRef_Skeleton_QTD.h | 17 ++------ src/OBJECT/GEOM_AISShape.hxx | 40 ++++++++++--------- src/OperationGUI/OperationGUI.cxx | 3 +- src/OperationGUI/OperationGUI_MaterialDlg.cxx | 3 +- src/RepairGUI/RepairGUI_CloseContourDlg.cxx | 3 +- src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx | 3 +- src/RepairGUI/RepairGUI_FreeFacesDlg.cxx | 2 +- src/RepairGUI/RepairGUI_GlueDlg.cxx | 6 +-- src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx | 2 +- src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx | 2 +- src/RepairGUI/RepairGUI_SewingDlg.cxx | 2 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 3 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.h | 1 - src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx | 3 +- src/TransformationGUI/TransformationGUI.cxx | 3 +- 27 files changed, 110 insertions(+), 60 deletions(-) diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx index dc1d3cd4e..3b7a2c08a 100644 --- a/src/BuildGUI/BuildGUI_FaceDlg.cxx +++ b/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 #include +using namespace std; + //================================================================================= // class : BuildGUI_FaceDlg() // purpose : Constructs a BuildGUI_FaceDlg which is a child of 'parent', with the diff --git a/src/BuildGUI/BuildGUI_ShellDlg.h b/src/BuildGUI/BuildGUI_ShellDlg.h index c9f0282a5..345fa7519 100644 --- a/src/BuildGUI/BuildGUI_ShellDlg.h +++ b/src/BuildGUI/BuildGUI_ShellDlg.h @@ -63,7 +63,6 @@ private slots: void ClickOnOk(); bool ClickOnApply(); void SetEditCurrentArgument(); - void LineEditReturnPressed(); void SelectionIntoArgument(); void ActivateThisDialog(); diff --git a/src/BuildGUI/BuildGUI_SolidDlg.h b/src/BuildGUI/BuildGUI_SolidDlg.h index 02bf806d6..c85fef588 100644 --- a/src/BuildGUI/BuildGUI_SolidDlg.h +++ b/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); diff --git a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h index 909db129e..140977959 100644 --- a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h +++ b/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 diff --git a/src/DlgRef/DlgRef_1Sel1Check_QTD.h b/src/DlgRef/DlgRef_1Sel1Check_QTD.h index 4ff71d4bd..0c5ad2b99 100644 --- a/src/DlgRef/DlgRef_1Sel1Check_QTD.h +++ b/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 diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check.h b/src/DlgRef/DlgRef_1Sel1Spin1Check.h index 6d0b2d6e4..c08788e0d 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin1Check.h +++ b/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 diff --git a/src/DlgRef/DlgRef_1Sel_Ext.h b/src/DlgRef/DlgRef_1Sel_Ext.h index 9b995ddcb..c973f00cd 100644 --- a/src/DlgRef/DlgRef_1Sel_Ext.h +++ b/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 diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check.h b/src/DlgRef/DlgRef_2Sel2Spin1Check.h index b5bdba917..532075853 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin1Check.h +++ b/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 diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check.h b/src/DlgRef/DlgRef_2Sel4Spin1Check.h index 573097cc6..3dc1af1c4 100644 --- a/src/DlgRef/DlgRef_2Sel4Spin1Check.h +++ b/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 diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check.h b/src/DlgRef/DlgRef_3Sel3Spin1Check.h index ba0a06515..e4768659e 100644 --- a/src/DlgRef/DlgRef_3Sel3Spin1Check.h +++ b/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 diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check.h b/src/DlgRef/DlgRef_3Sel4Spin2Check.h index d74915a19..62708139e 100644 --- a/src/DlgRef/DlgRef_3Sel4Spin2Check.h +++ b/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 diff --git a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h index d757be902..4f298bc6c 100644 --- a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h +++ b/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 diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.h b/src/DlgRef/DlgRef_Skeleton_QTD.h index 83d3a1016..d1a2e3cf9 100644 --- a/src/DlgRef/DlgRef_Skeleton_QTD.h +++ b/src/DlgRef/DlgRef_Skeleton_QTD.h @@ -21,22 +21,13 @@ class QLineEdit; class QPushButton; class QRadioButton; - -#if defined DLGREF_EXPORTS -#if defined WIN32 -#define DLGREF_EXPORT __declspec( dllexport ) -#else -#define DLGREF_EXPORT -#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) #else -#if defined WNT -#define DLGREF_EXPORT __declspec( dllimport ) -#else -#define DLGREF_EXPORT -#endif +#define DLGREF_WNT_EXPORT #endif -class DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog +class DLGREF_WNT_EXPORT DlgRef_Skeleton_QTD : public QDialog { Q_OBJECT diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx index 8db765048..96ae886ba 100644 --- a/src/OBJECT/GEOM_AISShape.hxx +++ b/src/OBJECT/GEOM_AISShape.hxx @@ -58,8 +58,12 @@ class Prs3d_Presentation; class SALOME_InteractiveObject; class TopoDS_Shape; - -class GEOM_AISShape : public SALOME_AISShape { +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#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); -Standard_EXPORT Standard_Boolean hasIO() ; -Standard_EXPORT void setIO(const Handle(SALOME_InteractiveObject)& name) ; -Standard_EXPORT void setName(const Standard_CString aName) ; -Standard_EXPORT Standard_CString getName() ; -Standard_EXPORT Handle_SALOME_InteractiveObject getIO() ; -Standard_EXPORT void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight ); -Standard_EXPORT ~GEOM_AISShape(); - -Standard_EXPORT void SetTransparency(const Standard_Real aValue); -Standard_EXPORT void SetShadingColor(const Quantity_Color &aCol); - -Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, + GEOM_AISShape(const TopoDS_Shape& shape, const Standard_CString aName); + Standard_Boolean hasIO() ; + void setIO(const Handle(SALOME_InteractiveObject)& name) ; + void setName(const Standard_CString aName) ; + Standard_CString getName() ; + Handle_SALOME_InteractiveObject getIO() ; + void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight ); + ~GEOM_AISShape(); + + void SetTransparency(const Standard_Real aValue); + void SetShadingColor(const Quantity_Color &aCol); + + 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_(); - Standard_EXPORT const Handle(Standard_Type)& DynamicType() const; - Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; + friend Handle_Standard_Type& GEOM_AISShape_Type_(); + const Handle(Standard_Type)& DynamicType() const; + Standard_Boolean IsKind(const Handle(Standard_Type)&) const; protected: diff --git a/src/OperationGUI/OperationGUI.cxx b/src/OperationGUI/OperationGUI.cxx index b24f64e55..d9035a40f 100644 --- a/src/OperationGUI/OperationGUI.cxx +++ b/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; //======================================================================= diff --git a/src/OperationGUI/OperationGUI_MaterialDlg.cxx b/src/OperationGUI/OperationGUI_MaterialDlg.cxx index 82345576a..e63383883 100644 --- a/src/OperationGUI/OperationGUI_MaterialDlg.cxx +++ b/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 #include +using namespace std; + //================================================================================= // class : OperationGUI_MaterialDlg() // purpose : Constructs a OperationGUI_MaterialDlg which is a child of 'parent', with the diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx index b609b0d65..ac98b0de8 100644 --- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx +++ b/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 +using namespace std; + //================================================================================= // class : RepairGUI_CloseContourDlg() // purpose : Constructs a RepairGUI_CloseContourDlg which is a child of 'parent', with the diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx index e9f373009..04884566b 100644 --- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx +++ b/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 +using namespace std; + //================================================================================= // class : RepairGUI_DivideEdgeDlg() // purpose : Constructs a RepairGUI_DivideEdgeDlg which is a child of 'parent', with the diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx index 96b5c2a1e..04c2b19b0 100644 --- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx +++ b/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() diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx index 218697875..9988bb38d 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.cxx +++ b/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,10 +47,9 @@ using namespace std; #include #include -#define DEFAULT_TOLERANCE_VALUE 1e-07 - - +using namespace std; +#define DEFAULT_TOLERANCE_VALUE 1e-07 //================================================================================= // class : RepairGUI_GlueDlg() diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx index 8cbf4835b..4e8ecc34e 100644 --- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx +++ b/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 #include +using namespace std; //================================================================================= // class : RepairGUI_RemoveHolesDlg() diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx index 74167b217..db6fd6035 100644 --- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx +++ b/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 #include +using namespace std; //================================================================================= // class : RepairGUI_RemoveIntWiresDlg() diff --git a/src/RepairGUI/RepairGUI_SewingDlg.cxx b/src/RepairGUI/RepairGUI_SewingDlg.cxx index d8753363b..2bd0ee30a 100644 --- a/src/RepairGUI/RepairGUI_SewingDlg.cxx +++ b/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() diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx index 63583ecb4..cb30f82dc 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx +++ b/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 #include +using namespace std; //================================================================================= // class : RepairGUI_ShapeProcessDlg() diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h index ffdbd536b..656ab7afa 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h @@ -134,7 +134,6 @@ private slots: void lineEditReturnPressed(); void selectionChanged(); void selectClicked(); - void activateSelection(); void operationChanged(); void advOptionToggled(bool); }; diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx index d7a4dfab5..ee38297a1 100644 --- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx +++ b/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 +using namespace std; + //================================================================================= // class : RepairGUI_SuppressFacesDlg() // purpose : Constructs a RepairGUI_SuppressFacesDlg which is a child of 'parent', with the diff --git a/src/TransformationGUI/TransformationGUI.cxx b/src/TransformationGUI/TransformationGUI.cxx index 59cc9655d..2c8b97a73 100644 --- a/src/TransformationGUI/TransformationGUI.cxx +++ b/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; //======================================================================= -- 2.39.2