Improve build system: install each module's header files to the sub-directory of...

diff --git a/adm_local/unix/config_files/check_SMESH.m4 b/adm_local/unix/config_files/check_SMESH.m4
index 4c0cdb6e4399e90686bb4b0ba219444859a02928..a3d866466d0f81659e5ca3aef5bf22f7a50da7fd 100644 (file)
--- a/adm_local/unix/config_files/check_SMESH.m4
+++ b/adm_local/unix/config_files/check_SMESH.m4
@@ -73,7 +73,7 @@ if test -f ${SMESH_DIR}/bin/salome/smesh.py ; then
    AC_SUBST(SMESH_ROOT_DIR)
 
    SMESH_LDFLAGS=-L${SMESH_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-   SMESH_CXXFLAGS=-I${SMESH_DIR}/include/salome
+   SMESH_CXXFLAGS="-I${SMESH_DIR}/include/salome -I${SMESH_DIR}/include/salome/skel"
 
    AC_SUBST(SMESH_LDFLAGS)
    AC_SUBST(SMESH_CXXFLAGS)   

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index cd851519b43b9a45f237e8476506361a49c93fb6..42063b9dc26affab98c1ddb999487d83da1b850c 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -34,7 +34,8 @@ AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
 # ============================================================
 # Standard directory for installation
 #
-salomeincludedir   = $(includedir)/salome
+salomeincludedir   = $(includedir)/salome/@MODULE_NAME@
+salomeskeldir      = $(includedir)/salome/skel
 libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
 bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 03486bd078c5826f0c33e3afb18cb3b8e58909d2..b3eb90b6f208d0e57cc69d0e91f498c4a4c3d9db 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -54,7 +54,7 @@ nodist_libSalomeIDLSMESH_la_SOURCES = \
        SMESH_MeshEditorSK.cc
 
 # header files must be exported: other modules have to use this library
-nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
+nodist_salomeskel_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
 libSalomeIDLSMESH_la_CPPFLAGS =                        \
        -I$(top_builddir)/idl                   \

diff --git a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
index b44499f9ce056c17018ec83d6c3402c72e3f6de4..33051e479c01883f8cce696ae2d8c94922549f3a 100644 (file)
--- a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
+++ b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
@@ -24,9 +24,9 @@
 #include "DriverDAT_R_SMDS_Mesh.h"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 

diff --git a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
index 796cd5b661b078f01dbe92edebb077c4a9c4f6d1..c068b6c7c01d54648c6b9f0dff0e1036d5382294 100644 (file)
--- a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
+++ b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
@@ -25,9 +25,9 @@
 
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 

diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx
index 31a69cfc19eb25ff672a9326a05690d9914a9edd..78766900dbf92565b36d2b043ffe89ffbce54b7d 100644 (file)
--- a/src/DriverMED/DriverMED_Family.cxx
+++ b/src/DriverMED/DriverMED_Family.cxx
@@ -25,7 +25,7 @@
 //  Module : SMESH
 //
 #include "DriverMED_Family.h"
-#include "MED_Factory.hxx"
+#include <med/MED_Factory.hxx>
 
 #include <sstream>      
 

diff --git a/src/DriverMED/DriverMED_Family.h b/src/DriverMED/DriverMED_Family.h
index f91693a88ac99ce379be10fb5c146558643bdd6c..9c7ef720ff624bda78410ec1c9557a0c5993b56f 100644 (file)
--- a/src/DriverMED/DriverMED_Family.h
+++ b/src/DriverMED/DriverMED_Family.h
@@ -32,7 +32,7 @@
 #include "SMDS_Mesh.hxx"
 #include "SMESHDS_GroupBase.hxx"
 #include "SMESHDS_SubMesh.hxx"
-#include "MED_Common.hxx"
+#include <med/MED_Common.hxx>
 
 #include <boost/shared_ptr.hpp>
 #include <set>

diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
index af538f52f454eea091667a0eb98e2c2538520d2b..a72da2655e40f75c4c495d493f3ec4cd397b35f4 100644 (file)
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
@@ -26,15 +26,15 @@
 #include "DriverMED_R_SMESHDS_Mesh.h"
 #include "DriverMED_R_SMDS_Mesh.h"
 #include "SMESHDS_Mesh.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "DriverMED_Family.h"
 
 #include "SMESHDS_Group.hxx"
 
-#include "MED_Factory.hxx"
-#include "MED_CoordUtils.hxx"
-#include "MED_Utilities.hxx"
+#include <med/MED_Factory.hxx>
+#include <med/MED_CoordUtils.hxx>
+#include <med/MED_Utilities.hxx>
 
 #include <stdlib.h>
 

diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
index ca0753da7df876e0639ee893c8220ab786b8fc40..f32b274cd3acf761b98bd2f4369c3e2197a49887 100644 (file)
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
@@ -34,9 +34,9 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_PolyhedralVolumeOfNodes.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include "MED_Utilities.hxx"
+#include <med/MED_Utilities.hxx>
 
 #define _EDF_NODE_IDS_
 //#define _ELEMENTS_BY_DIM_

diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
index 5b8287ef2bd3f5d9471a40336cd31661cdb10dc7..e8fc5471341d2bb012517d8845f41596429b88aa 100644 (file)
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
@@ -29,7 +29,7 @@
 #include "SMESH_DriverMED.hxx"
 
 #include "Driver_SMESHDS_Mesh.h"
-#include "MED_Factory.hxx"
+#include <med/MED_Factory.hxx>
 
 #include <string>
 #include <list>

diff --git a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
index bd01c08bf759c7296c8043b350ae74106ba79333..147462310fd3426bc7aba937fec5961eb854ea8f 100644 (file)
--- a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
+++ b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
@@ -64,7 +64,7 @@ inline Standard_Boolean IsEqual
 #include <OSD_SingleProtection.hxx>
 #include <Standard_NoMoreObject.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 static const int HEADER_SIZE           =  84;
 static const int SIZEOF_STL_FACET      =  50;

diff --git a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
index ca2387b473b4c4cffa9724a1eb0eb636779ccf82..43f0dfd23dcbcccfa4a22a738f2de21f4e11eb71 100644 (file)
--- a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
+++ b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
@@ -35,7 +35,7 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColgp_Array1OfXYZ.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //using namespace std;
 

diff --git a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
index ecea333f8630be946de0bcdd102c93f69a320aa8..61e35280f70e537c44815210ce14ea53580ebf50 100644 (file)
--- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
@@ -23,14 +23,14 @@
 #include "SMDS_Mesh.hxx"
 #include "SMDS_MeshGroup.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "UNV2411_Structure.hxx"
 #include "UNV2412_Structure.hxx"
 #include "UNV2417_Structure.hxx"
 #include "UNV_Utilities.hxx"
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 

diff --git a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
index 99ed2d738a09fdfe5fe25e86fc1a9dc0e9a021ca..aa9925c04b6048d2a98f650e97983a949b7d681f 100644 (file)
--- a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
@@ -29,14 +29,14 @@
 #include "SMDS_PolyhedralVolumeOfNodes.hxx"
 #include "SMESHDS_GroupBase.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "UNV2411_Structure.hxx"
 #include "UNV2412_Structure.hxx"
 #include "UNV2417_Structure.hxx"
 #include "UNV_Utilities.hxx"
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 using namespace UNV;

diff --git a/src/MEFISTO2/aptrte.cxx b/src/MEFISTO2/aptrte.cxx
index 04ed4670051d1567f44b63bb5243e99b294e8b43..ae34f73bfed1e719597200f8c70a75f17a297364 100755 (executable)
--- a/src/MEFISTO2/aptrte.cxx
+++ b/src/MEFISTO2/aptrte.cxx
@@ -26,7 +26,7 @@
 
 #include "Rn.h"
 #include "aptrte.h"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx
index 16d71448f669a6831d419a478516cd8f938a56e3..5077ab26a3db92daf5eb67c01aa1e32d1cca053f 100644 (file)
--- a/src/OBJECT/SMESH_Actor.cxx
+++ b/src/OBJECT/SMESH_Actor.cxx
@@ -30,12 +30,12 @@
 #include "SMESH_DeviceActor.h"
 #include "SMESH_ObjectDef.h"
 #include "SMESH_ControlsDef.hxx"
-#include "VTKViewer_ExtractUnstructuredGrid.h"
-#include "VTKViewer_FramedTextActor.h"
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/VTKViewer_ExtractUnstructuredGrid.h>
+#include <gui/VTKViewer_FramedTextActor.h>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <vtkProperty.h>
 #include <vtkTimeStamp.h>
@@ -77,7 +77,7 @@
 #define VTK_XVERSION (VTK_MAJOR_VERSION<<16)+(VTK_MINOR_VERSION<<8)+(VTK_BUILD_VERSION)
 #endif
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 1;

diff --git a/src/OBJECT/SMESH_Actor.h b/src/OBJECT/SMESH_Actor.h
index fee096c5756d5c919c49e7f7187293923310e5bc..04fca04788f8b4e7a6a8046003f2c025f2850cc2 100644 (file)
--- a/src/OBJECT/SMESH_Actor.h
+++ b/src/OBJECT/SMESH_Actor.h
@@ -27,7 +27,7 @@
 #ifndef SMESH_ACTOR_H
 #define SMESH_ACTOR_H
 
-#include <SALOME_Actor.h>
+#include <gui/SALOME_Actor.h>
 #include "SMESH_Object.h"
 
 class vtkUnstructuredGrid;

diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx
index 872a30acd4290739525619f8262e4d429502d12c..1a0bde4c8f9c76e456dcf5c15f56599b6044958f 100644 (file)
--- a/src/OBJECT/SMESH_ActorUtils.cxx
+++ b/src/OBJECT/SMESH_ActorUtils.cxx
@@ -21,11 +21,11 @@
 //
 #include "SMESH_ActorUtils.h"
 
-#include "SUIT_Tools.h"
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <vtkUnstructuredGrid.h>
 #include <vtkUnstructuredGridWriter.h>

diff --git a/src/OBJECT/SMESH_DeviceActor.cxx b/src/OBJECT/SMESH_DeviceActor.cxx
index f7d455ddbec82de6c02903182bb91502b903f99f..4cf45e8eaa95ef1861770a41b9f173475d883ad8 100644 (file)
--- a/src/OBJECT/SMESH_DeviceActor.cxx
+++ b/src/OBJECT/SMESH_DeviceActor.cxx
@@ -30,11 +30,11 @@
 #include "SMESH_ControlsDef.hxx"
 #include "SMESH_ActorUtils.h"
 #include "SMESH_FaceOrientationFilter.h"
-#include "VTKViewer_CellLocationsArray.h"
+#include <gui/VTKViewer_CellLocationsArray.h>
 
-#include <VTKViewer_Transform.h>
-#include <VTKViewer_TransformFilter.h>
-#include <VTKViewer_ExtractUnstructuredGrid.h>
+#include <gui/VTKViewer_Transform.h>
+#include <gui/VTKViewer_TransformFilter.h>
+#include <gui/VTKViewer_ExtractUnstructuredGrid.h>
 
 // VTK Includes
 #include <vtkObjectFactory.h>
@@ -62,7 +62,7 @@
 
 #include <vtkRenderer.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;

diff --git a/src/OBJECT/SMESH_DeviceActor.h b/src/OBJECT/SMESH_DeviceActor.h
index 8b2fd6bf7fad2b49cb21b56544cb8a1cb318c6e3..bf5d20def2dfbcfac0d8171fdfced2933a08b59d 100644 (file)
--- a/src/OBJECT/SMESH_DeviceActor.h
+++ b/src/OBJECT/SMESH_DeviceActor.h
@@ -28,7 +28,7 @@
 #ifndef SMESH_DEVICE_ACTOR_H
 #define SMESH_DEVICE_ACTOR_H
 
-#include <VTKViewer_GeometryFilter.h>
+#include <gui/VTKViewer_GeometryFilter.h>
 #include "SMESH_Controls.hxx"
 #include "SMESH_Object.h"
 

diff --git a/src/OBJECT/SMESH_ExtractGeometry.h b/src/OBJECT/SMESH_ExtractGeometry.h
index f1796b098a24e3287d37e26168cc6d55f3b8bdbb..32cd3bc93d800f944cdbb88bc49fd7639c6b6904 100644 (file)
--- a/src/OBJECT/SMESH_ExtractGeometry.h
+++ b/src/OBJECT/SMESH_ExtractGeometry.h
@@ -27,7 +27,7 @@
 #include <vtkExtractGeometry.h>
 #include <vector>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class SMESHOBJECT_EXPORT SMESH_ExtractGeometry : public vtkExtractGeometry{
 public:

diff --git a/src/OBJECT/SMESH_FaceOrientationFilter.cxx b/src/OBJECT/SMESH_FaceOrientationFilter.cxx
index 63b66d5a4890f7a8d55fb291daaecb0c06953b53..d55d2879cd54ccb77a35a873647572dee89efa70 100644 (file)
--- a/src/OBJECT/SMESH_FaceOrientationFilter.cxx
+++ b/src/OBJECT/SMESH_FaceOrientationFilter.cxx
@@ -22,8 +22,8 @@
 #include "SMESH_FaceOrientationFilter.h"
 #include "SMESH_ActorUtils.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <vtkCellData.h>
 #include <vtkDataSet.h>

diff --git a/src/OBJECT/SMESH_Object.cxx b/src/OBJECT/SMESH_Object.cxx
index e7ef139a4a2d3b88b12c5fe1b78ade97652bfab8..5da045e30d8238627490293b0317d5bb546b0d7b 100644 (file)
--- a/src/OBJECT/SMESH_Object.cxx
+++ b/src/OBJECT/SMESH_Object.cxx
@@ -31,9 +31,9 @@
 #include "SMDS_PolyhedralVolumeOfNodes.hxx"
 #include "SMESH_Actor.h"
 #include "SMESH_ControlsDef.hxx"
-#include "SalomeApp_Application.h"
-#include "VTKViewer_ExtractUnstructuredGrid.h"
-#include "VTKViewer_CellLocationsArray.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/VTKViewer_ExtractUnstructuredGrid.h>
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 #include CORBA_SERVER_HEADER(SMESH_Gen)
 #include CORBA_SERVER_HEADER(SALOME_Exception)
@@ -50,7 +50,7 @@
 #include <stdexcept>
 #include <set>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/OBJECT/SMESH_PreviewActorsCollection.cxx b/src/OBJECT/SMESH_PreviewActorsCollection.cxx
index e565701dabe1d9cfc10ec8634aa0d58b20742034..be7a02fbbc9d808ec3c5f2bb2dbf6ed870849d70 100644 (file)
--- a/src/OBJECT/SMESH_PreviewActorsCollection.cxx
+++ b/src/OBJECT/SMESH_PreviewActorsCollection.cxx
@@ -27,9 +27,9 @@
 
 #include "SMESH_PreviewActorsCollection.h"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // OCC includes
 #include <TopoDS.hxx>
@@ -43,10 +43,10 @@
 #include <vtkRenderer.h>
 #include <vtkProperty.h>
 
-#include "VTKViewer_Actor.h"
+#include <gui/VTKViewer_Actor.h>
 
-#include "SVTK_DeviceActor.h"
-#include "SALOME_Actor.h"
+#include <gui/SVTK_DeviceActor.h>
+#include <gui/SALOME_Actor.h>
 
 // QT
 #include <QString>

diff --git a/src/OBJECT/SMESH_PreviewActorsCollection.h b/src/OBJECT/SMESH_PreviewActorsCollection.h
index c5b4c041a26c1d695b86fdc63811f33b93a3cd3e..c91c85a733b680c38438a198d790620a11811d9b 100644 (file)
--- a/src/OBJECT/SMESH_PreviewActorsCollection.h
+++ b/src/OBJECT/SMESH_PreviewActorsCollection.h
@@ -29,10 +29,10 @@
 #define SMESH_PREVIEW_ACTOR_COLLECTION_H
 
 #include "SMESH_Actor.h"
-#include <GEOM_Actor.h>
+#include <geom/GEOM_Actor.h>
 #include "SMESH_Object.h"
 #include <TopoDS_Shape.hxx>
-#include <SMDS_SetIterator.hxx>
+#include "SMDS_SetIterator.hxx"
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <QString>

diff --git a/src/PluginUtils/GeomSelectionTools.cxx b/src/PluginUtils/GeomSelectionTools.cxx
index 74a5f64c29509f4a0f0b78930d987f47719cbcad..cd2e75a834564beefd1aa7bb978c6ca60f83df3a 100644 (file)
--- a/src/PluginUtils/GeomSelectionTools.cxx
+++ b/src/PluginUtils/GeomSelectionTools.cxx
@@ -25,24 +25,24 @@
 
 #include "GeomSelectionTools.h"
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SUIT_Session.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SUIT_Session.h>
 
-#include <SALOME_ListIteratorOfListIO.hxx>
-#include <GEOM_Client.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <geom/GEOM_Client.hxx>
 #include <SMESHGUI_Utils.h>
 #include <boost/shared_ptr.hpp>
-#include <GEOMImpl_Types.hxx>
+#include <geom/GEOMImpl_Types.hxx>
 
 #include <TopoDS.hxx>
 #include <BRep_Tool.hxx>
 #include <Handle_Geom_Surface.hxx>
 #include <BRepAdaptor_Surface.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include "SALOME_LifeCycleCORBA.hxx"
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 #include <sstream>
 
 /*!

diff --git a/src/PluginUtils/GeomSelectionTools.h b/src/PluginUtils/GeomSelectionTools.h
index 2ec4e9f9d036953f748b5395deb40901fa82d464..4ecc29ce3e97d568fe244c06e090b067c61554be 100644 (file)
--- a/src/PluginUtils/GeomSelectionTools.h
+++ b/src/PluginUtils/GeomSelectionTools.h
@@ -32,10 +32,10 @@
 #  define GEOMSELECTIONTOOLS_EXPORT
 #endif
 
-#include "SALOMEDSClient.hxx"
-#include "SALOME_InteractiveObject.hxx"
-#include <SALOME_ListIO.hxx>
-#include <SalomeApp_Application.h>
+#include <kernel/SALOMEDSClient.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SalomeApp_Application.h>
 
 #include <TopoDS_Shape.hxx>
 #include <GeomAbs_SurfaceType.hxx>

diff --git a/src/SMDS/SMDS_EdgePosition.cxx b/src/SMDS/SMDS_EdgePosition.cxx
index ae5bf5ccd2075d06355945aef55d4e00ac005049..1ff5fe4253b1b77320c45fb383c8c631b09ba2d4 100644 (file)
--- a/src/SMDS/SMDS_EdgePosition.cxx
+++ b/src/SMDS/SMDS_EdgePosition.cxx
@@ -26,7 +26,7 @@
 //
 #include "SMDS_EdgePosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMDS/SMDS_FaceOfNodes.cxx b/src/SMDS/SMDS_FaceOfNodes.cxx
index 7fd7f62f98b6ce3d22d975e272eddcf54029eb4d..4a522213adfb3cae01ebb887958984f25b6e8989 100644 (file)
--- a/src/SMDS/SMDS_FaceOfNodes.cxx
+++ b/src/SMDS/SMDS_FaceOfNodes.cxx
@@ -31,7 +31,7 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMDS/SMDS_FacePosition.cxx b/src/SMDS/SMDS_FacePosition.cxx
index 6d4d2a2232066da6e6a728f23808af8853b42ed4..13bedd259472d6eb827d3e068e1f3e8777bd4b4b 100644 (file)
--- a/src/SMDS/SMDS_FacePosition.cxx
+++ b/src/SMDS/SMDS_FacePosition.cxx
@@ -26,7 +26,7 @@
 //
 #include "SMDS_FacePosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMDS/SMDS_Mesh.cxx b/src/SMDS/SMDS_Mesh.cxx
index fb7bd9a94d14c571d92f4cbc59d682790a14f9e6..20e959cbab2b5eb8a527882201a8a2b41e694853 100644 (file)
--- a/src/SMDS/SMDS_Mesh.cxx
+++ b/src/SMDS/SMDS_Mesh.cxx
@@ -25,7 +25,7 @@
 #pragma warning(disable:4786)
 #endif
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "SMDS_Mesh.hxx"
 #include "SMDS_VolumeOfNodes.hxx"
 #include "SMDS_VolumeOfFaces.hxx"

diff --git a/src/SMDS/SMDS_MeshElement.cxx b/src/SMDS/SMDS_MeshElement.cxx
index e2a7f61da19d63405317a9b68b3e4a8830f9b620..ae99cf29552c31f1232754c2e508259097a31f1d 100644 (file)
--- a/src/SMDS/SMDS_MeshElement.cxx
+++ b/src/SMDS/SMDS_MeshElement.cxx
@@ -30,7 +30,7 @@
 #include "SMDS_MeshEdge.hxx"
 #include "SMDS_MeshFace.hxx"
 #include "SMDS_MeshVolume.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx
index c69bb3e424c65f3ddaa32a08fa5aee23718f501e..19fd2df01872e76a1b00dcd460573924e6e0e203 100644 (file)
--- a/src/SMDS/SMDS_MeshGroup.cxx
+++ b/src/SMDS/SMDS_MeshGroup.cxx
@@ -29,7 +29,7 @@
 #endif
 
 #include "SMDS_MeshGroup.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx b/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx
index d6c8fb5b16dd7c35916e2e2c03bd39c6ffe0f8ab..04ab9eed9842ad33407f02cd79c8ff96e1f9a440 100644 (file)
--- a/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx
+++ b/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx
@@ -31,7 +31,7 @@
 #include "SMDS_SetIterator.hxx"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx b/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx
index ce8ace8300e9efde4316b00c9d1aab9c067b264f..804b469d0de065fc8ca1b2ff307ad211f11e5913 100644 (file)
--- a/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx
@@ -29,7 +29,7 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_SetIterator.hxx"
 #include "SMDS_VolumeTool.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <set>
 

diff --git a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx
index 168457cf509085e4a82401c2a332ccdcd1ebb060..cb0e6408fc89effbf5bd9adb8836d0ced41f7a3f 100644 (file)
--- a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx
+++ b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx
@@ -31,7 +31,7 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx b/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx
index 8d68ee4d0610b017f056186ded675ca3a14f9c74..a8b1df107c9ea734afe3fb90cc4ff8fdf0ab3f70 100644 (file)
--- a/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx
@@ -31,7 +31,7 @@
 #include "SMDS_SetIterator.hxx"
 #include "SMDS_VolumeTool.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMDS/SMDS_VertexPosition.cxx b/src/SMDS/SMDS_VertexPosition.cxx
index 3de9ed6acd1f55b69c78c434bd2fbf9dd00a52ba..55009fe90c064b9e52a5f7494ba989b2a76e8902 100644 (file)
--- a/src/SMDS/SMDS_VertexPosition.cxx
+++ b/src/SMDS/SMDS_VertexPosition.cxx
@@ -26,7 +26,7 @@
 //
 #include "SMDS_VertexPosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMDS/SMDS_VolumeOfNodes.cxx b/src/SMDS/SMDS_VolumeOfNodes.cxx
index 73b61ca3fb4b314d5bc9281ed4eb5324cfcc7573..df8ec1215abdb025d23d564ac2fcd15e3f74940c 100644 (file)
--- a/src/SMDS/SMDS_VolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_VolumeOfNodes.cxx
@@ -29,7 +29,7 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_SetIterator.hxx"
 #include "SMDS_VolumeTool.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <vector>
 

diff --git a/src/SMDS/SMDS_VolumeTool.cxx b/src/SMDS/SMDS_VolumeTool.cxx
index 24509b255f6b536228c11861aaf6b7b51c1881b0..334871cd8f3ca7a84317250493f6dff1c28c0def 100644 (file)
--- a/src/SMDS/SMDS_VolumeTool.cxx
+++ b/src/SMDS/SMDS_VolumeTool.cxx
@@ -34,7 +34,7 @@
 #include "SMDS_PolyhedralVolumeOfNodes.hxx"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <map>
 #include <float.h>

diff --git a/src/SMESH/SMESH_2D_Algo.cxx b/src/SMESH/SMESH_2D_Algo.cxx
index 00723cbd7268d4a4ee18c4f333395c5ac854be32..4064ff87c6f4ba9480a8edeb51e76bc80b70f6fb 100644 (file)
--- a/src/SMESH/SMESH_2D_Algo.cxx
+++ b/src/SMESH/SMESH_2D_Algo.cxx
@@ -28,7 +28,7 @@
 #include "SMESH_2D_Algo.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopExp_Explorer.hxx>
 #include <TopExp.hxx>

diff --git a/src/SMESH/SMESH_3D_Algo.cxx b/src/SMESH/SMESH_3D_Algo.cxx
index ee547368fd03a9886a90ed1c311bb5c5cbe5d656..5eeb84d1e6b9453b524763d32a93d44499c4e1bd 100644 (file)
--- a/src/SMESH/SMESH_3D_Algo.cxx
+++ b/src/SMESH/SMESH_3D_Algo.cxx
@@ -28,7 +28,7 @@
 #include "SMESH_3D_Algo.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESH/SMESH_Algo.cxx b/src/SMESH/SMESH_Algo.cxx
index da8647c400dcebc6595f7bba4b856c867f45e305..949986e38f3217dbd854a6017390394ab71f9370 100644 (file)
--- a/src/SMESH/SMESH_Algo.cxx
+++ b/src/SMESH/SMESH_Algo.cxx
@@ -58,7 +58,7 @@
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <algorithm>
 

diff --git a/src/SMESH/SMESH_Block.cxx b/src/SMESH/SMESH_Block.cxx
index 14b373536fb3ef31c13a0d274f69e4166c1229b9..9d923f19eb501e85cd0baeb2aef38df3d60cb57f 100644 (file)
--- a/src/SMESH/SMESH_Block.cxx
+++ b/src/SMESH/SMESH_Block.cxx
@@ -55,7 +55,7 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_MeshVolume.hxx"
 #include "SMDS_VolumeTool.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <list>
 

diff --git a/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx b/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx
index 0ac60ca29851ed5e3c1734916fe5e36f1059360e..3d3f22309e216d6e7299e81972893db4d5b6bf7b 100644 (file)
--- a/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx
+++ b/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_SMESH.hxx"
 
-#include <SMESH_SequenceOfElemPtr.hxx>
+#include "SMESH_SequenceOfElemPtr.hxx"
 
 #include <NCollection_DefineDataMap.hxx>
 

diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx
index 08c1dd868eccbee9de17cc3d60bbf5efe6481610..3e782c6a4adda1e556ee730c36c882993d36a270 100644 (file)
--- a/src/SMESH/SMESH_Gen.cxx
+++ b/src/SMESH/SMESH_Gen.cxx
@@ -31,9 +31,9 @@
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <gp_Pnt.hxx>
 #include <BRep_Tool.hxx>

diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx
index 44c7d5a79e206ecd31c085788957f2bc41caed5c..159bbfc105b43a13de943b9f73d2da99329cf247 100644 (file)
--- a/src/SMESH/SMESH_Gen.hxx
+++ b/src/SMESH/SMESH_Gen.hxx
@@ -30,7 +30,7 @@
 
 #include "SMESH_SMESH.hxx"
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include "SMESH_Hypothesis.hxx"
 #include "SMESH_ComputeError.hxx"

diff --git a/src/SMESH/SMESH_Hypothesis.cxx b/src/SMESH/SMESH_Hypothesis.cxx
index c731f60cf391bd187a30118645a3edfd447bdea4..db3f1417035d644673f1bd909166d4b79efcade2 100644 (file)
--- a/src/SMESH/SMESH_Hypothesis.cxx
+++ b/src/SMESH/SMESH_Hypothesis.cxx
@@ -27,7 +27,7 @@
 #include "SMESH_Hypothesis.hxx"
 #include "SMESH_Gen.hxx"
 #include "SMESH_subMesh.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index ea3beb9f0838ffc28049416ad78b3edb9349c8af..f70e8fd59a365c394ededa921e15ae1276a1f34c 100644 (file)
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -37,7 +37,7 @@
 #include "SMDS_MeshVolume.hxx"
 #include "SMDS_SetIterator.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "DriverMED_W_SMESHDS_Mesh.h"
 #include "DriverDAT_W_SMDS_Mesh.h"
@@ -59,7 +59,7 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopoDS_Iterator.hxx>
 
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 using namespace std;
 

diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index b93e8b5e732716959bdeceadb71633bcaf457672..923d6ee71c8dc59c56b3dc4d12c6bf10aa1fd2c1 100644 (file)
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -35,7 +35,7 @@
 #include "SMESHDS_Command.hxx"
 #include "SMDSAbs_ElementType.hxx"
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Shape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>

diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx
index 9822c70eaf74f8d582d64161593867b492c958f9..2ef27dab0357dab7bf85d83466d00b0f9bcf97a1 100644 (file)
--- a/src/SMESH/SMESH_MeshEditor.cxx
+++ b/src/SMESH/SMESH_MeshEditor.cxx
@@ -44,7 +44,7 @@
 #include "SMESH_OctreeNode.hxx"
 #include "SMESH_Group.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>

diff --git a/src/SMESH/SMESH_MeshEditor.hxx b/src/SMESH/SMESH_MeshEditor.hxx
index 3c197b2ac20fcf5b4fe91b6dadfbab4d9e45a7e1..7f5419183562892c40f7f2a31d5dd5225f70c36b 100644 (file)
--- a/src/SMESH/SMESH_MeshEditor.hxx
+++ b/src/SMESH/SMESH_MeshEditor.hxx
@@ -36,7 +36,7 @@
 #include "SMESH_SequenceOfElemPtr.hxx"
 #include "SMESH_SequenceOfNode.hxx"
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #include <TColStd_HSequenceOfReal.hxx>
 #include <gp_Dir.hxx>

diff --git a/src/SMESH/SMESH_MesherHelper.cxx b/src/SMESH/SMESH_MesherHelper.cxx
index 47c21bcb0f54d6519d41a1c0c6a87c251c26fc5f..8e616240a00b08937ca2bf386df3054e86b94efb 100644 (file)
--- a/src/SMESH/SMESH_MesherHelper.cxx
+++ b/src/SMESH/SMESH_MesherHelper.cxx
@@ -53,7 +53,7 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #include <limits>
 

diff --git a/src/SMESH/SMESH_MesherHelper.hxx b/src/SMESH/SMESH_MesherHelper.hxx
index d6b310d652fc413bdd8f5287e2468d9c62100b4b..8844b5cee73a509e534e755144a7c06e8234cecc 100644 (file)
--- a/src/SMESH/SMESH_MesherHelper.hxx
+++ b/src/SMESH/SMESH_MesherHelper.hxx
@@ -29,8 +29,8 @@
 #include "SMESH_SMESH.hxx"
 
 #include "SMESH_MeshEditor.hxx" // needed for many meshers
-#include <SMDS_MeshNode.hxx>
-#include <SMDS_QuadraticEdge.hxx>
+#include "SMDS_MeshNode.hxx"
+#include "SMDS_QuadraticEdge.hxx"
 
 #include <Geom_Surface.hxx>
 #include <TopoDS_Face.hxx>

diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx
index 834003e8c8ed3573d75bc785b139aa9e5be108ea..0b77ae57ca2c0c5ca46b876814421809cd90ef1c 100644 (file)
--- a/src/SMESH/SMESH_Pattern.cxx
+++ b/src/SMESH/SMESH_Pattern.cxx
@@ -72,7 +72,7 @@
 #include "SMESH_MesherHelper.hxx"
 #include "SMESH_subMesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESH/SMESH_SequenceOfElemPtr.hxx b/src/SMESH/SMESH_SequenceOfElemPtr.hxx
index 77c92ad5aa84f7d82bc6f3e0a09c8d2dbbc370e5..ba9c01137e07d97fd0190bc63567b4adf86b4493 100644 (file)
--- a/src/SMESH/SMESH_SequenceOfElemPtr.hxx
+++ b/src/SMESH/SMESH_SequenceOfElemPtr.hxx
@@ -30,7 +30,7 @@
 
 #include <NCollection_DefineSequence.hxx>
 
-#include <SMDS_MeshElement.hxx>
+#include "SMDS_MeshElement.hxx"
 
 typedef const SMDS_MeshElement* SMDS_MeshElementPtr;
 

diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index d93b598a50336f83786885dd011ef5ac68206e7b..548eb89b5b9ad8706e05dd843e2bc478a306f2a9 100644 (file)
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -37,8 +37,8 @@
 #include "SMDS_SetIterator.hxx"
 #include "SMDSAbs_ElementType.hxx"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
 
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>

diff --git a/src/SMESH/SMESH_subMesh.hxx b/src/SMESH/SMESH_subMesh.hxx
index 4dbf1795a85430372fba0fbb14219a27a0b661e6..a1b00dc51aa86632cc62190bf1ef02fc7efb4da6 100644 (file)
--- a/src/SMESH/SMESH_subMesh.hxx
+++ b/src/SMESH/SMESH_subMesh.hxx
@@ -35,7 +35,7 @@
 #include "SMESH_ComputeError.hxx"
 #include "SMESH_Algo.hxx"
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Shape.hxx>
 

diff --git a/src/SMESHClient/SMESH_Client.cxx b/src/SMESHClient/SMESH_Client.cxx
index a1374e47f2dd798eacd5afddc1a1f8347b02af8c..41126d1ef37259eebd46bddf1ec92f092b1f06a2 100644 (file)
--- a/src/SMESHClient/SMESH_Client.cxx
+++ b/src/SMESHClient/SMESH_Client.cxx
@@ -27,15 +27,15 @@
 #include "SMESH_Client.hxx"
 #include "SMESH_Mesh.hxx"
 
-#include "SALOME_NamingService.hxx"
-#include "SALOME_LifeCycleCORBA.hxx"
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Component)
 #include CORBA_SERVER_HEADER(SALOME_Exception)
 
-#include "Basics_Utils.hxx"
-#include "utilities.h"
+#include <kernel/Basics_Utils.hxx>
+#include <kernel/utilities.h>
 
 #ifdef WNT
 #include <process.h>

diff --git a/src/SMESHDS/SMESHDS_Command.cxx b/src/SMESHDS/SMESHDS_Command.cxx
index dd5c751bdd50507f5220270c4f3938e3ac84138e..afc9f5cda1a9f85c0702a157b0c68954f5f101d6 100644 (file)
--- a/src/SMESHDS/SMESHDS_Command.cxx
+++ b/src/SMESHDS/SMESHDS_Command.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESHDS_Command.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESHDS/SMESHDS_Document.cxx b/src/SMESHDS/SMESHDS_Document.cxx
index 838e7a4873baa66ad85003ae784be6c941b0d09e..36a936492406f79472220853319dd2623dd5281c 100644 (file)
--- a/src/SMESHDS/SMESHDS_Document.cxx
+++ b/src/SMESHDS/SMESHDS_Document.cxx
@@ -26,7 +26,7 @@
 //  $Header: 
 //
 #include "SMESHDS_Document.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESHDS/SMESHDS_GroupBase.cxx b/src/SMESHDS/SMESHDS_GroupBase.cxx
index b14afd408ff1ac732e937a202c6c2df5e49d1daf..213b2f5d43cff93d7d72d47f7eae8162c40b433f 100644 (file)
--- a/src/SMESHDS/SMESHDS_GroupBase.cxx
+++ b/src/SMESHDS/SMESHDS_GroupBase.cxx
@@ -27,7 +27,7 @@
 #include "SMESHDS_GroupBase.hxx"
 #include "SMESHDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
index 5fae9fda2ff724ab00753a9eec05cd07d2d3aae7..122c80b8eaebbfc8b2477cef7835ef921e73493b 100644 (file)
--- a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
+++ b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
@@ -25,7 +25,7 @@
 //
 #include "SMESHDS_GroupOnGeom.hxx"
 #include "SMESHDS_Mesh.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESHDS/SMESHDS_Mesh.cxx b/src/SMESHDS/SMESHDS_Mesh.cxx
index c4479f35bc73ff1ecfd6393020e580085c02ac55..8e0ca34e2252870446d1ba84bee4e13d499e1668 100644 (file)
--- a/src/SMESHDS/SMESHDS_Mesh.cxx
+++ b/src/SMESHDS/SMESHDS_Mesh.cxx
@@ -40,7 +40,7 @@
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Iterator.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESHDS/SMESHDS_SubMesh.cxx b/src/SMESHDS/SMESHDS_SubMesh.cxx
index 2f1f0ca8fb3548173cde553a206686d19206b27a..eb5199d6637974553de4bf75c17f582bd15ed2c5 100644 (file)
--- a/src/SMESHDS/SMESHDS_SubMesh.cxx
+++ b/src/SMESHDS/SMESHDS_SubMesh.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESHDS_SubMesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "SMDS_SetIterator.hxx"
 
 using namespace std;

diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
index 928313f80507414d1fbbb8f94259f8232470adf1..a296019ae25636b9aa800aaa25bf89b08842acb0 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
+++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
@@ -27,7 +27,7 @@
 
 #include "SMESH_Type.h"
 
-#include <SUIT_SelectionFilter.h>
+#include <gui/SUIT_SelectionFilter.h>
 
 #include <QList>
 

diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
index d8633f307516d25b168d1dfa282d3ca0a6490def..6190a5d7d1c4706725d7101c1de983b32c9e0425 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
@@ -24,18 +24,18 @@
 //
 #include "SMESH_NumberFilter.hxx"
 
-#include "GEOM_Client.hxx"
-#include "GeometryGUI.h"
+#include <geom/GEOM_Client.hxx>
+#include <geom/GeometryGUI.h>
 
-#include "SUIT_Application.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Session.h>
 
-#include "SalomeApp_Study.h"
-#include "LightApp_DataOwner.h"
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_DataOwner.h>
 
-#include "SALOME_InteractiveObject.hxx"
-#include "SALOMEDSClient_SObject.hxx"
-#include "SALOMEDS_SObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 #include <TopExp_Explorer.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>

diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx
index 45724cfa1a9b12de0bac9964e4624fde0f085832..72f5c9b5027492441173f64957ab68656a7d2ddc 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx
+++ b/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx
@@ -27,7 +27,7 @@
 
 #include "SMESH_Type.h"
 
-#include "SUIT_SelectionFilter.h"
+#include <gui/SUIT_SelectionFilter.h>
 
 #include <TopAbs_ShapeEnum.hxx>
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
index 6cf6fac59dc010603076ffee8785a10966825187..f5ea6fa06a02cb19abf093b76780e97af08f6785 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
@@ -21,10 +21,10 @@
 //
 #include "SMESH_TypeFilter.hxx"
 
-#include <SUIT_Session.h>
+#include <gui/SUIT_Session.h>
 
-#include <SalomeApp_Study.h>
-#include <LightApp_DataOwner.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_DataOwner.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SMESH_Gen)

diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx
index d966bfaa59a369483809f00278c320f50873415a..00479dace70371967b9929ecfaa72d11dada06b4 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx
+++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx
@@ -26,7 +26,7 @@
 #define _SMESH_TypeFilter_HeaderFile
 
 #include "SMESH_Type.h"
-#include "SUIT_SelectionFilter.h"
+#include <gui/SUIT_SelectionFilter.h>
 
 class SUIT_DataOwner;
 

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index a57406e8cc04d1c26e3c1409d2fe8d978897c5b6..152f9a7cdac132c6f82be988e1758ec305a7df24 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -85,35 +85,35 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_CheckFileDlg.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_CheckFileDlg.h>
 
-#include <LightApp_DataOwner.h>
-#include <LightApp_Preferences.h>
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_UpdateFlags.h>
-#include <LightApp_NameDlg.h>
+#include <gui/LightApp_DataOwner.h>
+#include <gui/LightApp_Preferences.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_UpdateFlags.h>
+#include <gui/LightApp_NameDlg.h>
 
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewManager.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewManager.h>
 
-#include <VTKViewer_Algorithm.h>
+#include <gui/VTKViewer_Algorithm.h>
 
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_FileDlg.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Session.h>
 
-#include <QtxPopupMgr.h>
-#include <QtxFontEdit.h>
+#include <gui/QtxPopupMgr.h>
+#include <gui/QtxFontEdit.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>
@@ -134,11 +134,11 @@
 #include <vtkPlane.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_Study.hxx>
-#include <SALOMEDSClient_StudyBuilder.hxx>
-#include <SALOMEDSClient_SComponent.hxx>
-#include <SALOMEDSClient_ClientFactory.hxx>
-#include <SALOMEDSClient_IParameters.hxx>
+#include <kernel/SALOMEDS_Study.hxx>
+#include <kernel/SALOMEDSClient_StudyBuilder.hxx>
+#include <kernel/SALOMEDSClient_SComponent.hxx>
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/SALOMEDSClient_IParameters.hxx>
 
 // OCCT includes
 #include <Standard_ErrorHandler.hxx>

diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h
index 66ac986ec50d2e3fb1a128b40bfe17a52257e7aa..cb28128e8cdde591ab1b48e54d85802575e6c95d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.h
+++ b/src/SMESHGUI/SMESHGUI.h
@@ -30,8 +30,8 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <SalomeApp_Module.h>
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SalomeApp_Module.h>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
index 9814a97f4e70237f2dc9d426c738f0e6a4581950..5ea0bbb5f70f20d301278ae79863b189f7c8503c 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
@@ -39,16 +39,16 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI inclues
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ViewManager.h>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
-#include <SalomeApp_Application.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // IDL incldues
 #include CORBA_SERVER_HEADER(SMESH_MeshEditor)

diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
index ae0c44e0f6aa286606a6738933f545ab785d7ba7..b2873dc814cbb27b0e42cb76e0db6a20ff038c36 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
+++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
@@ -29,7 +29,7 @@
 // SMESH includes
 #include "SMESH_SMESHGUI.hxx"
 
-#include <SMDSAbs_ElementType.hxx>
+#include "SMDSAbs_ElementType.hxx"
 
 // Qt includes
 #include <QDialog>

diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
index 23b49bc1223a5bd21dab2019737eff33b4f1bea1..113b27f70071e78c4c4dcbe46f17e7f268bcd28f 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
@@ -39,20 +39,20 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewManager.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewManager.h>
 
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
-#include <SalomeApp_Application.h>
+#include <gui/SalomeApp_Application.h>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
index 1e58867d020b787d620e2ecf65bac563ffbd279d..1006abd137989403a34d4e0320190d19498f8810 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@ -34,16 +34,16 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Study.h>
-#include <SUIT_OverrideCursor.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SUIT_OverrideCursor.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // Qt includes
 #include <QApplication>

diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
index be11acf6cd20a9c0955a1b37113c7d7c7656c18b..bdf6170e019a5af52f3893bfa3487517b9e0a349 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
@@ -35,18 +35,18 @@
 #include <SMESH_ActorUtils.h>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // Qt includes
 #include <QLabel>

diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.h b/src/SMESHGUI/SMESHGUI_ClippingDlg.h
index ed92330f27031525500e2a878919f8441eb2c4b7..c57d7b2633ef555b1d3eed94eb3fb75a65e9f88d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ClippingDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME includes
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // Qt includes
 #include <QDialog>

diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
index 004b1849678906a6a55cd8a31091ab14b5e10588..8a32acea3e4d464b308f03093d5e2c04ac9ec4c1 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
@@ -41,25 +41,25 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
-#include <GEOM_Actor.h>
+#include <geom/GEOMBase.h>
+#include <geom/GEOM_Actor.h>
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_UpdateFlags.h>
-#include <SALOME_ListIO.hxx>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
-#include <SalomeApp_Application.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <QtxComboBox.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_UpdateFlags.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/QtxComboBox.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // OCCT includes
 #include <BRep_Tool.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.h b/src/SMESHGUI/SMESHGUI_ComputeDlg.h
index ab64b33e318766f35630ad8f9fab863faba1c9f1..7e0aa8fe14240bdc420482b98388d9560bbce0cb 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ComputeDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.h
@@ -32,7 +32,7 @@
 #include "SMESHGUI_Operation.h"
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // Qt includes
 #include <QMap>

diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index 15a6d8ff80b15fe5860f6921cffdfdfd203f7373..91e42bcf80379f82f76b09ed3c0eff9d2abe30f0 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@ -32,10 +32,10 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <LightApp_UpdateFlags.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-#include <SalomeApp_Tools.h>
+#include <gui/LightApp_UpdateFlags.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SalomeApp_Tools.h>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
index 5ee6ade482b4bf05fef0da14ef7c594ea18f171f..6ad7363616d28394c8b4d606eee4e67757168710 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
@@ -35,22 +35,22 @@
 #include <SMESH_NumberFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_FileDlg.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
index b97b4d7f2a22d9df93283fdff758b42cfc2712a5..3e2da11fecfe274c030bc437fb6effbb24c49e9a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
@@ -38,17 +38,17 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // OCCT includes
 #include <TColStd_ListOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
index 1922e70deab2a5cadf395655f4e18650979800ba..a7d2989d884c73ecda98ea81d2dff245941c1c13 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
@@ -32,20 +32,20 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SalomeApp_Study.h>
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <SVTK_Selection.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_Selection.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // Qt includes
 #include <QHBoxLayout>

diff --git a/src/SMESHGUI/SMESHGUI_Dialog.cxx b/src/SMESHGUI/SMESHGUI_Dialog.cxx
index 7542215217caaf2228eb2da467f12e945b8e4634..089f10d94aad4bda2456d0a92f642e76b86b9b15 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Dialog.cxx
+++ b/src/SMESHGUI/SMESHGUI_Dialog.cxx
@@ -29,9 +29,9 @@
 #include <SMESH_Type.h>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
 
 // Qt includes
 #include <QFrame>

diff --git a/src/SMESHGUI/SMESHGUI_Dialog.h b/src/SMESHGUI/SMESHGUI_Dialog.h
index eb60f800b4b295d51fe6605563268c4ae3923b4d..21f71bb64adc6beba95738d934e5edf75feb5279 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Dialog.h
+++ b/src/SMESHGUI/SMESHGUI_Dialog.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <LightApp_Dialog.h>
+#include <gui/LightApp_Dialog.h>
 
 class SUIT_Desktop;
 class SUIT_ResourceMgr;

diff --git a/src/SMESHGUI/SMESHGUI_Displayer.cxx b/src/SMESHGUI/SMESHGUI_Displayer.cxx
index 0b41a00d0a20c63f7e3e5fb18d7a2155adafe88a..16b2d236133dd65f9aabc778cfcaf471337c1631 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Displayer.cxx
+++ b/src/SMESHGUI/SMESHGUI_Displayer.cxx
@@ -29,11 +29,11 @@
 #include "SMESHGUI_VTKUtils.h"
 
 // SALOME GUI includes
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Application.h>
-#include <SUIT_ViewManager.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
 SMESHGUI_Displayer::SMESHGUI_Displayer( SalomeApp_Application* app )
 : LightApp_Displayer(),

diff --git a/src/SMESHGUI/SMESHGUI_Displayer.h b/src/SMESHGUI/SMESHGUI_Displayer.h
index 61288ee13f672e978939707844e4d70f82c684fc..837d3fe0bcf2b52d26028921cf4617092e034128 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Displayer.h
+++ b/src/SMESHGUI/SMESHGUI_Displayer.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <LightApp_Displayer.h>
+#include <gui/LightApp_Displayer.h>
 
 class SalomeApp_Application;
 class SalomeApp_Study;

diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
index ac4ce055082a926c93c5009aadbd0251d1acc57d..f78c1b310a7762ac91e9e1d615544f4760a6ed56 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
@@ -38,18 +38,18 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
index 2131b25e6c403ce886222b302a82541b1ecc1090..c75b00b33d231c89259549ab1d8bbc37f480458b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
@@ -42,19 +42,19 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
+#include <geom/GEOMBase.h>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // OCCT includes
 #include <BRep_Tool.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
index 7c32fc1e24b9b94fd64d8344609f63923d715dd4..f25be195783b8c00076200d2b0841598c38c44b3 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
@@ -41,19 +41,19 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <SalomeApp_IntSpinBox.h>
+#include <gui/SalomeApp_IntSpinBox.h>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
index 4425d29f78bdc5531d8430317c78df22620b3d29..b97316e01f4d8b8e8360f8afd040e62ba498ced0 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // Qt includes
 #include <QDialog>

diff --git a/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx b/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
index b6f6f0e48505edad93513fb2ba27ccf3841921d9..18c6dada5c48e4d6de3312132d200227ec57d70c 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
@@ -25,7 +25,7 @@
 //
 #include "SMESHGUI_FileInfoDlg.h"
 
-#include <MED_Common.hxx>
+#include <med/MED_Common.hxx>
 
 #include <QGridLayout>
 #include <QLabel>

diff --git a/src/SMESHGUI/SMESHGUI_FileInfoDlg.h b/src/SMESHGUI/SMESHGUI_FileInfoDlg.h
index 0303acb61586158dee10b54f8d5af2c775fe64cc..f47e6e4d4750fab99a59a421701879efce84b6b3 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_FileInfoDlg.h
+++ b/src/SMESHGUI/SMESHGUI_FileInfoDlg.h
@@ -26,7 +26,7 @@
 #ifndef SMESHGUI_FILEINFODLG_H
 #define SMESHGUI_FILEINFODLG_H
 
-#include <QtxDialog.h>
+#include <gui/QtxDialog.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(MED)

diff --git a/src/SMESHGUI/SMESHGUI_FileValidator.cxx b/src/SMESHGUI/SMESHGUI_FileValidator.cxx
index f2aa3161b2fe472facd6c6fb527f04edeef5aca2..36f771030e0899fd6b432752391a592b2c9a5746 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_FileValidator.cxx
+++ b/src/SMESHGUI/SMESHGUI_FileValidator.cxx
@@ -27,8 +27,8 @@
 #include "SMESHGUI_FileValidator.h"
 
 // SALOME GUI includes
-#include <SUIT_MessageBox.h>
-#include <SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Tools.h>
 
 // Qt includes
 #include <QFileInfo>

diff --git a/src/SMESHGUI/SMESHGUI_FileValidator.h b/src/SMESHGUI/SMESHGUI_FileValidator.h
index ae426677fbab9b8e22721c5c37e2b6787a333900..395405db6694c78a7d9fefe8f787b543086f4283 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_FileValidator.h
+++ b/src/SMESHGUI/SMESHGUI_FileValidator.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <SUIT_FileValidator.h>
+#include <gui/SUIT_FileValidator.h>
 
 class SMESHGUI_EXPORT SMESHGUI_FileValidator : public SUIT_FileValidator
 {

diff --git a/src/SMESHGUI/SMESHGUI_Filter.h b/src/SMESHGUI/SMESHGUI_Filter.h
index 6da648be9e203aaaabca06ea32cea099ab267f0c..91ee1b762b83fb81c7480b8fc0d31210f42b7c95 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_Filter.h
+++ b/src/SMESHGUI/SMESHGUI_Filter.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <VTKViewer_Filter.h>
+#include <gui/VTKViewer_Filter.h>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index 4cc5d3fdce49a8a6d0a9ef7c216716acece5f3e1..5834d3909455512d81b219a91b4d7eca6a11d03e 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@ -38,30 +38,30 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
-#include <GEOM_FaceFilter.h>
-#include <GEOM_TypeFilter.h>
+#include <geom/GEOMBase.h>
+#include <geom/GEOM_FaceFilter.h>
+#include <geom/GEOM_TypeFilter.h>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <QtxColorButton.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/QtxColorButton.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Study.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
-#include <SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // OCCT includes
 #include <StdSelect_TypeOfFace.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.h b/src/SMESHGUI/SMESHGUI_FilterDlg.h
index e38b5b6cdb6e9f5757488a17eea9ececad87fe62..ab32962677dfda4a227ce1b89dda58b6bf958b43 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_FilterDlg.h
+++ b/src/SMESHGUI/SMESHGUI_FilterDlg.h
@@ -36,8 +36,8 @@
 #include <QList>
 
 // SALOME GUI includes
-#include <SALOME_DataMapOfIOMapOfInteger.hxx>
-#include <SVTK_Selection.h>
+#include <gui/SALOME_DataMapOfIOMapOfInteger.hxx>
+#include <gui/SVTK_Selection.h>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
index 9eb27ab6b97ed69e97b6c352677aeeb9027c4975..d042c4a999724923a83923e969ffda1868c6a428 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
@@ -31,13 +31,13 @@
 #include "SMESHGUI_FilterDlg.h"
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_FileDlg.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <LightApp_Application.h>
+#include <gui/LightApp_Application.h>
 
 // Qt includes
 #include <QApplication>

diff --git a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
index 03cca227b3a7ada8fa409e004ad4bb7d1e8ed95c..1b0f4a963bdea06bf56ef76ec0ecedb5d7389ae2 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
@@ -36,17 +36,17 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <QtxComboBox.h>
-#include <SALOME_ListIO.hxx>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_ResourceMgr.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_TypeFilter.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/QtxComboBox.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_TypeFilter.h>
 
 // Qt includes
 #include <QAbstractButton>

diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
index d3544b4d24cb56ad1c76013b89bc6ffeace2c925..7bc44acb3a332296db37bf677f135551620e6e75 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
@@ -28,10 +28,10 @@
 #include "SMESHGUI_Utils.h"
 
 // SALOME GEOM includes
-#include <GeometryGUI.h>
+#include <geom/GeometryGUI.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h
index 8461a643236011d17233762a4096f9946c7b3eaf..a5c3065956e1ffe016d9b7670dcb4301479c226f 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h
+++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_definitions.hxx>
+#include <kernel/SALOMEDSClient_definitions.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 9fc6d36fee479e4ae8ad6ce454cce26a29711a51..fa3759ac2c4255fbcec81576cfa7b30d09b07c0b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@ -40,31 +40,31 @@
 #include <SMESH_ActorUtils.h>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
-#include <GEOM_SelectionFilter.h>
+#include <geom/GEOMBase.h>
+#include <geom/GEOM_SelectionFilter.h>
 
 // SALOME GUI includes
-#include <QtxColorButton.h>
+#include <gui/QtxColorButton.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <VTKViewer_Algorithm.h>
+#include <gui/VTKViewer_Algorithm.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // VTK Includes
 #include <vtkRenderer.h>

diff --git a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
index 1b4fb4adbc6fa996bad1ea4159e4813c47c1790f..de04ff6d98b79b2cce87549e6b354e1f0b997be2 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
@@ -32,13 +32,13 @@
 #include "SMESHGUI_Utils.h"
 #include "SMESHGUI_GEOMGenUtils.h"
 
-#include <GeometryGUI.h>
-#include <GEOM_SelectionFilter.h>
+#include <geom/GeometryGUI.h>
+#include <geom/GEOM_SelectionFilter.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <LightApp_UpdateFlags.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/LightApp_UpdateFlags.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)

diff --git a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
index 13f5f4a9373c2664df31c17878a9d6aeb1ea824b..39155e2077e194acb69dfd7514a22e9bb732448e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
@@ -33,16 +33,16 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SVTK_Selection.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SVTK_Selection.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // Qt includes
 #include <QHBoxLayout>
@@ -55,9 +55,9 @@
 #include <QKeyEvent>
 #include <QListWidget>
 #include <QButtonGroup>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 #include <QComboBox>
-#include <QtxColorButton.h>
+#include <gui/QtxColorButton.h>
 
 #define SPACING 6
 #define MARGIN  11

diff --git a/src/SMESHGUI/SMESHGUI_GroupUtils.cxx b/src/SMESHGUI/SMESHGUI_GroupUtils.cxx
index 6b4079b198d0fb19d663324b9f9f1394023e0dbf..45f90e00f83cb122e3f5a8c5e10f7cf60529bcc7 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupUtils.cxx
@@ -30,7 +30,7 @@
 #include "SMESHGUI_Utils.h"
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
+#include <gui/SalomeApp_Tools.h>
 
 namespace SMESH
 {

diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
index b0ced7bb6d5cae5f867e53b072ccaf0820bf061b..fed252cb7447819e127ee4c99b99843aaa3b511e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
+++ b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
@@ -32,15 +32,15 @@
 #include "SMESHGUI_SpinBox.h"
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_Study.hxx>
-#include <utilities.h>
+#include <kernel/SALOMEDSClient_Study.hxx>
+#include <kernel/utilities.h>
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <LightApp_Application.h>
-#include <SalomeApp_IntSpinBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_IntSpinBox.h>
 
 // Qt includes
 #include <QFrame>

diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.h b/src/SMESHGUI/SMESHGUI_Hypotheses.h
index 0891def1bc6a8f898d6b891f5970da7edf01419e..655dca15fa158efdf82cc730e92318c02615289d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Hypotheses.h
+++ b/src/SMESHGUI/SMESHGUI_Hypotheses.h
@@ -31,7 +31,7 @@
 #include "SMESHGUI_HypothesesUtils.h"
 
 // Qt includes
-#include <QtxDialog.h>
+#include <gui/QtxDialog.h>
 #include <QVariant>
 
 // IDL includes

diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
index 65a59957905f515f1a70534d10ae0bec265cec4d..e3113550ab0ac30205da47a70d429bebd38bbd3a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
@@ -33,16 +33,16 @@
 #include "SMESHGUI_GEOMGenUtils.h"
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Tools.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Tools.h>
 
 // SALOME KERNEL includes
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 // STL includes
 #include <string>

diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.h b/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
index 56a80e43408aa09b21a14338e9557f8646fb1e61..2ebc1ca19221fed9a64ffb56c8782ef6b5b06db6 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
+++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
@@ -34,10 +34,10 @@
 #include <QStringList>
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_definitions.hxx>
+#include <kernel/SALOMEDSClient_definitions.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
index 5c6f73c33f2ac0a30a820b290bd1b846e40fc4e5..236b2b37447adb581b790bd4ae69f093c81ad161 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
@@ -32,18 +32,18 @@
 #include "SMESHGUI_MeshInfosBox.h"
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // Qt includes
 // IDL includes

diff --git a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
index ae769c301a1f3751f07da2e509974af69008eaa7..9b72e3a8ae4309d77504c217f2dcdabc0d5280fd 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
@@ -39,18 +39,18 @@
 #include <SMESH_LogicalFilter.hxx>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
+#include <geom/GEOMBase.h>
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
-#include <SUIT_Desktop.h>
-#include <SVTK_ViewModel.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_TypeFilter.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_TypeFilter.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_MeshDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshDlg.cxx
index a3446f2997310181f4820abfd354d6b942d8e628..2f5725eb8e404a34c4574e0470d0032e32ab41ee 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshDlg.cxx
@@ -27,8 +27,8 @@
 #include "SMESHGUI_MeshDlg.h"
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 // Qt includes
 #include <QVBoxLayout>

diff --git a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
index 8bed7191fe0d086a50eceffc8f83ee3b89a40371..344de01e5de006d8c8780535dae3e0578bbe740b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
@@ -32,8 +32,8 @@
 #include <SMESH_ActorUtils.h>
 
 // SALOME GUI includes
-#include <VTKViewer_CellLocationsArray.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/VTKViewer_CellLocationsArray.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // VTK includes
 #include <vtkPoints.h>

diff --git a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx
index fd6d42e5211b0de99039d1615683d28bfa93280e..362dbdf6fa1cbcb6b3c00800680a9d831c29b96b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx
@@ -31,18 +31,18 @@
 #include "SMESHGUI_MeshInfosBox.h"
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_Application.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // Qt includes
 #include <QGroupBox>

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index eaa3098aaf9222075ffac73c2d9909234ee377cb..421bf39947ac94e21eb5099451482c50a420ab45 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -38,23 +38,23 @@
 #include <SMESH_NumberFilter.hxx>
 
 // SALOME GEOM includes
-#include <GEOM_SelectionFilter.h>
-#include <GEOMBase.h>
-#include <GeometryGUI.h>
+#include <geom/GEOM_SelectionFilter.h>
+#include <geom/GEOMBase.h>
+#include <geom/GeometryGUI.h>
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_UpdateFlags.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-#include <SALOME_InteractiveObject.hxx>
-#include <SALOME_ListIO.hxx>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_UpdateFlags.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SComponent.hxx>
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SComponent.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 // Qt includes
 #include <QStringList>

diff --git a/src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx
index f0de18e7af66e860e5abcba1730da5c6e385251f..cec065d0d484247e332afabd64ff0160fa1edfa1 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx
@@ -30,16 +30,16 @@
 #include "SMESHGUI_MeshUtils.h"
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // STL includes
 #include <set>

diff --git a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
index d80523066d8100e775a643ed78675e88baefd75c..fa234a17893213a954fc643f01ff564c6c23c204 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
@@ -42,25 +42,25 @@
 #include <SMDS_MeshElement.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_FileDlg.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
-#include <LightApp_Application.h>
-#include <SalomeApp_IntSpinBox.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_IntSpinBox.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <VTKViewer_CellLocationsArray.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 // SALOME KERNEL includes 
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
index df71815c2e28213ac94f9d69205bb3f594bb809b..fce2bdb8738bea03ba16546a7d0d81ba7bfdae33 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
@@ -29,7 +29,7 @@
 #include "SMESHGUI_Utils.h"
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // Qt includes
 #include <QStringList>

diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.h b/src/SMESHGUI/SMESHGUI_MeshUtils.h
index 0544d4306b0619c3be61735007258a371efee241..7311c3b34b29e9f11cfa6ec3bc9aeee22f44224f 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshUtils.h
+++ b/src/SMESHGUI/SMESHGUI_MeshUtils.h
@@ -33,7 +33,7 @@
 #include <QString>
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
index 6243255afc44a7b7a51c87d35e5b30785cae6869..16619d66019a6594b89b6e5e1a894fd2a5ba546d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
@@ -37,18 +37,18 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_Application.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
-
-#include <VTKViewer_CellLocationsArray.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
+
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index 907f8a65b86b43439488e7d909061f8a03a20c72..b4287e18788c841612d13de8bfdca8f3b70d4353 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@ -39,19 +39,19 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_Application.h>
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
-
-#include <SVTK_Selector.h>
-#include <SVTK_ViewWindow.h>
-#include <VTKViewer_CellLocationsArray.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 // OCCT includes
 #include <TColStd_IndexedMapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
index ebc42b1987e9ef85dc86a42c9c178814b500a4ad..4b256252c5579957a0d1f2a7d7317611bc4cca1c 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
@@ -41,24 +41,24 @@
 #include <SMDS_MeshNode.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewWindow.h>
-#include <VTKViewer_Algorithm.h>
-#include <VTKViewer_CellLocationsArray.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_Study.hxx>
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_Study.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 // VTK includes
 #include <vtkIdList.h>

diff --git a/src/SMESHGUI/SMESHGUI_Operation.cxx b/src/SMESHGUI/SMESHGUI_Operation.cxx
index 863d4333af775bba0d34daa2f727751853746344..7f789ef581698877fcfa2996e70bc109e6c4283c 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_Operation.cxx
+++ b/src/SMESHGUI/SMESHGUI_Operation.cxx
@@ -30,13 +30,13 @@
 #include "SMESHGUI_Dialog.h"
 
 // SALOME GUI includes
-#include <SalomeApp_Study.h>
-#include <LightApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_Application.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 // Qt includes
 #include <QStringList>

diff --git a/src/SMESHGUI/SMESHGUI_Operation.h b/src/SMESHGUI/SMESHGUI_Operation.h
index b3b119e7168f43438c2165c0f9e0a01921579916..bbf2c4434758a2897143b9301fdd84349582c9da 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_Operation.h
+++ b/src/SMESHGUI/SMESHGUI_Operation.h
@@ -30,10 +30,10 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <LightApp_Operation.h>
+#include <gui/LightApp_Operation.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient.hxx>
+#include <kernel/SALOMEDSClient.hxx>
 
 class SMESHGUI;
 

diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
index 7e0981d630172e126eda82deb0451d4fec67eb09..405e00edab6194f627bcc9fbddd8a6854bef9187 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
@@ -30,10 +30,10 @@
 #include "SMESHGUI_Utils.h"
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <QtxColorButton.h>
-#include <QtxDoubleSpinBox.h>
-#include <QtxIntSpinBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/QtxColorButton.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
 
 // Qt includes
 #include <QGroupBox>

diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
index 175677f536e81e467a2852b50c968e9367987664..ebaa6521267fedf7a78174668ce32021dbab5ad5 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
@@ -33,17 +33,17 @@
 #include <SMESH_Actor.h>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
 
-#include <QtxDoubleSpinBox.h>
-#include <QtxColorButton.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxColorButton.h>
 
 // Qt includes
 #include <QButtonGroup>

diff --git a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
index 9af8862ef8c4981276ecfb3a5963704e223fabf2..9924ee12f0d4047bf03dc4955317dd6588c451e0 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
@@ -37,19 +37,19 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
-
-#include <SVTK_Selector.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
index e6687ff2946da6b141ed2397f0570859c243e900..8442a816e92fbb157f7a5ad4bb939b7d399689b0 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
@@ -37,19 +37,19 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
-
-#include <SVTK_Selector.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
index 5e575a67000587d335fa670d2d58f6e95575197a..09cc9875a9cb4e4bf865a255e4b2599012d9b079 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
@@ -34,16 +34,16 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 // Qt includes
 #include <QApplication>

diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
index 484989dfd1e4e8c321906ebe5d04139281b39340..ed899a2e9c9a35bf4a2c5e6102b715a07baf546a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
@@ -41,21 +41,21 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_OverrideCursor.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_IntSpinBox.h>
-
-#include <SVTK_ViewWindow.h>
-#include <SVTK_Selector.h>
-#include <SALOME_ListIO.hxx>
-#include <VTKViewer_CellLocationsArray.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_OverrideCursor.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_IntSpinBox.h>
+
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_Selector.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
index 4d0c5169304e9b3b2bda2df6e85f9c063a219310..7746f00e31d5b7b64a5e3a6f769317c9073978c3 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
+++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // Qt includes
 #include <QDialog>

diff --git a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
index d9352dbc87e1403b4c868bcf5b827023aa70526d..8c0e9b6e74f507be0422919eb9d62c7544d8e29b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
@@ -40,21 +40,21 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx
index 4afc541ee829154f738dc5ecc21c75ca6860e03e..c4db929fa760e930cb867f41c50023e17e1b1256 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/src/SMESHGUI/SMESHGUI_Selection.cxx
@@ -35,9 +35,9 @@
 #include <SMESH_Actor.h>
 
 // SALOME GUI includes
-#include <SalomeApp_Study.h>
-#include <LightApp_VTKSelector.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_VTKSelector.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_Selection.h b/src/SMESHGUI/SMESHGUI_Selection.h
index 11fdbad71f2c637bec3920691e2ce6006674eaa3..b9539859ae69a3fb8e54600d91e34512fc0c59c0 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Selection.h
+++ b/src/SMESHGUI/SMESHGUI_Selection.h
@@ -30,10 +30,10 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <LightApp_Selection.h>
+#include <gui/LightApp_Selection.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_definitions.hxx>
+#include <kernel/SALOMEDSClient_definitions.hxx>
 
 class LightApp_SelectionMgr;
 class LightApp_DataOwner;

diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
index 30ca05205881e756b12c18ef9002f431ccba67d6..b3b46112a8e1301c754519acf985427b2116a7f7 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
@@ -35,17 +35,17 @@
 #include <SMDS_MeshNode.hxx>
 
 // SALOME GUI includes
-#include <SUIT_SelectionFilter.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Study.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
+#include <gui/SUIT_SelectionFilter.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 // SALOME KERNEL includes 
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 /*
   Class       : SMESHGUI_SelectionOp

diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.h b/src/SMESHGUI/SMESHGUI_SelectionOp.h
index 083df7390bc8383c7f7a704ba451ad22c271cb21..a713754c4eee5ced30ceb0996e9bf71714207614 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_SelectionOp.h
+++ b/src/SMESHGUI/SMESHGUI_SelectionOp.h
@@ -32,8 +32,8 @@
 #include "SMESHGUI_Dialog.h"
 
 // SALOME GUI includes
-#include <SVTK_Selection.h>
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SVTK_Selection.h>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
index 2a94befb89c3015f622dd3fc5c5c6c2556d4df60..37938839c9fac8f0d5db3996591e76ebf2bea85d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
@@ -36,18 +36,18 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
index aeae0ef7382d0655e2a2d746daea30e06bdb311d..e93a1ee335b736cb8bee44cbf3f3208632af18ba 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
@@ -37,21 +37,21 @@
 #include <SMESH_Actor.h>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
-#include <GeometryGUI.h>
+#include <geom/GEOMBase.h>
+#include <geom/GeometryGUI.h>
 
 // SALOME GUI includes
-#include <LightApp_DataOwner.h>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
-#include <SUIT_Desktop.h>
-#include <SVTK_Selector.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
-#include <SalomeApp_Tools.h>
+#include <gui/LightApp_DataOwner.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SalomeApp_Tools.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
index a99a2ae960200e60900be898299e3690fa380797..a09dcdc7fb7b7d07e0db4fd9029da46296858211 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
@@ -34,16 +34,16 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_Application.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-
-#include <SVTK_Selector.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
index 1cab8d3f47eadf428db66ab14cf8efdbdde1370f..73f1fc90d9fc9e33f1af76bc907ba5832787bea1 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
@@ -41,22 +41,22 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <SalomeApp_IntSpinBox.h>
-
-#include <SVTK_ViewModel.h>
-#include <SVTK_Selector.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_Selection.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SalomeApp_IntSpinBox.h>
+
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_Selection.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_SpinBox.h b/src/SMESHGUI/SMESHGUI_SpinBox.h
index aa757ee632c5bd0313cbb8538c1bd9b32b890745..bc7b5bcaf638d83768f698a48530fb241f59853c 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_SpinBox.h
+++ b/src/SMESHGUI/SMESHGUI_SpinBox.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <SalomeApp_DoubleSpinBox.h>
+#include <gui/SalomeApp_DoubleSpinBox.h>
 
 #define COORD_MIN -1e+15
 #define COORD_MAX +1e+15

diff --git a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx
index d62b3a702438f2cc792f16608115d83f3dc484ca..4e314eabbe8af981d2891983f8207b3c6ad5dfff 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx
@@ -33,20 +33,20 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME KERNEL includes 
-#include <SALOMEDSClient_Study.hxx>
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 // Qt includes
 #include <QGroupBox>

diff --git a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
index 5da44a6ae52bda7c6aa7df29ebe04302d4e5f454..0f2082fd32d41dbc56326a852aa3541ee8974206 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
@@ -40,21 +40,21 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
index 97d5ca5822b6108b98d2499b17880c2269a636cb..8ce68b8492ca100a0d05bfdca61f42431cfd5165 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
@@ -40,21 +40,21 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx b/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx
index 28f5af456485effd84a86eaf81867d4c335e72b4..d5a0f852f851d90b66393680407391e2541a7de9 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx
@@ -32,19 +32,19 @@
 #include "SMESH_Actor.h"
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // Qt includes
 #include <QLabel>

diff --git a/src/SMESHGUI/SMESHGUI_Utils.cxx b/src/SMESHGUI/SMESHGUI_Utils.cxx
index 7c6b279c4694850b2820b734fd1dfb176e21c900..7dc8965fdce494d2408e6ec0fd9a41457f124ade 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Utils.cxx
+++ b/src/SMESHGUI/SMESHGUI_Utils.cxx
@@ -31,17 +31,17 @@
 #include <SMDS_MeshFace.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Module.h>
-#include <SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Module.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCC includes
 #include <gp_XYZ.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_Utils.h b/src/SMESHGUI/SMESHGUI_Utils.h
index 2604ca57fbcdefe7a11c7074b1c6d533d5d1e7e4..2ef3e5e153339dfce134341b0c1de83a9c439a5a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Utils.h
+++ b/src/SMESHGUI/SMESHGUI_Utils.h
@@ -33,11 +33,11 @@
 #include <omniORB4/CORBA.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_definitions.hxx>
+#include <kernel/SALOMEDSClient_definitions.hxx>
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
-#include <LightApp_DataOwner.h>
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <gui/LightApp_DataOwner.h>
 
 //OCC includes
 #include <gp_XYZ.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
index 7b5db14302a6bd7396bc691fef9f24c77bc8295c..783d339464ccb7e22546378501fe95afd9716fa5 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
@@ -36,27 +36,27 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <SVTK_Selector.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <VTKViewer_Algorithm.h>
+#include <gui/VTKViewer_Algorithm.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
 // SALOME KERNEL includes
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h
index 0d49a44375823a8678fe8bca2f6dac566f6b2278..2a2f584146595489c14758b8cd1e9c2d73dfc46e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_VTKUtils.h
+++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h
@@ -30,14 +30,14 @@
 #include "SMESH_SMESHGUI.hxx"
 
 #include "SMESHGUI_Utils.h"
-#include <SMESH_Object.h>
+#include "SMESH_Object.h"
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_definitions.hxx>
+#include <kernel/SALOMEDSClient_definitions.hxx>
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
-#include <VTKViewer_Filter.h>
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <gui/VTKViewer_Filter.h>
 
 class TColStd_IndexedMapOfInteger;
 

diff --git a/src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx b/src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx
index f2913e836a122c6428307a46f3dcdc4aa1e92dbc..0cb3df4435a6705a13d13db2b1780ccd92c30056 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx
@@ -39,19 +39,19 @@
 #include "SMDS_VolumeTool.hxx"
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <SVTK_ViewModel.h>
-#include <SVTK_Selection.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_Selection.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index 16833ee66da96ed973f53da214d1370e81495473..34ab00b4456a05519d7edd886947495ecfff31dd 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
@@ -30,10 +30,10 @@
 #include "SMESHGUI_Hypotheses.h"
 
 // SALOME GUI includes
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 // SALOME KERNEL includes
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 /*!
   Constructor

diff --git a/src/SMESH_I/SMESH_1D_Algo_i.cxx b/src/SMESH_I/SMESH_1D_Algo_i.cxx
index e5da53f7955244af63809ac8ca5d69322ce1f346..078eccd18f63600eb8c69826cf65177dda707e28 100644 (file)
--- a/src/SMESH_I/SMESH_1D_Algo_i.cxx
+++ b/src/SMESH_I/SMESH_1D_Algo_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESH_1D_Algo_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESH_I/SMESH_2D_Algo_i.cxx b/src/SMESH_I/SMESH_2D_Algo_i.cxx
index 7fcf5a86dd686f8faec6dd58fb54b6429772efcb..dd76ced546ae0e939e13a2a9b4f9720d8bdd8568 100644 (file)
--- a/src/SMESH_I/SMESH_2D_Algo_i.cxx
+++ b/src/SMESH_I/SMESH_2D_Algo_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESH_2D_Algo_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx
index ee137822cf1de3bc1284aba0d833bf0ba798b361..f0c82e83759a29db0d75f4f0bb9eea7cbfcfc260 100644 (file)
--- a/src/SMESH_I/SMESH_2smeshpy.cxx
+++ b/src/SMESH_I/SMESH_2smeshpy.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESH_2smeshpy.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "SMESH_PythonDump.hxx"
 #include "SMESH_NoteBook.hxx"
 #include "Resource_DataMapOfAsciiStringAsciiString.hxx"

diff --git a/src/SMESH_I/SMESH_3D_Algo_i.cxx b/src/SMESH_I/SMESH_3D_Algo_i.cxx
index 8aa242ba6e11f4e8a8e88b475f49524f6eda769f..0fd8f7b37f1691d7204bd94ca5c308abc34381d1 100644 (file)
--- a/src/SMESH_I/SMESH_3D_Algo_i.cxx
+++ b/src/SMESH_I/SMESH_3D_Algo_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESH_3D_Algo_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESH_I/SMESH_Algo_i.cxx b/src/SMESH_I/SMESH_Algo_i.cxx
index e567a15d62ab8ad0d70acda5ff7ea66764e27d15..b4c91e978f85330972846f2f71159e377cb928a8 100644 (file)
--- a/src/SMESH_I/SMESH_Algo_i.cxx
+++ b/src/SMESH_I/SMESH_Algo_i.cxx
@@ -28,7 +28,7 @@
 #include "SMESH_Algo_i.hxx"
 #include "SMESH_Algo.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <string>
 #include <vector>

diff --git a/src/SMESH_I/SMESH_Filter_i.hxx b/src/SMESH_I/SMESH_Filter_i.hxx
index 44cc246bf3a5112ce04ffd42d0a2fb696d5a20fb..8912923e61a826fb3619ee62278b61a1ffcffb42 100644 (file)
--- a/src/SMESH_I/SMESH_Filter_i.hxx
+++ b/src/SMESH_I/SMESH_Filter_i.hxx
@@ -35,7 +35,7 @@
 #include <LDOM_Document.hxx>
 #include <TopoDS_Shape.hxx>
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 #include "SMESH_ControlsDef.hxx"
 
 class SMESHDS_Mesh;

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index f5de7bd50b7ae91c6273458691d9cce33fbd68f5..260560a94df0acd812746027ad6082dc9edca60a 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -46,9 +46,9 @@
 #include <TCollection_AsciiString.hxx>
 #include <OSD.hxx>
 
-#include "Utils_CorbaException.hxx"
+#include <kernel/Utils_CorbaException.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include <fstream>
 #include <stdio.h>
 
@@ -70,7 +70,7 @@
  #define UnLoadLib( handle ) dlclose( handle );
 #endif
 
-#include <HDFOI.hxx>
+#include <kernel/HDFOI.hxx>
 
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Mesh_i.hxx"
@@ -100,18 +100,18 @@
 #include "DriverMED_W_SMESHDS_Mesh.h"
 #include "DriverMED_R_SMESHDS_Mesh.h"
 
-#include "SALOMEDS_Tool.hxx"
-#include "SALOME_NamingService.hxx"
-#include "SALOME_LifeCycleCORBA.hxx"
-#include "Utils_SINGLETON.hxx"
-#include "OpUtil.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/OpUtil.hxx>
 
 #include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
 #include CORBA_CLIENT_HEADER(SALOME_Session)
 
-#include "GEOM_Client.hxx"
-#include "Utils_ExceptHandlers.hxx"
-#include "Basics_Utils.hxx"
+#include <geom/GEOM_Client.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #include <map>
 

diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx
index 174b1b2eb45fddc8e8f3354876d664ddfbc2d6c2..d2afada244cb8c9e977150aa2a22e68206a45cf3 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -39,11 +39,11 @@
 
 #include "SMESH_Mesh_i.hxx"
 #include "SMESH_Hypothesis_i.hxx"
-#include "SALOME_Component_i.hxx"
-#include "SALOME_NamingService.hxx"
+#include <kernel/SALOME_Component_i.hxx>
+#include <kernel/SALOME_NamingService.hxx>
 
 #include "SMESH_Gen.hxx"
-#include "GEOM_Client.hxx"
+#include <geom/GEOM_Client.hxx>
 
 #include <TCollection_AsciiString.hxx>
 #include <Resource_DataMapOfAsciiStringAsciiString.hxx>

diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx
index 2b216fe268d77330f4480a45880151cf4f2ecf69..920240aa3dcb139768ea2bc2951c306354e44b58 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i_1.cxx
+++ b/src/SMESH_I/SMESH_Gen_i_1.cxx
@@ -36,8 +36,8 @@
 
 #include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
 
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx
index 7502c5409c8901569c350080a2564b4945071e11..7cba7351ca04c1ad0400a0abfcea88291f18420d 100644 (file)
--- a/src/SMESH_I/SMESH_Group_i.cxx
+++ b/src/SMESH_I/SMESH_Group_i.cxx
@@ -35,7 +35,7 @@
 #include "SMESH_Filter_i.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace SMESH;
 

diff --git a/src/SMESH_I/SMESH_Group_i.hxx b/src/SMESH_I/SMESH_Group_i.hxx
index 93f8354b9ed36c782eeaf449753ab0f2198f6dbb..5f4c4bb23213fe32c9d93e84d24477459e87d85e 100644 (file)
--- a/src/SMESH_I/SMESH_Group_i.hxx
+++ b/src/SMESH_I/SMESH_Group_i.hxx
@@ -35,7 +35,7 @@
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 class SMESH_Group;
 class SMESHDS_GroupBase;

diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx
index b677e647b13c6dca7222d71f0206c2be16008342..d96113625c32692a342430e4546f388c89540a76 100644 (file)
--- a/src/SMESH_I/SMESH_Hypothesis_i.cxx
+++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx
@@ -29,7 +29,7 @@
 #include <sstream>
 #include "SMESH_Hypothesis_i.hxx"
 #include "SMESH_Gen_i.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/SMESH_I/SMESH_Hypothesis_i.hxx b/src/SMESH_I/SMESH_Hypothesis_i.hxx
index 13bd7742fd3b07ecdc9faf4447c8a89bc9053762..1c17f830873bf69bd79d546e90ce0ffefb705c63 100644 (file)
--- a/src/SMESH_I/SMESH_Hypothesis_i.hxx
+++ b/src/SMESH_I/SMESH_Hypothesis_i.hxx
@@ -34,7 +34,7 @@
 #include CORBA_SERVER_HEADER(SMESH_Hypothesis)
 
 #include "SMESH_Hypothesis.hxx"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 #include "SMESH_Gen.hxx"
 

diff --git a/src/SMESH_I/SMESH_MEDFamily_i.cxx b/src/SMESH_I/SMESH_MEDFamily_i.cxx
index 393e49c42cf66308e2f1a9d69eabfb72bbc02934..0afa9158ab8ad6a10285271bd90e31f58e21999e 100644 (file)
--- a/src/SMESH_I/SMESH_MEDFamily_i.cxx
+++ b/src/SMESH_I/SMESH_MEDFamily_i.cxx
@@ -24,8 +24,8 @@
 //  Module : SMESH
 //
 #include "SMESH_MEDFamily_i.hxx"
-#include "utilities.h"
-#include "Utils_CorbaException.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_CorbaException.hxx>
 
 using namespace std;
 

diff --git a/src/SMESH_I/SMESH_MEDMesh_i.cxx b/src/SMESH_I/SMESH_MEDMesh_i.cxx
index f73bf1102c35ef9004f1da5ea9813f1c315261b6..f77073ac16150d1714a458f21c7519f76c07a031 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.cxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.cxx
@@ -45,15 +45,15 @@
 #include <TopoDS_Shape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
-#include "utilities.h"
-#include "Utils_CorbaException.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_CorbaException.hxx>
 
 #include "SMESH_MEDSupport_i.hxx"
 #include "SMESH_MEDFamily_i.hxx"
 
-# include "Utils_ORB_INIT.hxx"
-# include "Utils_SINGLETON.hxx"
-# include "Utils_ExceptHandlers.hxx"
+# include <kernel/Utils_ORB_INIT.hxx>
+# include <kernel/Utils_SINGLETON.hxx>
+# include <kernel/Utils_ExceptHandlers.hxx>
 
 extern "C"
 {

diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx
index 72b31032e81f37d8c13b9c98ac7024395f546be9..f0e19580da4215ecec56e6d3dd99648736a7efab 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.hxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx
@@ -38,7 +38,7 @@
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 #define MED_NBR_GEOMETRIE_MAILLE 15
 #define MED_NBR_TYPE 5

diff --git a/src/SMESH_I/SMESH_MEDSupport_i.cxx b/src/SMESH_I/SMESH_MEDSupport_i.cxx
index 4b1e66ddf0fb8444b67a6493dbe461de1ee65088..1a798626f79bc886a1312ff4b7f386f22bb6bb8a 100644 (file)
--- a/src/SMESH_I/SMESH_MEDSupport_i.cxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.cxx
@@ -24,9 +24,9 @@
 //  Module : SMESH
 //
 #include "SMESH_MEDSupport_i.hxx"
-#include "utilities.h"
-#include "Utils_CorbaException.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <TopoDS_Iterator.hxx>
 #include "SMESHDS_Mesh.hxx"

diff --git a/src/SMESH_I/SMESH_MEDSupport_i.hxx b/src/SMESH_I/SMESH_MEDSupport_i.hxx
index 56c36a881466bebb9707bb31191f539d2deb8fbe..966683f7860fcb4f2459d0d2033bf01096d6403e 100644 (file)
--- a/src/SMESH_I/SMESH_MEDSupport_i.hxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.hxx
@@ -38,7 +38,7 @@
 #include "SMDS_MeshNode.hxx"
 
 #include "SMESH_MEDSupport_i.hxx"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 class SMESH_subMesh_i;
 
 class SMESH_I_EXPORT SMESH_MEDSupport_i:

diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx
index 000bc95e84c79b38ceecd757025d65c5e847562e..eb334fb1da75c652b9f4e5b99eb3419ba4eb1be4 100644 (file)
--- a/src/SMESH_I/SMESH_MeshEditor_i.cxx
+++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx
@@ -39,9 +39,9 @@
 #include "SMESH_Group_i.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
-#include "Utils_CorbaException.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_ExceptHandlers.hxx>
+#include <kernel/Utils_CorbaException.hxx>
 
 #include <BRepAdaptor_Surface.hxx>
 #include <BRep_Tool.hxx>

diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index 9c44e29d2e49609bd17c86cd05acf714e4f73258..014c36bf869ee319245fdc9fee7485e482c84cf6 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -47,13 +47,13 @@
 #include "SMDS_EdgePosition.hxx"
 #include "SMDS_FacePosition.hxx"
 
-#include "OpUtil.hxx"
-#include "SALOME_NamingService.hxx"
-#include "Utils_CorbaException.hxx"
-#include "Utils_ExceptHandlers.hxx"
-#include "Utils_SINGLETON.hxx"
-#include "utilities.h"
-#include "GEOMImpl_Types.hxx"
+#include <kernel/OpUtil.hxx>
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/utilities.h>
+#include <geom/GEOMImpl_Types.hxx>
 
 // OCCT Includes
 #include <BRep_Builder.hxx>

diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx
index ab8abdabf27dcb2a2a442d9bb0fb37dad983f3d2..52bc314d3eb41a135d2302c547f7db238f8e9f48 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/src/SMESH_I/SMESH_Mesh_i.hxx
@@ -41,7 +41,7 @@
 //#include "SMESH_subMesh_i.hxx"
 #include "SMESH_subMesh.hxx"
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 class SMESH_Gen_i;
 class SMESH_GroupBase_i;

diff --git a/src/SMESH_I/SMESH_Pattern_i.cxx b/src/SMESH_I/SMESH_Pattern_i.cxx
index f3f1fcfbc2c4d7294ad93305c64ea988fadd841a..6110e5111b394989759d91bd10a1829ac7863b8d 100644 (file)
--- a/src/SMESH_I/SMESH_Pattern_i.cxx
+++ b/src/SMESH_I/SMESH_Pattern_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESH_Pattern_i.hxx"
 
-#include "GEOM_Client.hxx"
+#include <geom/GEOM_Client.hxx>
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Mesh_i.hxx"

diff --git a/src/SMESH_I/SMESH_subMesh_i.cxx b/src/SMESH_I/SMESH_subMesh_i.cxx
index 2720de2c73b981c3a92316c5291d137b8358dab2..a4f40cae377ad362957adf5062139484affbf410 100644 (file)
--- a/src/SMESH_I/SMESH_subMesh_i.cxx
+++ b/src/SMESH_I/SMESH_subMesh_i.cxx
@@ -29,10 +29,10 @@
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Mesh_i.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <TopoDS_Iterator.hxx>
 #include <TopExp_Explorer.hxx>

diff --git a/src/SMESH_I/SMESH_subMesh_i.hxx b/src/SMESH_I/SMESH_subMesh_i.hxx
index 5a6eb8bd8ed34c63014ae8a4ff90858762bf85f0..463e61a5d7d9cd4d800d7f3e9a0e5c567b41d66d 100644 (file)
--- a/src/SMESH_I/SMESH_subMesh_i.hxx
+++ b/src/SMESH_I/SMESH_subMesh_i.hxx
@@ -35,7 +35,7 @@
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 #include CORBA_CLIENT_HEADER(MED)
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 #include "SMESH_Mesh_i.hxx"
 
 class SMESH_Gen_i;

diff --git a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
index 463d1fd2735af2667724c78f8a81831223056313..9e321c32b7d65fed32ff19a034494c5a3334b89e 100644 (file)
--- a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
+++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
@@ -31,17 +31,17 @@
 #include <SMESHGUI_Displayer.h>
 
 // SALOME KERNEL includes
-#include <Utils_ORB_INIT.hxx>
-#include <Utils_SINGLETON.hxx>
-#include <SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/Utils_ORB_INIT.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <VTKViewer_ViewModel.h>
-#include <SALOME_Event.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Session.h>
+#include <gui/VTKViewer_ViewModel.h>
+#include <gui/SALOME_Event.h>
+#include <gui/SalomeApp_Application.h>
 
 // OCCT includes
 #include <TopAbs.hxx>

diff --git a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx
index e3f3c37a8f1018a97cb736fef0980f366df1d2de..a1d32f3a52a88965acf1f5f40eacb6c31a225920 100644 (file)
--- a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx
+++ b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <vector>
 

diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.cxx b/src/StdMeshers/StdMeshers_AutomaticLength.cxx
index 95710c94eb9768299be9e522472eea143f38140e..af5c61f466e6f32be6b51c6b5a35fe6b93526c85 100644 (file)
--- a/src/StdMeshers/StdMeshers_AutomaticLength.cxx
+++ b/src/StdMeshers/StdMeshers_AutomaticLength.cxx
@@ -31,7 +31,7 @@
 #include "SMESH_Algo.hxx"
 #include "SMESHDS_SubMesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopExp.hxx>

diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.hxx b/src/StdMeshers/StdMeshers_AutomaticLength.hxx
index 627003aa608b4ffba44250961c4ce7eef8576567..e1942fd45a1f258c371b46cf10bbedffbdd5eaed 100644 (file)
--- a/src/StdMeshers/StdMeshers_AutomaticLength.hxx
+++ b/src/StdMeshers/StdMeshers_AutomaticLength.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <map>
 

diff --git a/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx b/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
index eee3ef0129ad367f4d04ada26b2458d713e0fb04..e46c90c3d6b638244ae5ab7d015605db237bae7b 100644 (file)
--- a/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
+++ b/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
@@ -40,7 +40,7 @@
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_CompCurve.hxx>
 #include <BRep_Builder.hxx>

diff --git a/src/StdMeshers/StdMeshers_Deflection1D.cxx b/src/StdMeshers/StdMeshers_Deflection1D.cxx
index 42ad9219a50bcf938bc4f67114b088df717d6f5f..c70e6a2ffff97075b855b84a33790ec588a39ec8 100644 (file)
--- a/src/StdMeshers/StdMeshers_Deflection1D.cxx
+++ b/src/StdMeshers/StdMeshers_Deflection1D.cxx
@@ -24,7 +24,7 @@
 //  Module : SMESH
 //
 #include "StdMeshers_Deflection1D.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Algo.hxx"

diff --git a/src/StdMeshers/StdMeshers_Deflection1D.hxx b/src/StdMeshers/StdMeshers_Deflection1D.hxx
index a3cf19b70607c0e55fae27e9f82a3f3fb4f8f8b8..abafe7e6b944e68b91604f0d460419b31aa2db19 100644 (file)
--- a/src/StdMeshers/StdMeshers_Deflection1D.hxx
+++ b/src/StdMeshers/StdMeshers_Deflection1D.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_Deflection1D:public SMESH_Hypothesis
 {

diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx
index a3b2707aaa4669dee5b1fd941b8d33993fad7aac..2da73417304f49ae886b7c26727eb92870802aec 100644 (file)
--- a/src/StdMeshers/StdMeshers_Distribution.cxx
+++ b/src/StdMeshers/StdMeshers_Distribution.cxx
@@ -28,7 +28,7 @@
 #include "StdMeshers_Distribution.hxx"
 
 #include <math_GaussSingleIntegration.hxx>
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
 #define NO_CAS_CATCH

diff --git a/src/StdMeshers/StdMeshers_FaceSide.cxx b/src/StdMeshers/StdMeshers_FaceSide.cxx
index 55ff0aa3b8278e8fa8b8ebe134e94440a2bb94e8..f50ea9915a299b57e79bfea250d071eacd042cc1 100644 (file)
--- a/src/StdMeshers/StdMeshers_FaceSide.cxx
+++ b/src/StdMeshers/StdMeshers_FaceSide.cxx
@@ -51,7 +51,7 @@
 
 #include <map>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //================================================================================
 /*!

diff --git a/src/StdMeshers/StdMeshers_FixedPoints1D.hxx b/src/StdMeshers/StdMeshers_FixedPoints1D.hxx
index b5126e1c3ac56f3fd98b5443c204810c7110bdec..5749533f8a6934743ad8f49efa017dec13f1c3a2 100644 (file)
--- a/src/StdMeshers/StdMeshers_FixedPoints1D.hxx
+++ b/src/StdMeshers/StdMeshers_FixedPoints1D.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <vector>
 

diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.cxx b/src/StdMeshers/StdMeshers_Hexa_3D.cxx
index 42b5488ecda855a7827d137409381fd7629e361e..cfa9396dbcbecbd910026fb129d462e3718a946f 100644 (file)
--- a/src/StdMeshers/StdMeshers_Hexa_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Hexa_3D.cxx
@@ -53,8 +53,8 @@
 #include <TopoDS.hxx>
 #include <gp_Pnt2d.hxx>
 
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 typedef SMESH_Comment TComm;
 

diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.hxx b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
index c892ac729cca98b7b517795287cbf3fddc3977aa..3b5db4728c85ddd2169c88ff6f3fd2b55c7e21bf 100644 (file)
--- a/src/StdMeshers/StdMeshers_Hexa_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
@@ -33,7 +33,7 @@
 #include "SMESH_3D_Algo.hxx"
 #include "SMESH_Mesh.hxx"
 #include "StdMeshers_Quadrangle_2D.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include "SMESH_MesherHelper.hxx"
 

diff --git a/src/StdMeshers/StdMeshers_LayerDistribution.cxx b/src/StdMeshers/StdMeshers_LayerDistribution.cxx
index 8e5987e6b5059ffddeba6ab4a37ed894fec24c38..e796a388daf5d61bd32565dd0d2169af9139f417 100644 (file)
--- a/src/StdMeshers/StdMeshers_LayerDistribution.cxx
+++ b/src/StdMeshers/StdMeshers_LayerDistribution.cxx
@@ -26,7 +26,7 @@
 //
 #include "StdMeshers_LayerDistribution.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers/StdMeshers_LayerDistribution.hxx b/src/StdMeshers/StdMeshers_LayerDistribution.hxx
index aca054d4fb93e93e769ecfa1688808361a75638a..e419d13d900e45e4ae73f52ef661b008c926aeea 100644 (file)
--- a/src/StdMeshers/StdMeshers_LayerDistribution.hxx
+++ b/src/StdMeshers/StdMeshers_LayerDistribution.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <string>
 

diff --git a/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx b/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx
index 23d039bee4c0fec81f5cef8b7d1f343de96e4436..6f41349ee418408f9121455d389cb197007e7af9 100644 (file)
--- a/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx
+++ b/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx
@@ -26,7 +26,7 @@
 //
 #include "StdMeshers_LayerDistribution2D.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 
 //=============================================================================

diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.cxx b/src/StdMeshers/StdMeshers_LengthFromEdges.cxx
index cad6e91869e790a5a637f6ef3a63b4e47ee50745..1ffd0b8757b9ae539a6feaff8c01da8d281534a3 100644 (file)
--- a/src/StdMeshers/StdMeshers_LengthFromEdges.cxx
+++ b/src/StdMeshers/StdMeshers_LengthFromEdges.cxx
@@ -27,7 +27,7 @@
 //
 #include "StdMeshers_LengthFromEdges.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx
index cb52638e573025c5182055e7f7a330635dd4964d..781b4fd5899435d1e8c66b43d435cb2d8f482ffd 100644 (file)
--- a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx
+++ b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_LengthFromEdges:
   public SMESH_Hypothesis

diff --git a/src/StdMeshers/StdMeshers_LocalLength.cxx b/src/StdMeshers/StdMeshers_LocalLength.cxx
index d52d2de5416e14fd3b3bd8c44b9c89c3f25e6b71..44dfc5a5b605f66efa2dad96b875c2dd5d35b249 100644 (file)
--- a/src/StdMeshers/StdMeshers_LocalLength.cxx
+++ b/src/StdMeshers/StdMeshers_LocalLength.cxx
@@ -31,7 +31,7 @@
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Algo.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRep_Tool.hxx>
 #include <GCPnts_AbscissaPoint.hxx>

diff --git a/src/StdMeshers/StdMeshers_LocalLength.hxx b/src/StdMeshers/StdMeshers_LocalLength.hxx
index 1c8d72b2784a93aa020165f741487f3e2f6fdd89..1045a550514b40a5571f27808c699f2d6ede3245 100644 (file)
--- a/src/StdMeshers/StdMeshers_LocalLength.hxx
+++ b/src/StdMeshers/StdMeshers_LocalLength.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_LocalLength: public SMESH_Hypothesis
 {

diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
index b10f3902c29b3d5a7dbd3264125b1e3042f243eb..00bea4225c17a473817ee03e91dae892eeba03fc 100644 (file)
--- a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
+++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
@@ -46,7 +46,7 @@
 #include "SMDS_EdgePosition.hxx"
 #include "SMDS_FacePosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepTools.hxx>
 #include <BRep_Tool.hxx>

diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.cxx b/src/StdMeshers/StdMeshers_MaxElementArea.cxx
index 1dce3de1f501a18cddbd1c68f5db25a9e18a7192..ea7f2e9958686610d354d46af2ea34f59d6efc75 100644 (file)
--- a/src/StdMeshers/StdMeshers_MaxElementArea.cxx
+++ b/src/StdMeshers/StdMeshers_MaxElementArea.cxx
@@ -36,7 +36,7 @@
 #include <TopExp.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.hxx b/src/StdMeshers/StdMeshers_MaxElementArea.hxx
index 09506736393c557bff7387efc14c6823a7d25c15..084f1220753186242ddde71ccfea76ff553a1e6c 100644 (file)
--- a/src/StdMeshers/StdMeshers_MaxElementArea.hxx
+++ b/src/StdMeshers/StdMeshers_MaxElementArea.hxx
@@ -31,7 +31,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_MaxElementArea:public SMESH_Hypothesis
 {

diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
index 79be9d6bc96d8cc276fa3c2819e93ed681a8d0d6..c88ca17accf9b53e127ca0a624d35794eb7ef0e0 100644 (file)
--- a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
+++ b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
@@ -32,7 +32,7 @@
 #include "SMESH_ControlsDef.hxx"
 #include "SMESH_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>

diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx
index 6395fd419e30149eaabb88a0436199d3a9b1b07e..58aa8c92a5366a4669b8ebfb2f3bc19543881fa7 100644 (file)
--- a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx
+++ b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx
@@ -31,7 +31,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_MaxElementVolume:
   public SMESH_Hypothesis

diff --git a/src/StdMeshers/StdMeshers_MaxLength.cxx b/src/StdMeshers/StdMeshers_MaxLength.cxx
index 918fe6c78c09e05b12acfdd653bab80028994a06..de6d965bddd86668fa922eb9f7fa3e9c03331b73 100644 (file)
--- a/src/StdMeshers/StdMeshers_MaxLength.cxx
+++ b/src/StdMeshers/StdMeshers_MaxLength.cxx
@@ -27,7 +27,7 @@
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Algo.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRep_Tool.hxx>
 #include <GCPnts_AbscissaPoint.hxx>

diff --git a/src/StdMeshers/StdMeshers_MaxLength.hxx b/src/StdMeshers/StdMeshers_MaxLength.hxx
index 23d94a9f286f2ad1828adaa93b5bdf1539d6f13e..0185cd0af4f5072800702500e5b98bac48806dd1 100644 (file)
--- a/src/StdMeshers/StdMeshers_MaxLength.hxx
+++ b/src/StdMeshers/StdMeshers_MaxLength.hxx
@@ -28,7 +28,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_MaxLength: public SMESH_Hypothesis
 {

diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx
index 66c58f13cc7915cbc59d91fa7b8ee15d7f1977bf..81ec8f84d9ade1543e51f1548d1f1ff0b5b6970a 100644 (file)
--- a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx
+++ b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx
@@ -25,7 +25,7 @@
 //  Module : SMESH
 //
 #include "StdMeshers_NotConformAllowed.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.hxx b/src/StdMeshers/StdMeshers_NotConformAllowed.hxx
index ddcfcb445d4b463046638a26a49e955539fba651..5b4cfdac541ce410b793970a62ed39d4ffa2b7e7 100644 (file)
--- a/src/StdMeshers/StdMeshers_NotConformAllowed.hxx
+++ b/src/StdMeshers/StdMeshers_NotConformAllowed.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_NotConformAllowed:
   public SMESH_Hypothesis

diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx
index 8abb02c632a3dd5549b9c3cef9a4c1106341337a..c53c21512e51e9b3b8a7e7755eb3c838e87ce62e 100644 (file)
--- a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx
+++ b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx
@@ -28,7 +28,7 @@
 
 
 #include "SMESH_Mesh.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.hxx b/src/StdMeshers/StdMeshers_NumberOfLayers.hxx
index ebaae84a918cca3d7c56b64fa4b63de249743064..4aaf00ccd2573cf520e04c932befaad84501fa71 100644 (file)
--- a/src/StdMeshers/StdMeshers_NumberOfLayers.hxx
+++ b/src/StdMeshers/StdMeshers_NumberOfLayers.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class SMESH_Gen;
 

diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx b/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx
index af2f04dabfcffe6546da6f40e8d07c5d51f19980..9df5ea5efcd3e5c375e3040abf008fb3347585aa 100644 (file)
--- a/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx
+++ b/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx
@@ -27,7 +27,7 @@
 
 #include "StdMeshers_NumberOfLayers2D.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 
 //=============================================================================

diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
index ce4876ee3b779cda81f06acdee94178b5c84b5b3..eb8b9865a1479dac0d825d6cef866ff25a02b659 100644 (file)
--- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
+++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
@@ -49,7 +49,7 @@
 #include <Standard_ErrorHandler.hxx>
 #endif
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 

diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx
index 985d192b22bb853c05b3765f590e29b38bb0e8cd..3ddc5ecb7d955b362735909b5728944aab9c4427 100644 (file)
--- a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx
+++ b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx
@@ -31,7 +31,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 #include <vector>
 
 /*!

diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx
index 7ae2e3a5400b2a8fcf0f2219d321d6ada5116e4e..36878ba6788850388d582049b3da164eb6f3fe74 100644 (file)
--- a/src/StdMeshers/StdMeshers_Penta_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Penta_3D.cxx
@@ -25,8 +25,8 @@
 //
 #include "StdMeshers_Penta_3D.hxx"
 
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include "SMDS_EdgePosition.hxx"
 #include "SMDS_MeshElement.hxx"

diff --git a/src/StdMeshers/StdMeshers_Prism_3D.cxx b/src/StdMeshers/StdMeshers_Prism_3D.cxx
index 590cd65eb5d9b99f8de3a507f969f4736a18d0dc..9b45f7219b6145600f2c26353cf1d57e203b88d0 100644 (file)
--- a/src/StdMeshers/StdMeshers_Prism_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Prism_3D.cxx
@@ -34,7 +34,7 @@
 #include "SMDS_EdgePosition.hxx"
 #include "SMESH_Comment.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRep_Tool.hxx>
 #include <Geom2dAdaptor_Curve.hxx>

diff --git a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx
index 9be958436288af8d943da96f3a0d3f91027fe748..51140c05ff7d0e47245aa1db9fb77382ce91110b 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopoDS.hxx>
 

diff --git a/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx
index 301dedf304b1bf947e84a67f4716b7d1460626bd..f4307d621834fda1bb14079cb68beceaf86e2947 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Vertex.hxx>
 

diff --git a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
index be0d809eb9773caeac5aabaee98d1f54cb38f24d..7d050afde43eba7727ab9c8dd1b0c13ccc194f26 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopoDS.hxx>
 

diff --git a/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx
index a23d4c4948639db476b6ceab675ca7f18c047f12..7a447167d9f8c8f37d11cccf71ba0ed2b78e741f 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Vertex.hxx>
 

diff --git a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx
index 4a8aa1086725c5fb3420541cfcab7f349c866188..2d103462648cb9857d24233e64bf6b648e1141da 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx
@@ -26,7 +26,7 @@
 
 #include "StdMeshers_ProjectionSource3D.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "SMESH_Gen.hxx"
 
 #include <TopoDS.hxx>

diff --git a/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx
index fd6848aec658b5552db101f12c7135448a075488..f8344e7f5893ffbfb2a7d0f31054bfe306923b60 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Vertex.hxx>
 

diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
index a4d4fdfbc5bbdc71f516d1847ce5fc063323d070..6af8dd865e5e23aeaea0cde83a0fadfa8278ffef 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
@@ -41,7 +41,7 @@
 #include "SMESH_subMeshEventListener.hxx"
 #include "SMDS_EdgePosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepTools.hxx>
 #include <BRepTools_WireExplorer.hxx>

diff --git a/src/StdMeshers/StdMeshers_Projection_1D.cxx b/src/StdMeshers/StdMeshers_Projection_1D.cxx
index 40568111a23a0a9c0835d781e71bc3bb39881ca0..521feb625cf057f0198520c1132e54400751dcdc 100644 (file)
--- a/src/StdMeshers/StdMeshers_Projection_1D.cxx
+++ b/src/StdMeshers/StdMeshers_Projection_1D.cxx
@@ -49,7 +49,7 @@
 #include <gp_Pnt.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 
 using namespace std;

diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx
index 05a11f7d72f2f0c192aebeed246775910c250b37..95d0f63a8195f19c010abae42bc9f39e4e9e1088 100644 (file)
--- a/src/StdMeshers/StdMeshers_Projection_2D.cxx
+++ b/src/StdMeshers/StdMeshers_Projection_2D.cxx
@@ -42,7 +42,7 @@
 #include "SMESH_Comment.hxx"
 #include "SMDS_EdgePosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRep_Tool.hxx>
 #include <Bnd_B2d.hxx>

diff --git a/src/StdMeshers/StdMeshers_Projection_3D.cxx b/src/StdMeshers/StdMeshers_Projection_3D.cxx
index d8939feadf14986318733aff833ab9e3297622be..f395c6193b7d3637304f852bb19550c2db5a50c7 100644 (file)
--- a/src/StdMeshers/StdMeshers_Projection_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Projection_3D.cxx
@@ -43,7 +43,7 @@
 #include "SMESH_subMesh.hxx"
 #include "SMESH_subMeshEventListener.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>

diff --git a/src/StdMeshers/StdMeshers_Propagation.cxx b/src/StdMeshers/StdMeshers_Propagation.cxx
index c6b9b015fb50193491cfb8dd7525e74b8cfe26f4..e5bf8ac140ab6750dc974187543322ee6b313d4f 100644 (file)
--- a/src/StdMeshers/StdMeshers_Propagation.cxx
+++ b/src/StdMeshers/StdMeshers_Propagation.cxx
@@ -25,7 +25,7 @@
 
 #include "StdMeshers_Propagation.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "SMDS_SetIterator.hxx"
 #include "SMESH_Algo.hxx"

diff --git a/src/StdMeshers/StdMeshers_Propagation.hxx b/src/StdMeshers/StdMeshers_Propagation.hxx
index b02f9aebe03b39961ca1069c0296e63e113d53fe..d01540390615ec52e30edd6ea49f4bc25f8eb912 100644 (file)
--- a/src/StdMeshers/StdMeshers_Propagation.hxx
+++ b/src/StdMeshers/StdMeshers_Propagation.hxx
@@ -30,7 +30,7 @@
 
 #include "SMESH_Hypothesis.hxx"
 #include "SMESH_subMeshEventListener.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Edge.hxx>
 

diff --git a/src/StdMeshers/StdMeshers_QuadrangleParams.hxx b/src/StdMeshers/StdMeshers_QuadrangleParams.hxx
index 47cfc74685f0413310dbc557fefa82048b1b3d92..63955a9fd8759e6020027b8698ffe8a0a1fadf9b 100644 (file)
--- a/src/StdMeshers/StdMeshers_QuadrangleParams.hxx
+++ b/src/StdMeshers/StdMeshers_QuadrangleParams.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_QuadrangleParams:
   public SMESH_Hypothesis

diff --git a/src/StdMeshers/StdMeshers_QuadranglePreference.cxx b/src/StdMeshers/StdMeshers_QuadranglePreference.cxx
index cf3986e38a0070ece022db2a77fbec41a2d4de2b..d1cc7feb8bf0cdc64e6b572569ff41129ec8e7cf 100644 (file)
--- a/src/StdMeshers/StdMeshers_QuadranglePreference.cxx
+++ b/src/StdMeshers/StdMeshers_QuadranglePreference.cxx
@@ -24,7 +24,7 @@
 //  Module : SMESH
 
 #include "StdMeshers_QuadranglePreference.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx
index ec641d15a81e97c7307a2ed258f3af7486aaea15..114f68f53d184b24ae23ff0fc390c6588066e20f 100644 (file)
--- a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx
+++ b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx
@@ -29,7 +29,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 /*!
  * \brief Hypothesis for StdMeshers_Quadrangle_2D, forcing construction

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
index 1c8899d6011495882d2a699ff5396b53fb350a6d..3032df626a08f197daec08e2fe398f7c102f915c 100644 (file)
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
@@ -55,8 +55,8 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopoDS.hxx>
 
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #ifndef StdMeshers_Array2OfNode_HeaderFile
 #define StdMeshers_Array2OfNode_HeaderFile

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index b4257bb406ff2782a17f3805d7c3b5bd028bab6e..3ee10dfd150fb419bfeb6acbf2f6fb7caf1354c6 100644 (file)
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_2D_Algo.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class SMESH_Mesh;
 class SMESH_MesherHelper;

diff --git a/src/StdMeshers/StdMeshers_QuadraticMesh.cxx b/src/StdMeshers/StdMeshers_QuadraticMesh.cxx
index 4764356f25d99ba7fb22d9cf97f876d0369f4912..1a31186e3e8b194414ddf4e342dd507abf5c160f 100644 (file)
--- a/src/StdMeshers/StdMeshers_QuadraticMesh.cxx
+++ b/src/StdMeshers/StdMeshers_QuadraticMesh.cxx
@@ -24,7 +24,7 @@
 //  Module : SMESH
 
 #include "StdMeshers_QuadraticMesh.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers/StdMeshers_QuadraticMesh.hxx b/src/StdMeshers/StdMeshers_QuadraticMesh.hxx
index 9972469c0a3f08bb18eee894ae329f141f8991e3..e31aa0b27ff9485a0a283a5dc4c39224596bca0a 100644 (file)
--- a/src/StdMeshers/StdMeshers_QuadraticMesh.hxx
+++ b/src/StdMeshers/StdMeshers_QuadraticMesh.hxx
@@ -29,7 +29,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 /*!
  * \brief Hypothesis for StdMeshers_Regular_1D, forcing construction of quadratic edges.

diff --git a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
index f2e32397fbba32a31b10f457debdb9862474ea90..c080f7e66343591b98e547576fff78e4cf2a0377 100644 (file)
--- a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
+++ b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
@@ -40,7 +40,7 @@
 #include "SMESH_MesherHelper.hxx"
 #include "SMESH_subMesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>

diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
index 6911ee752312fca7ab383ad6f36466b0b755ca7f..098996004fa7845535a94e61eb1b8b2c0a5f9640 100644 (file)
--- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
+++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
@@ -41,7 +41,7 @@
 #include "SMESH_subMesh.hxx"
 #include "SMESH_subMeshEventListener.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>

diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx
index f4fa4a18e96020bc26912fcb8ae98d0190737bc6..6540e75a898c4eb0b902e88c79098fba2cef7b29 100644 (file)
--- a/src/StdMeshers/StdMeshers_Regular_1D.cxx
+++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx
@@ -48,8 +48,8 @@
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
 
-#include "Utils_SALOME_Exception.hxx"
-#include "utilities.h"
+#include <kernel/Utils_SALOME_Exception.hxx>
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Curve.hxx>
 #include <BRep_Tool.hxx>

diff --git a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx
index 599690c6a27ba33f2b91b928a8a28e361246ea21..c54b754d3e2d60d9c1b6650cfd2376bf0e99341e 100644 (file)
--- a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx
+++ b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx
@@ -32,7 +32,7 @@
 #include "SMESHDS_SubMesh.hxx"
 #include "SMESH_MesherHelper.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Curve.hxx>
 #include <GCPnts_AbscissaPoint.hxx>

diff --git a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx
index c7c54bbf688a07d36b9fec0d88ac5a0229cdb093..17d499f46cc548207a2f2b82a65bb0cbc04a8dcb 100644 (file)
--- a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx
+++ b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 /*!
  * \brief This hypothesis specifies length of segments adjacent to the vertex the

diff --git a/src/StdMeshers/StdMeshers_StartEndLength.hxx b/src/StdMeshers/StdMeshers_StartEndLength.hxx
index 35ae4e0c45c05551955b3f19a1c2092767c7a9e9..2f1dfc40ecd3d8f3bfdc39d9521745e9c83310ab 100644 (file)
--- a/src/StdMeshers/StdMeshers_StartEndLength.hxx
+++ b/src/StdMeshers/StdMeshers_StartEndLength.hxx
@@ -29,7 +29,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <vector>
 

diff --git a/src/StdMeshers/StdMeshers_TrianglePreference.cxx b/src/StdMeshers/StdMeshers_TrianglePreference.cxx
index 331cd0d1cea9edea5820cd05217d9bd6aa0caf7e..078e4f8fe9c31e95b297eedd56cb51b790c8e19c 100644 (file)
--- a/src/StdMeshers/StdMeshers_TrianglePreference.cxx
+++ b/src/StdMeshers/StdMeshers_TrianglePreference.cxx
@@ -24,7 +24,7 @@
 //  Module : SMESH
 
 #include "StdMeshers_TrianglePreference.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers/StdMeshers_TrianglePreference.hxx b/src/StdMeshers/StdMeshers_TrianglePreference.hxx
index 34ec364a16000a973203e8d9d9dbab426ce98d86..25c8f915c967461ee320aa5dd33035c752e78029 100644 (file)
--- a/src/StdMeshers/StdMeshers_TrianglePreference.hxx
+++ b/src/StdMeshers/StdMeshers_TrianglePreference.hxx
@@ -29,7 +29,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 /*!
  * \brief Hypothesis for StdMeshers_Quadrangle_2D, forcing construction

diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
index a45ccbd1f519226845795356286b20c410d6e479..aebbd2df289c3b34de78382d83979281dd4ed7f2 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
@@ -50,7 +50,7 @@
 # include <algorithm>
 #endif
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 StdMeshersGUI_DistrPreview::StdMeshersGUI_DistrPreview( QWidget* p, StdMeshers::StdMeshers_NumberOfSegments_ptr h )
 : QwtPlot( p ),

diff --git a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx
index 2ff99486f70888df019b99f832b7c4ad5a3d5561..e52d11d777dddb4e12c7a2797a572ab7a7610503 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx
@@ -25,8 +25,8 @@
 //
 #include "StdMeshersGUI_FixedPointsParamWdg.h"
 
-#include <QtxIntSpinBox.h>
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 // Qt includes
 #include <QPushButton>

diff --git a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.h b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.h
index 273781d34aa85661e7d816d8a290a32bc372fd3e..1f31b5fff172e326d4c2a3ab5108bfa263ab8d7c 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.h
@@ -26,7 +26,7 @@
 #define STDMESHERSGUI_FIXEDPOINTSPARAMWGD_H
 
 // SMESH includes
-#include <SMESHGUI.h>
+#include "SMESHGUI.h"
 #include "SMESH_StdMeshersGUI.hxx"
 
 // Qt includes

diff --git a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
index 7265cc88fbb3f653fd963d32fd465d887cf3e977..91b8b1f8b96ec622ec6200af88015a8b0dee5adc 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
@@ -30,7 +30,7 @@
 #include <SMESHGUI_Hypotheses.h>
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
+#include <gui/SalomeApp_Tools.h>
 
 // Qt includes
 #include <QPushButton>

diff --git a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
index 2ee5473af34992aee5ac4cc34109832b0a7490d9..f7004be1022504f56489c62ae9c67fe195b2c039 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
@@ -37,9 +37,9 @@
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_IntSpinBox.h>
-#include <QtxComboBox.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_IntSpinBox.h>
+#include <gui/QtxComboBox.h>
 
 // Qt includes
 #include <QLabel>

diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index 37a3ce7eedde8a1706a4ceb00c44cb352aa508f8..086e54acaadf9c87de9b4161192fbf23860beb69 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@ -30,13 +30,13 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <LightApp_SelectionMgr.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL incldues
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // Qt includes
 #include <QPushButton>

diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
index 62e5096af2c7795bd899266db1d04a175191ee27..352111f5c1e559d6526287ae27653586474d6a5e 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
@@ -28,7 +28,7 @@
 // SMESH includes
 #include "SMESH_StdMeshersGUI.hxx"
 
-#include <SMESH_Type.h>
+#include "SMESH_Type.h"
 
 // Qt includes
 #include <QWidget>

diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
index fd9413046511bbd3fbea65a69a86affd72950a67..eef868e5b38c403570395f6465a151ec7c6dc3b8 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
@@ -35,10 +35,10 @@
 #include "StdMeshersGUI_LayerDistributionParamWdg.h"
 #include "StdMeshersGUI_SubShapeSelectorWdg.h"
 #include "StdMeshersGUI_FixedPointsParamWdg.h"
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 // IDL includes
 #include <SALOMEconfig.h>

diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h
index 0973c5c03325e349cf6036f3f56acb353ca21d9b..52fb79706731c8b7c66da66e5831a2fa5b880ec1 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h
@@ -27,7 +27,7 @@
 
 // SMESH includes
 #include "SMESH_StdMeshersGUI.hxx"
-#include <SMESHGUI_Hypotheses.h>
+#include "SMESHGUI_Hypotheses.h"
 
 
 /*!

diff --git a/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
index 26527d85b14f223611883dc92b9d6601bd51f4f9..1cd4774dc069b375d6737e83fea3dea2edf52a38 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
@@ -37,21 +37,21 @@
 #include "SMESHGUI_GEOMGenUtils.h"
 
 // SVTK Includes
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_Selector.h>
 
 // SALOME GUI includes
-#include <SALOME_ListIO.hxx>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 // SUIT Includes
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 // GEOM Includes
-#include <GEOMBase.h>
+#include <geom/GEOMBase.h>
 
 // Qt includes
 #include <QPushButton>
@@ -68,7 +68,7 @@
 #include <TopExp_Explorer.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 #define SPACING 6
 #define MARGIN 0

diff --git a/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.h b/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.h
index 49e49e82a4950ab672cbb4f42454c098cb4adb5e..deb2a3298d5b515e074c620401727c29cb8e1bad 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.h
@@ -26,7 +26,7 @@
 #define STDMESHERSGUI_SUBSHAPESELECTORWDG_H
 
 // SMESH includes
-#include <SMESHGUI.h>
+#include "SMESHGUI.h"
 #include "SMESH_StdMeshersGUI.hxx"
 #include "SMESH_SMESHGUI.hxx"
 
@@ -35,7 +35,7 @@
 #include <QStringList>
 #include <TopoDS_Shape.hxx>
 
-#include <SMESHGUI_VTKUtils.h>
+#include "SMESHGUI_VTKUtils.h"
 
 class SMESHGUI;
 class LightApp_SelectionMgr;

diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
index e8b26b21aecb76288cb8982568674672d1caa39f..98fa5cb4d6d51124e535883639baee791b3f3c6d 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx
index aeb7bb96a1c40b0a8821023cab6c1d2a9b0f835b..76ca74f342e7c60fe0209e7c691f4d17bae8db97 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx b/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx
index c9d1d76930697399c917632e20d2bc2f696d1e96..69929adbf04cc5fabef65ba4577f7f8420bca6e7 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx
@@ -27,8 +27,8 @@
 #include "StdMeshers_CompositeSegment_1D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
index a8eaca72fee9396043f914e62658db3dcea2db4b..5f9d2b51d7d2020e4676c849000859f01b0350ab 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx
index e4ff4ac79f2f11cde22c0ba123b5e70c42c2d028..786ce556b51427861f6b330e29e8ac7f5c94f3ea 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx
index 7910d716b4249f0e0764547342b99f8b1c60839c..97484a75c6545abd28ce0ab4156dbcf61f7a2990 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_Hexa_3D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx b/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx
index 7ad41bb93e1edeed0cc1a37650cf736b5ae0eed3..6f0a18856d74b7d538f326f985402bc938a7d8a2 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "StdMeshers_LayerDistribution2D_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx
index 53707613c5bdeacf2986f64d5a8fd783ced70c0b..455d71e805c9dc244dc02b125597aacf2d9c4e78 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx
index 9b9260094a0b7ef1fb2e961f38d1c49ad7f8977b..ecacc27c92f9a9c6d4f4cb8ecb06d31052bc5fbc 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_LengthFromEdges_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
index ca58ed6321268cf7433a054fd07a44acbfe89d99..4312b7ad42f2f27ffe1edb48485548fcec44563b 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx
index 80721eb2b38c6e82d1650a99426fab0c5b3fe04e..af9b7d9c518ff4906ff08f41e87411cdea527406 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_MEFISTO_2D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
index e4f59f5e3a308a646554e70c32252eb1d44f5a60..54fd57b1d50fd7284f3324d0f8cc03cd86469248 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
index 35a01717f9e0201de1cfd3cf30d60b69b7886c66..ce5ae7ba8011621b2de27b386888a7404cee6465 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx b/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx
index 6104c81c5c6290c3ff0dabefe765c8ae9ec21943..e5d4872214d4aa008198a60065078d25b49e6c3d 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx
@@ -27,8 +27,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx
index 59f13b891b2742827ab627ccc0dd0568cb69b9fb..8b2efee29fb769e59a0cfea40121040411a5d24c 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx
@@ -28,7 +28,7 @@
 #include "StdMeshers_NotConformAllowed_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx
index 2dabe905da9ab498c6622220c8acfe7248e19eee..3c9b5fee1efc49f90f4a62561ef1f334107805b4 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "StdMeshers_NumberOfLayers2D_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx
index 9779cfbdb0ac7bf80afca6c8d74587f3af4634e8..2c5a34ce4d340dd4b76707c871db2ce42e813cfa 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
index a2cc07c42f05894d643abadc3c6a76e1b5dd6a0f..51bbbf40f69539de724225ceafa3d57a746a8971 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx
index bdb6e87d4a91ad2d528d441e59deecf88e31bd3c..42b869ac623aee106cfc54eacbc59c5916524a4a 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_Prism_3D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
index 62d7d7af7503fee9276ee86019a8011033486c14..3f3edddae5e0303dd5045e0e70d74e246e991cad 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include "StdMeshers_ObjRefUlils.hxx"
 

diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx
index 6186a7b04639312e809c330f18bfa99a60a9bd60..2a8b071449a5b37002b5565972efe3f6ac00ca3e 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include "StdMeshers_ObjRefUlils.hxx"
 

diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx
index 5ee44b3fc4e1077c6ba22d91ce5678f50c960d30..e88d0caf1e4a62f674c613e01bb6bbc98700d119 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include "StdMeshers_ObjRefUlils.hxx"
 

diff --git a/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx
index 83635216346e5d4a778df9a3fe81432b4cf5c5e8..d08c49eeb408309c027e539193f15b789e4ef2af 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx
@@ -30,8 +30,8 @@
 
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include "StdMeshers_ObjRefUlils.hxx"
 

diff --git a/src/StdMeshers_I/StdMeshers_Propagation_i.cxx b/src/StdMeshers_I/StdMeshers_Propagation_i.cxx
index 707e41600cc1a5664bcdc65a97787979330843aa..1557c6362b65c6279c78edcf8087e1274a18b255 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Propagation_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Propagation_i.cxx
@@ -27,8 +27,8 @@
 #include "StdMeshers_Propagation_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
index 875a7df50c481b66000785755f376c1b529710f4..5ff8f6a092925d7f90c0f79ba1ea4b6e1612821b 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx
index c199fcebd492d175a1d81e79d59c5761eed88a17..03a5a7ee7e256ca69fd87dc4666529524fc3cde4 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx
index 674410304026d37fde9e87a58c81e497e5077ef0..2a255ae577569825a5c3e2028fe1b4e748b098e3 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_Quadrangle_2D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx
index 46052eb94af26be2c82a67f69a130cb8f0617238..3f4f8b9615a79bf0c95dc2cc6b20edde8d76888f 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 //#include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx b/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx
index d588453dcdfdc9f1f45d497bb8b0450cdf79a0d2..e5ea3c217dceda09542bb8b67224413fc27c7bb2 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx
@@ -27,8 +27,8 @@
 #include "StdMeshers_RadialQuadrangle_1D2D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx b/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx
index 1ac655bda80f6d1662f49f8ae98d73626d8e7e7e..934e3ac8210be30313866926fc8152a9bb29fc31 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_Regular_1D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx b/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx
index fb81f9e9f00533856a45a0db2b0a43f985e9381f..7f8f0d9101a3de42965d848156ef322d4599cd01 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx
@@ -30,8 +30,8 @@
 
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx b/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx
index 9ee69e626fef2e48f9469869152beae14384b062..629143578f2dd4f73a4a8979b18cb79fbe0fe329 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx
@@ -28,8 +28,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
index 9af54879dc5b91c1d40dfbb716496df4ba7d00a9..b45374673bb80df59bd9787b8d62dd8b945e14e6 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx b/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx
index 330216d898c518924feffd3e23bbd4f36d612e24..4344ac67d53bf12253b305329ab5f57a0e02ae0d 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx
@@ -27,8 +27,8 @@
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx b/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx
index 63814d21806b9c89c5baaa7cff1b35330afcebd9..56ae7ddf57c53bd2ba223778606628fd8ab350b7 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx
@@ -30,7 +30,7 @@
 
 #include "SMESH_Gen.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //=============================================================================
 /*!

diff --git a/src/StdMeshers_I/StdMeshers_i.cxx b/src/StdMeshers_I/StdMeshers_i.cxx
index 952bc8a8d259aa5902954f55d3e8f848faa54162..b2f8d16ae064ef56a978cbdfb70c42f0f2f5ca55 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_i.cxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_Gen_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "StdMeshers_LocalLength_i.hxx"
 #include "StdMeshers_AutomaticLength_i.hxx"