ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-13 02:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Improve build system: install each module's header files to the sub-directory of ${prefix}/include/salome/${module_name}

Browse Source
This commit is contained in:
adv 2010-02-18 12:01:18 +00:00
parent e096680dda
commit 3ff66c2e87
286 changed files with 933 additions and 932 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm_local/unix/config_files/check_SMESH.m4
View File

@ -73,7 +73,7 @@ if test -f ${SMESH_DIR}/bin/salome/smesh.py ; then
AC_SUBST(SMESH_ROOT_DIR) AC_SUBST(SMESH_ROOT_DIR)
SMESH_LDFLAGS=-L${SMESH_DIR}/lib${LIB_LOCATION_SUFFIX}/salome 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_LDFLAGS)
AC_SUBST(SMESH_CXXFLAGS) AC_SUBST(SMESH_CXXFLAGS)

3
adm_local/unix/make_common_starter.am
View File

@ -34,7 +34,8 @@ AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
# ============================================================ # ============================================================
# Standard directory for installation # Standard directory for installation
# #
salomeincludedir = $(includedir)/salome salomeincludedir = $(includedir)/salome/@MODULE_NAME@
salomeskeldir = $(includedir)/salome/skel
libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
bindir = $(prefix)/bin/salome bindir = $(prefix)/bin/salome
salomescriptdir = $(bindir) salomescriptdir = $(bindir)

2
idl/Makefile.am
View File

@ -54,7 +54,7 @@ nodist_libSalomeIDLSMESH_la_SOURCES = \
SMESH_MeshEditorSK.cc SMESH_MeshEditorSK.cc
# header files must be exported: other modules have to use this library # 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 = \ libSalomeIDLSMESH_la_CPPFLAGS = \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl \

4
src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
View File

@ -24,9 +24,9 @@
#include "DriverDAT_R_SMDS_Mesh.h" #include "DriverDAT_R_SMDS_Mesh.h"
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include <Basics_Utils.hxx> #include <kernel/Basics_Utils.hxx>
using namespace std; using namespace std;

4
src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
View File

@ -25,9 +25,9 @@
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include <Basics_Utils.hxx> #include <kernel/Basics_Utils.hxx>
using namespace std; using namespace std;

2
src/DriverMED/DriverMED_Family.cxx
View File

@ -25,7 +25,7 @@
// Module : SMESH // Module : SMESH
// //
#include "DriverMED_Family.h" #include "DriverMED_Family.h"
#include "MED_Factory.hxx" #include <med/MED_Factory.hxx>
#include <sstream> #include <sstream>

2
src/DriverMED/DriverMED_Family.h
View File

@ -32,7 +32,7 @@
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "SMESHDS_GroupBase.hxx" #include "SMESHDS_GroupBase.hxx"
#include "SMESHDS_SubMesh.hxx" #include "SMESHDS_SubMesh.hxx"
#include "MED_Common.hxx" #include <med/MED_Common.hxx>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <set> #include <set>

8
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
View File

@ -26,15 +26,15 @@
#include "DriverMED_R_SMESHDS_Mesh.h" #include "DriverMED_R_SMESHDS_Mesh.h"
#include "DriverMED_R_SMDS_Mesh.h" #include "DriverMED_R_SMDS_Mesh.h"
#include "SMESHDS_Mesh.hxx" #include "SMESHDS_Mesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include "DriverMED_Family.h" #include "DriverMED_Family.h"
#include "SMESHDS_Group.hxx" #include "SMESHDS_Group.hxx"
#include "MED_Factory.hxx" #include <med/MED_Factory.hxx>
#include "MED_CoordUtils.hxx" #include <med/MED_CoordUtils.hxx>
#include "MED_Utilities.hxx" #include <med/MED_Utilities.hxx>
#include <stdlib.h> #include <stdlib.h>

4
src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
View File

@ -34,9 +34,9 @@
#include "SMDS_MeshNode.hxx" #include "SMDS_MeshNode.hxx"
#include "SMDS_PolyhedralVolumeOfNodes.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 _EDF_NODE_IDS_
//#define _ELEMENTS_BY_DIM_ //#define _ELEMENTS_BY_DIM_

2
src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
View File

@ -29,7 +29,7 @@
#include "SMESH_DriverMED.hxx" #include "SMESH_DriverMED.hxx"
#include "Driver_SMESHDS_Mesh.h" #include "Driver_SMESHDS_Mesh.h"
#include "MED_Factory.hxx" #include <med/MED_Factory.hxx>
#include <string> #include <string>
#include <list> #include <list>

2
src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
View File

@ -64,7 +64,7 @@ inline Standard_Boolean IsEqual
#include <OSD_SingleProtection.hxx> #include <OSD_SingleProtection.hxx>
#include <Standard_NoMoreObject.hxx> #include <Standard_NoMoreObject.hxx>
#include "utilities.h" #include <kernel/utilities.h>
static const int HEADER_SIZE = 84; static const int HEADER_SIZE = 84;
static const int SIZEOF_STL_FACET = 50; static const int SIZEOF_STL_FACET = 50;

2
src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
View File

@ -35,7 +35,7 @@
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TColgp_Array1OfXYZ.hxx> #include <TColgp_Array1OfXYZ.hxx>
#include "utilities.h" #include <kernel/utilities.h>
//using namespace std; //using namespace std;

4
src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
View File

@ -23,14 +23,14 @@
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "SMDS_MeshGroup.hxx" #include "SMDS_MeshGroup.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include "UNV2411_Structure.hxx" #include "UNV2411_Structure.hxx"
#include "UNV2412_Structure.hxx" #include "UNV2412_Structure.hxx"
#include "UNV2417_Structure.hxx" #include "UNV2417_Structure.hxx"
#include "UNV_Utilities.hxx" #include "UNV_Utilities.hxx"
#include <Basics_Utils.hxx> #include <kernel/Basics_Utils.hxx>
using namespace std; using namespace std;

4
src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
View File

@ -29,14 +29,14 @@
#include "SMDS_PolyhedralVolumeOfNodes.hxx" #include "SMDS_PolyhedralVolumeOfNodes.hxx"
#include "SMESHDS_GroupBase.hxx" #include "SMESHDS_GroupBase.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include "UNV2411_Structure.hxx" #include "UNV2411_Structure.hxx"
#include "UNV2412_Structure.hxx" #include "UNV2412_Structure.hxx"
#include "UNV2417_Structure.hxx" #include "UNV2417_Structure.hxx"
#include "UNV_Utilities.hxx" #include "UNV_Utilities.hxx"
#include <Basics_Utils.hxx> #include <kernel/Basics_Utils.hxx>
using namespace std; using namespace std;
using namespace UNV; using namespace UNV;

2
src/MEFISTO2/aptrte.cxx
View File

@ -26,7 +26,7 @@
#include "Rn.h" #include "Rn.h"
#include "aptrte.h" #include "aptrte.h"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

12
src/OBJECT/SMESH_Actor.cxx
View File

@ -30,12 +30,12 @@
#include "SMESH_DeviceActor.h" #include "SMESH_DeviceActor.h"
#include "SMESH_ObjectDef.h" #include "SMESH_ObjectDef.h"
#include "SMESH_ControlsDef.hxx" #include "SMESH_ControlsDef.hxx"
#include "VTKViewer_ExtractUnstructuredGrid.h" #include <gui/VTKViewer_ExtractUnstructuredGrid.h>
#include "VTKViewer_FramedTextActor.h" #include <gui/VTKViewer_FramedTextActor.h>
#include "SALOME_InteractiveObject.hxx" #include <gui/SALOME_InteractiveObject.hxx>
#include "SUIT_Session.h" #include <gui/SUIT_Session.h>
#include "SUIT_ResourceMgr.h" #include <gui/SUIT_ResourceMgr.h>
#include <vtkProperty.h> #include <vtkProperty.h>
#include <vtkTimeStamp.h> #include <vtkTimeStamp.h>
@ -77,7 +77,7 @@
#define VTK_XVERSION (VTK_MAJOR_VERSION<<16)+(VTK_MINOR_VERSION<<8)+(VTK_BUILD_VERSION) #define VTK_XVERSION (VTK_MAJOR_VERSION<<16)+(VTK_MINOR_VERSION<<8)+(VTK_BUILD_VERSION)
#endif #endif
#include "utilities.h" #include <kernel/utilities.h>
#ifdef _DEBUG_ #ifdef _DEBUG_
static int MYDEBUG = 1; static int MYDEBUG = 1;

2
src/OBJECT/SMESH_Actor.h
View File

@ -27,7 +27,7 @@
#ifndef SMESH_ACTOR_H #ifndef SMESH_ACTOR_H
#define SMESH_ACTOR_H #define SMESH_ACTOR_H
#include <SALOME_Actor.h> #include <gui/SALOME_Actor.h>
#include "SMESH_Object.h" #include "SMESH_Object.h"
class vtkUnstructuredGrid; class vtkUnstructuredGrid;

8
src/OBJECT/SMESH_ActorUtils.cxx
View File

@ -21,11 +21,11 @@
// //
#include "SMESH_ActorUtils.h" #include "SMESH_ActorUtils.h"
#include "SUIT_Tools.h" #include <gui/SUIT_Tools.h>
#include "SUIT_Session.h" #include <gui/SUIT_Session.h>
#include "SUIT_ResourceMgr.h" #include <gui/SUIT_ResourceMgr.h>
#include "utilities.h" #include <kernel/utilities.h>
#include <vtkUnstructuredGrid.h> #include <vtkUnstructuredGrid.h>
#include <vtkUnstructuredGridWriter.h> #include <vtkUnstructuredGridWriter.h>

10
src/OBJECT/SMESH_DeviceActor.cxx
View File

@ -30,11 +30,11 @@
#include "SMESH_ControlsDef.hxx" #include "SMESH_ControlsDef.hxx"
#include "SMESH_ActorUtils.h" #include "SMESH_ActorUtils.h"
#include "SMESH_FaceOrientationFilter.h" #include "SMESH_FaceOrientationFilter.h"
#include "VTKViewer_CellLocationsArray.h" #include <gui/VTKViewer_CellLocationsArray.h>
#include <VTKViewer_Transform.h> #include <gui/VTKViewer_Transform.h>
#include <VTKViewer_TransformFilter.h> #include <gui/VTKViewer_TransformFilter.h>
#include <VTKViewer_ExtractUnstructuredGrid.h> #include <gui/VTKViewer_ExtractUnstructuredGrid.h>
// VTK Includes // VTK Includes
#include <vtkObjectFactory.h> #include <vtkObjectFactory.h>
@ -62,7 +62,7 @@
#include <vtkRenderer.h> #include <vtkRenderer.h>
#include "utilities.h" #include <kernel/utilities.h>
#ifdef _DEBUG_ #ifdef _DEBUG_
static int MYDEBUG = 0; static int MYDEBUG = 0;

2
src/OBJECT/SMESH_DeviceActor.h
View File

@ -28,7 +28,7 @@
#ifndef SMESH_DEVICE_ACTOR_H #ifndef SMESH_DEVICE_ACTOR_H
#define SMESH_DEVICE_ACTOR_H #define SMESH_DEVICE_ACTOR_H
#include <VTKViewer_GeometryFilter.h> #include <gui/VTKViewer_GeometryFilter.h>
#include "SMESH_Controls.hxx" #include "SMESH_Controls.hxx"
#include "SMESH_Object.h" #include "SMESH_Object.h"

2
src/OBJECT/SMESH_ExtractGeometry.h
View File

@ -27,7 +27,7 @@
#include <vtkExtractGeometry.h> #include <vtkExtractGeometry.h>
#include <vector> #include <vector>
#include "VTKViewer.h" #include <gui/VTKViewer.h>
class SMESHOBJECT_EXPORT SMESH_ExtractGeometry : public vtkExtractGeometry{ class SMESHOBJECT_EXPORT SMESH_ExtractGeometry : public vtkExtractGeometry{
public: public:

4
src/OBJECT/SMESH_FaceOrientationFilter.cxx
View File

@ -22,8 +22,8 @@
#include "SMESH_FaceOrientationFilter.h" #include "SMESH_FaceOrientationFilter.h"
#include "SMESH_ActorUtils.h" #include "SMESH_ActorUtils.h"
#include "SUIT_Session.h" #include <gui/SUIT_Session.h>
#include "SUIT_ResourceMgr.h" #include <gui/SUIT_ResourceMgr.h>
#include <vtkCellData.h> #include <vtkCellData.h>
#include <vtkDataSet.h> #include <vtkDataSet.h>

8
src/OBJECT/SMESH_Object.cxx
View File

@ -31,9 +31,9 @@
#include "SMDS_PolyhedralVolumeOfNodes.hxx" #include "SMDS_PolyhedralVolumeOfNodes.hxx"
#include "SMESH_Actor.h" #include "SMESH_Actor.h"
#include "SMESH_ControlsDef.hxx" #include "SMESH_ControlsDef.hxx"
#include "SalomeApp_Application.h" #include <gui/SalomeApp_Application.h>
#include "VTKViewer_ExtractUnstructuredGrid.h" #include <gui/VTKViewer_ExtractUnstructuredGrid.h>
#include "VTKViewer_CellLocationsArray.h" #include <gui/VTKViewer_CellLocationsArray.h>
#include CORBA_SERVER_HEADER(SMESH_Gen) #include CORBA_SERVER_HEADER(SMESH_Gen)
#include CORBA_SERVER_HEADER(SALOME_Exception) #include CORBA_SERVER_HEADER(SALOME_Exception)
@ -50,7 +50,7 @@
#include <stdexcept> #include <stdexcept>
#include <set> #include <set>
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

10
src/OBJECT/SMESH_PreviewActorsCollection.cxx
View File

@ -27,9 +27,9 @@
#include "SMESH_PreviewActorsCollection.h" #include "SMESH_PreviewActorsCollection.h"
#include "utilities.h" #include <kernel/utilities.h>
#include "SALOME_InteractiveObject.hxx" #include <gui/SALOME_InteractiveObject.hxx>
// OCC includes // OCC includes
#include <TopoDS.hxx> #include <TopoDS.hxx>
@ -43,10 +43,10 @@
#include <vtkRenderer.h> #include <vtkRenderer.h>
#include <vtkProperty.h> #include <vtkProperty.h>
#include "VTKViewer_Actor.h" #include <gui/VTKViewer_Actor.h>
#include "SVTK_DeviceActor.h" #include <gui/SVTK_DeviceActor.h>
#include "SALOME_Actor.h" #include <gui/SALOME_Actor.h>
// QT // QT
#include <QString> #include <QString>

4
src/OBJECT/SMESH_PreviewActorsCollection.h
View File

@ -29,10 +29,10 @@
#define SMESH_PREVIEW_ACTOR_COLLECTION_H #define SMESH_PREVIEW_ACTOR_COLLECTION_H
#include "SMESH_Actor.h" #include "SMESH_Actor.h"
#include <GEOM_Actor.h> #include <geom/GEOM_Actor.h>
#include "SMESH_Object.h" #include "SMESH_Object.h"
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <SMDS_SetIterator.hxx> #include "SMDS_SetIterator.hxx"
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <QString> #include <QString>

16
src/PluginUtils/GeomSelectionTools.cxx
View File

@ -25,24 +25,24 @@
#include "GeomSelectionTools.h" #include "GeomSelectionTools.h"
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SalomeApp_Application.h> #include <gui/SalomeApp_Application.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SALOME_ListIteratorOfListIO.hxx> #include <gui/SALOME_ListIteratorOfListIO.hxx>
#include <GEOM_Client.hxx> #include <geom/GEOM_Client.hxx>
#include <SMESHGUI_Utils.h> #include <SMESHGUI_Utils.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <GEOMImpl_Types.hxx> #include <geom/GEOMImpl_Types.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <Handle_Geom_Surface.hxx> #include <Handle_Geom_Surface.hxx>
#include <BRepAdaptor_Surface.hxx> #include <BRepAdaptor_Surface.hxx>
#include "utilities.h" #include <kernel/utilities.h>
#include "SALOME_LifeCycleCORBA.hxx" #include <kernel/SALOME_LifeCycleCORBA.hxx>
#include <sstream> #include <sstream>
/*! /*!

8
src/PluginUtils/GeomSelectionTools.h
View File

@ -32,10 +32,10 @@
# define GEOMSELECTIONTOOLS_EXPORT # define GEOMSELECTIONTOOLS_EXPORT
#endif #endif
#include "SALOMEDSClient.hxx" #include <kernel/SALOMEDSClient.hxx>
#include "SALOME_InteractiveObject.hxx" #include <gui/SALOME_InteractiveObject.hxx>
#include <SALOME_ListIO.hxx> #include <gui/SALOME_ListIO.hxx>
#include <SalomeApp_Application.h> #include <gui/SalomeApp_Application.h>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <GeomAbs_SurfaceType.hxx> #include <GeomAbs_SurfaceType.hxx>

2
src/SMDS/SMDS_EdgePosition.cxx
View File

@ -26,7 +26,7 @@
// //
#include "SMDS_EdgePosition.hxx" #include "SMDS_EdgePosition.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMDS/SMDS_FaceOfNodes.cxx
View File

@ -31,7 +31,7 @@
#include "SMDS_MeshNode.hxx" #include "SMDS_MeshNode.hxx"
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMDS/SMDS_FacePosition.cxx
View File

@ -26,7 +26,7 @@
// //
#include "SMDS_FacePosition.hxx" #include "SMDS_FacePosition.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMDS/SMDS_Mesh.cxx
View File

@ -25,7 +25,7 @@
#pragma warning(disable:4786) #pragma warning(disable:4786)
#endif #endif
#include "utilities.h" #include <kernel/utilities.h>
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "SMDS_VolumeOfNodes.hxx" #include "SMDS_VolumeOfNodes.hxx"
#include "SMDS_VolumeOfFaces.hxx" #include "SMDS_VolumeOfFaces.hxx"

2
src/SMDS/SMDS_MeshElement.cxx
View File

@ -30,7 +30,7 @@
#include "SMDS_MeshEdge.hxx" #include "SMDS_MeshEdge.hxx"
#include "SMDS_MeshFace.hxx" #include "SMDS_MeshFace.hxx"
#include "SMDS_MeshVolume.hxx" #include "SMDS_MeshVolume.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMDS/SMDS_MeshGroup.cxx
View File

@ -29,7 +29,7 @@
#endif #endif
#include "SMDS_MeshGroup.hxx" #include "SMDS_MeshGroup.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMDS/SMDS_PolygonalFaceOfNodes.cxx
View File

@ -31,7 +31,7 @@
#include "SMDS_SetIterator.hxx" #include "SMDS_SetIterator.hxx"
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx
View File

@ -29,7 +29,7 @@
#include "SMDS_MeshNode.hxx" #include "SMDS_MeshNode.hxx"
#include "SMDS_SetIterator.hxx" #include "SMDS_SetIterator.hxx"
#include "SMDS_VolumeTool.hxx" #include "SMDS_VolumeTool.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include <set> #include <set>

2
src/SMDS/SMDS_QuadraticFaceOfNodes.cxx
View File

@ -31,7 +31,7 @@
#include "SMDS_MeshNode.hxx" #include "SMDS_MeshNode.hxx"
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx
View File

@ -31,7 +31,7 @@
#include "SMDS_SetIterator.hxx" #include "SMDS_SetIterator.hxx"
#include "SMDS_VolumeTool.hxx" #include "SMDS_VolumeTool.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMDS/SMDS_VertexPosition.cxx
View File

@ -26,7 +26,7 @@
// //
#include "SMDS_VertexPosition.hxx" #include "SMDS_VertexPosition.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMDS/SMDS_VolumeOfNodes.cxx
View File

@ -29,7 +29,7 @@
#include "SMDS_MeshNode.hxx" #include "SMDS_MeshNode.hxx"
#include "SMDS_SetIterator.hxx" #include "SMDS_SetIterator.hxx"
#include "SMDS_VolumeTool.hxx" #include "SMDS_VolumeTool.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include <vector> #include <vector>

2
src/SMDS/SMDS_VolumeTool.cxx
View File

@ -34,7 +34,7 @@
#include "SMDS_PolyhedralVolumeOfNodes.hxx" #include "SMDS_PolyhedralVolumeOfNodes.hxx"
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include <map> #include <map>
#include <float.h> #include <float.h>

2
src/SMESH/SMESH_2D_Algo.cxx
View File

@ -28,7 +28,7 @@
#include "SMESH_2D_Algo.hxx" #include "SMESH_2D_Algo.hxx"
#include "SMESH_Gen.hxx" #include "SMESH_Gen.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>

2
src/SMESH/SMESH_3D_Algo.cxx
View File

@ -28,7 +28,7 @@
#include "SMESH_3D_Algo.hxx" #include "SMESH_3D_Algo.hxx"
#include "SMESH_Gen.hxx" #include "SMESH_Gen.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMESH/SMESH_Algo.cxx
View File

@ -58,7 +58,7 @@
#include <Standard_ErrorHandler.hxx> #include <Standard_ErrorHandler.hxx>
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#include "utilities.h" #include <kernel/utilities.h>
#include <algorithm> #include <algorithm>

2
src/SMESH/SMESH_Block.cxx
View File

@ -55,7 +55,7 @@
#include "SMDS_MeshNode.hxx" #include "SMDS_MeshNode.hxx"
#include "SMDS_MeshVolume.hxx" #include "SMDS_MeshVolume.hxx"
#include "SMDS_VolumeTool.hxx" #include "SMDS_VolumeTool.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include <list> #include <list>

2
src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx
View File

@ -28,7 +28,7 @@
#include "SMESH_SMESH.hxx" #include "SMESH_SMESH.hxx"
#include <SMESH_SequenceOfElemPtr.hxx> #include "SMESH_SequenceOfElemPtr.hxx"
#include <NCollection_DefineDataMap.hxx> #include <NCollection_DefineDataMap.hxx>

6
src/SMESH/SMESH_Gen.cxx
View File

@ -31,9 +31,9 @@
#include "SMDS_MeshElement.hxx" #include "SMDS_MeshElement.hxx"
#include "SMDS_MeshNode.hxx" #include "SMDS_MeshNode.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include "OpUtil.hxx" #include <kernel/OpUtil.hxx>
#include "Utils_ExceptHandlers.hxx" #include <kernel/Utils_ExceptHandlers.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>

2
src/SMESH/SMESH_Gen.hxx
View File

@ -30,7 +30,7 @@
#include "SMESH_SMESH.hxx" #include "SMESH_SMESH.hxx"
#include "Utils_SALOME_Exception.hxx" #include <kernel/Utils_SALOME_Exception.hxx>
#include "SMESH_Hypothesis.hxx" #include "SMESH_Hypothesis.hxx"
#include "SMESH_ComputeError.hxx" #include "SMESH_ComputeError.hxx"

2
src/SMESH/SMESH_Hypothesis.cxx
View File

@ -27,7 +27,7 @@
#include "SMESH_Hypothesis.hxx" #include "SMESH_Hypothesis.hxx"
#include "SMESH_Gen.hxx" #include "SMESH_Gen.hxx"
#include "SMESH_subMesh.hxx" #include "SMESH_subMesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

4
src/SMESH/SMESH_Mesh.cxx
View File

@ -37,7 +37,7 @@
#include "SMDS_MeshVolume.hxx" #include "SMDS_MeshVolume.hxx"
#include "SMDS_SetIterator.hxx" #include "SMDS_SetIterator.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include "DriverMED_W_SMESHDS_Mesh.h" #include "DriverMED_W_SMESHDS_Mesh.h"
#include "DriverDAT_W_SMDS_Mesh.h" #include "DriverDAT_W_SMDS_Mesh.h"
@ -59,7 +59,7 @@
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#include <TopoDS_Iterator.hxx> #include <TopoDS_Iterator.hxx>
#include "Utils_ExceptHandlers.hxx" #include <kernel/Utils_ExceptHandlers.hxx>
using namespace std; using namespace std;

2
src/SMESH/SMESH_Mesh.hxx
View File

@ -35,7 +35,7 @@
#include "SMESHDS_Command.hxx" #include "SMESHDS_Command.hxx"
#include "SMDSAbs_ElementType.hxx" #include "SMDSAbs_ElementType.hxx"
#include "Utils_SALOME_Exception.hxx" #include <kernel/Utils_SALOME_Exception.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>

2
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -44,7 +44,7 @@
#include "SMESH_OctreeNode.hxx" #include "SMESH_OctreeNode.hxx"
#include "SMESH_Group.hxx" #include "SMESH_Group.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include <BRepAdaptor_Surface.hxx> #include <BRepAdaptor_Surface.hxx>
#include <BRepClass3d_SolidClassifier.hxx> #include <BRepClass3d_SolidClassifier.hxx>

2
src/SMESH/SMESH_MeshEditor.hxx
View File

@ -36,7 +36,7 @@
#include "SMESH_SequenceOfElemPtr.hxx" #include "SMESH_SequenceOfElemPtr.hxx"
#include "SMESH_SequenceOfNode.hxx" #include "SMESH_SequenceOfNode.hxx"
#include <utilities.h> #include <kernel/utilities.h>
#include <TColStd_HSequenceOfReal.hxx> #include <TColStd_HSequenceOfReal.hxx>
#include <gp_Dir.hxx> #include <gp_Dir.hxx>

2
src/SMESH/SMESH_MesherHelper.cxx
View File

@ -53,7 +53,7 @@
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> #include <Standard_ErrorHandler.hxx>
#include <utilities.h> #include <kernel/utilities.h>
#include <limits> #include <limits>

4
src/SMESH/SMESH_MesherHelper.hxx
View File

@ -29,8 +29,8 @@
#include "SMESH_SMESH.hxx" #include "SMESH_SMESH.hxx"
#include "SMESH_MeshEditor.hxx" // needed for many meshers #include "SMESH_MeshEditor.hxx" // needed for many meshers
#include <SMDS_MeshNode.hxx> #include "SMDS_MeshNode.hxx"
#include <SMDS_QuadraticEdge.hxx> #include "SMDS_QuadraticEdge.hxx"
#include <Geom_Surface.hxx> #include <Geom_Surface.hxx>
#include <TopoDS_Face.hxx> #include <TopoDS_Face.hxx>

2
src/SMESH/SMESH_Pattern.cxx
View File

@ -72,7 +72,7 @@
#include "SMESH_MesherHelper.hxx" #include "SMESH_MesherHelper.hxx"
#include "SMESH_subMesh.hxx" #include "SMESH_subMesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMESH/SMESH_SequenceOfElemPtr.hxx
View File

@ -30,7 +30,7 @@
#include <NCollection_DefineSequence.hxx> #include <NCollection_DefineSequence.hxx>
#include <SMDS_MeshElement.hxx> #include "SMDS_MeshElement.hxx"
typedef const SMDS_MeshElement* SMDS_MeshElementPtr; typedef const SMDS_MeshElement* SMDS_MeshElementPtr;

4
src/SMESH/SMESH_subMesh.cxx
View File

@ -37,8 +37,8 @@
#include "SMDS_SetIterator.hxx" #include "SMDS_SetIterator.hxx"
#include "SMDSAbs_ElementType.hxx" #include "SMDSAbs_ElementType.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include "OpUtil.hxx" #include <kernel/OpUtil.hxx>
#include <BRep_Builder.hxx> #include <BRep_Builder.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>

2
src/SMESH/SMESH_subMesh.hxx
View File

@ -35,7 +35,7 @@
#include "SMESH_ComputeError.hxx" #include "SMESH_ComputeError.hxx"
#include "SMESH_Algo.hxx" #include "SMESH_Algo.hxx"
#include "Utils_SALOME_Exception.hxx" #include <kernel/Utils_SALOME_Exception.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>

8
src/SMESHClient/SMESH_Client.cxx
View File

@ -27,15 +27,15 @@
#include "SMESH_Client.hxx" #include "SMESH_Client.hxx"
#include "SMESH_Mesh.hxx" #include "SMESH_Mesh.hxx"
#include "SALOME_NamingService.hxx" #include <kernel/SALOME_NamingService.hxx>
#include "SALOME_LifeCycleCORBA.hxx" #include <kernel/SALOME_LifeCycleCORBA.hxx>
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SALOME_Component) #include CORBA_SERVER_HEADER(SALOME_Component)
#include CORBA_SERVER_HEADER(SALOME_Exception) #include CORBA_SERVER_HEADER(SALOME_Exception)
#include "Basics_Utils.hxx" #include <kernel/Basics_Utils.hxx>
#include "utilities.h" #include <kernel/utilities.h>
#ifdef WNT #ifdef WNT
#include <process.h> #include <process.h>

2
src/SMESHDS/SMESHDS_Command.cxx
View File

@ -27,7 +27,7 @@
// //
#include "SMESHDS_Command.hxx" #include "SMESHDS_Command.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMESHDS/SMESHDS_Document.cxx
View File

@ -26,7 +26,7 @@
// $Header: // $Header:
// //
#include "SMESHDS_Document.hxx" #include "SMESHDS_Document.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMESHDS/SMESHDS_GroupBase.cxx
View File

@ -27,7 +27,7 @@
#include "SMESHDS_GroupBase.hxx" #include "SMESHDS_GroupBase.hxx"
#include "SMESHDS_Mesh.hxx" #include "SMESHDS_Mesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMESHDS/SMESHDS_GroupOnGeom.cxx
View File

@ -25,7 +25,7 @@
// //
#include "SMESHDS_GroupOnGeom.hxx" #include "SMESHDS_GroupOnGeom.hxx"
#include "SMESHDS_Mesh.hxx" #include "SMESHDS_Mesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMESHDS/SMESHDS_Mesh.cxx
View File

@ -40,7 +40,7 @@
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <TopoDS_Iterator.hxx> #include <TopoDS_Iterator.hxx>
#include "utilities.h" #include <kernel/utilities.h>
using namespace std; using namespace std;

2
src/SMESHDS/SMESHDS_SubMesh.cxx
View File

@ -27,7 +27,7 @@
// //
#include "SMESHDS_SubMesh.hxx" #include "SMESHDS_SubMesh.hxx"
#include "utilities.h" #include <kernel/utilities.h>
#include "SMDS_SetIterator.hxx" #include "SMDS_SetIterator.hxx"
using namespace std; using namespace std;

2
src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
View File

@ -27,7 +27,7 @@
#include "SMESH_Type.h" #include "SMESH_Type.h"
#include <SUIT_SelectionFilter.h> #include <gui/SUIT_SelectionFilter.h>
#include <QList> #include <QList>

18
src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
View File

@ -24,18 +24,18 @@
// //
#include "SMESH_NumberFilter.hxx" #include "SMESH_NumberFilter.hxx"
#include "GEOM_Client.hxx" #include <geom/GEOM_Client.hxx>
#include "GeometryGUI.h" #include <geom/GeometryGUI.h>
#include "SUIT_Application.h" #include <gui/SUIT_Application.h>
#include "SUIT_Session.h" #include <gui/SUIT_Session.h>
#include "SalomeApp_Study.h" #include <gui/SalomeApp_Study.h>
#include "LightApp_DataOwner.h" #include <gui/LightApp_DataOwner.h>
#include "SALOME_InteractiveObject.hxx" #include <gui/SALOME_InteractiveObject.hxx>
#include "SALOMEDSClient_SObject.hxx" #include <kernel/SALOMEDSClient_SObject.hxx>
#include "SALOMEDS_SObject.hxx" #include <kernel/SALOMEDS_SObject.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>

2
src/SMESHFiltersSelection/SMESH_NumberFilter.hxx
View File

@ -27,7 +27,7 @@
#include "SMESH_Type.h" #include "SMESH_Type.h"
#include "SUIT_SelectionFilter.h" #include <gui/SUIT_SelectionFilter.h>
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>

6
src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
View File

@ -21,10 +21,10 @@
// //
#include "SMESH_TypeFilter.hxx" #include "SMESH_TypeFilter.hxx"
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SalomeApp_Study.h> #include <gui/SalomeApp_Study.h>
#include <LightApp_DataOwner.h> #include <gui/LightApp_DataOwner.h>
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(SMESH_Gen) #include CORBA_CLIENT_HEADER(SMESH_Gen)

2
src/SMESHFiltersSelection/SMESH_TypeFilter.hxx
View File

@ -26,7 +26,7 @@
#define _SMESH_TypeFilter_HeaderFile #define _SMESH_TypeFilter_HeaderFile
#include "SMESH_Type.h" #include "SMESH_Type.h"
#include "SUIT_SelectionFilter.h" #include <gui/SUIT_SelectionFilter.h>
class SUIT_DataOwner; class SUIT_DataOwner;

56
src/SMESHGUI/SMESHGUI.cxx
View File

@ -85,35 +85,35 @@
#include <SMESH_TypeFilter.hxx> #include <SMESH_TypeFilter.hxx>
// SALOME GUI includes // SALOME GUI includes
#include <SalomeApp_Tools.h> #include <gui/SalomeApp_Tools.h>
#include <SalomeApp_Study.h> #include <gui/SalomeApp_Study.h>
#include <SalomeApp_Application.h> #include <gui/SalomeApp_Application.h>
#include <SalomeApp_CheckFileDlg.h> #include <gui/SalomeApp_CheckFileDlg.h>
#include <LightApp_DataOwner.h> #include <gui/LightApp_DataOwner.h>
#include <LightApp_Preferences.h> #include <gui/LightApp_Preferences.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <LightApp_UpdateFlags.h> #include <gui/LightApp_UpdateFlags.h>
#include <LightApp_NameDlg.h> #include <gui/LightApp_NameDlg.h>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
#include <SVTK_ViewModel.h> #include <gui/SVTK_ViewModel.h>
#include <SVTK_ViewManager.h> #include <gui/SVTK_ViewManager.h>
#include <VTKViewer_Algorithm.h> #include <gui/VTKViewer_Algorithm.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SUIT_FileDlg.h> #include <gui/SUIT_FileDlg.h>
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_OverrideCursor.h> #include <gui/SUIT_OverrideCursor.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <QtxPopupMgr.h> #include <gui/QtxPopupMgr.h>
#include <QtxFontEdit.h> #include <gui/QtxFontEdit.h>
#include <SALOME_ListIO.hxx> #include <gui/SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx> #include <gui/SALOME_ListIteratorOfListIO.hxx>
// IDL includes // IDL includes
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
@ -134,11 +134,11 @@
#include <vtkPlane.h> #include <vtkPlane.h>
// SALOME KERNEL includes // SALOME KERNEL includes
#include <SALOMEDS_Study.hxx> #include <kernel/SALOMEDS_Study.hxx>
#include <SALOMEDSClient_StudyBuilder.hxx> #include <kernel/SALOMEDSClient_StudyBuilder.hxx>
#include <SALOMEDSClient_SComponent.hxx> #include <kernel/SALOMEDSClient_SComponent.hxx>
#include <SALOMEDSClient_ClientFactory.hxx> #include <kernel/SALOMEDSClient_ClientFactory.hxx>
#include <SALOMEDSClient_IParameters.hxx> #include <kernel/SALOMEDSClient_IParameters.hxx>
// OCCT includes // OCCT includes
#include <Standard_ErrorHandler.hxx> #include <Standard_ErrorHandler.hxx>

4
src/SMESHGUI/SMESHGUI.h
View File

@ -30,8 +30,8 @@
#include "SMESH_SMESHGUI.hxx" #include "SMESH_SMESHGUI.hxx"
// SALOME GUI includes // SALOME GUI includes
#include <SalomeApp_Module.h> #include <gui/SalomeApp_Module.h>
#include <SALOME_InteractiveObject.hxx> #include <gui/SALOME_InteractiveObject.hxx>
// IDL includes // IDL includes
#include <SALOMEconfig.h> #include <SALOMEconfig.h>

20
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
View File

@ -39,16 +39,16 @@
#include <SMDS_Mesh.hxx> #include <SMDS_Mesh.hxx>
// SALOME GUI inclues // SALOME GUI inclues
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_ViewManager.h> #include <gui/SUIT_ViewManager.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SALOME_ListIO.hxx> #include <gui/SALOME_ListIO.hxx>
#include <SalomeApp_Application.h> #include <gui/SalomeApp_Application.h>
#include <SVTK_ViewModel.h> #include <gui/SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
// IDL incldues // IDL incldues
#include CORBA_SERVER_HEADER(SMESH_MeshEditor) #include CORBA_SERVER_HEADER(SMESH_MeshEditor)

2
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
View File

@ -29,7 +29,7 @@
// SMESH includes // SMESH includes
#include "SMESH_SMESHGUI.hxx" #include "SMESH_SMESHGUI.hxx"
#include <SMDSAbs_ElementType.hxx> #include "SMDSAbs_ElementType.hxx"
// Qt includes // Qt includes
#include <QDialog> #include <QDialog>

20
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
View File

@ -39,20 +39,20 @@
#include <SMDS_Mesh.hxx> #include <SMDS_Mesh.hxx>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SUIT_ViewManager.h> #include <gui/SUIT_ViewManager.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SVTK_ViewModel.h> #include <gui/SVTK_ViewModel.h>
#include <SVTK_ViewWindow.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 // IDL includes
#include <SALOMEconfig.h> #include <SALOMEconfig.h>

18
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
View File

@ -34,16 +34,16 @@
#include <SMESH_TypeFilter.hxx> #include <SMESH_TypeFilter.hxx>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SalomeApp_Study.h> #include <gui/SalomeApp_Study.h>
#include <SUIT_OverrideCursor.h> #include <gui/SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <gui/LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SALOME_ListIO.hxx> #include <gui/SALOME_ListIO.hxx>
// Qt includes // Qt includes
#include <QApplication> #include <QApplication>

18
src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
View File

@ -35,18 +35,18 @@
#include <SMESH_ActorUtils.h> #include <SMESH_ActorUtils.h>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_OverrideCursor.h> #include <gui/SUIT_OverrideCursor.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SALOME_ListIO.hxx> #include <gui/SALOME_ListIO.hxx>
#include <LightApp_Application.h> #include <gui/LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
// Qt includes // Qt includes
#include <QLabel> #include <QLabel>

2
src/SMESHGUI/SMESHGUI_ClippingDlg.h
View File

@ -30,7 +30,7 @@
#include "SMESH_SMESHGUI.hxx" #include "SMESH_SMESHGUI.hxx"
// SALOME includes // SALOME includes
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
// Qt includes // Qt includes
#include <QDialog> #include <QDialog>

30
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -41,25 +41,25 @@
#include <SMDS_Mesh.hxx> #include <SMDS_Mesh.hxx>
// SALOME GEOM includes // SALOME GEOM includes
#include <GEOMBase.h> #include <geom/GEOMBase.h>
#include <GEOM_Actor.h> #include <geom/GEOM_Actor.h>
// SALOME GUI includes // SALOME GUI includes
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <LightApp_UpdateFlags.h> #include <gui/LightApp_UpdateFlags.h>
#include <SALOME_ListIO.hxx> #include <gui/SALOME_ListIO.hxx>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
#include <SVTK_ViewModel.h> #include <gui/SVTK_ViewModel.h>
#include <SalomeApp_Application.h> #include <gui/SalomeApp_Application.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SUIT_OverrideCursor.h> #include <gui/SUIT_OverrideCursor.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <QtxComboBox.h> #include <gui/QtxComboBox.h>
// SALOME KERNEL includes // SALOME KERNEL includes
#include <SALOMEDS_SObject.hxx> #include <kernel/SALOMEDS_SObject.hxx>
#include <SALOMEDSClient_SObject.hxx> #include <kernel/SALOMEDSClient_SObject.hxx>
// OCCT includes // OCCT includes
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>

2
src/SMESHGUI/SMESHGUI_ComputeDlg.h
View File

@ -32,7 +32,7 @@
#include "SMESHGUI_Operation.h" #include "SMESHGUI_Operation.h"
// SALOME GUI includes // SALOME GUI includes
#include <SALOME_InteractiveObject.hxx> #include <gui/SALOME_InteractiveObject.hxx>
// Qt includes // Qt includes
#include <QMap> #include <QMap>

8
src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
View File

@ -32,10 +32,10 @@
#include <SMESH_TypeFilter.hxx> #include <SMESH_TypeFilter.hxx>
// SALOME GUI includes // SALOME GUI includes
#include <LightApp_UpdateFlags.h> #include <gui/LightApp_UpdateFlags.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_OverrideCursor.h> #include <gui/SUIT_OverrideCursor.h>
#include <SalomeApp_Tools.h> #include <gui/SalomeApp_Tools.h>
// IDL includes // IDL includes
#include <SALOMEconfig.h> #include <SALOMEconfig.h>

24
src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
View File

@ -35,22 +35,22 @@
#include <SMESH_NumberFilter.hxx> #include <SMESH_NumberFilter.hxx>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_FileDlg.h> #include <gui/SUIT_FileDlg.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <LightApp_Application.h> #include <gui/LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SalomeApp_Tools.h> #include <gui/SalomeApp_Tools.h>
#include <SALOME_ListIO.hxx> #include <gui/SALOME_ListIO.hxx>
#include <SVTK_ViewModel.h> #include <gui/SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
// SALOME KERNEL includes // SALOME KERNEL includes
#include <SALOMEDS_SObject.hxx> #include <kernel/SALOMEDS_SObject.hxx>
// OCCT includes // OCCT includes
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>

18
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
View File

@ -38,17 +38,17 @@
#include <SMDS_Mesh.hxx> #include <SMDS_Mesh.hxx>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_ViewManager.h> #include <gui/SUIT_ViewManager.h>
#include <SUIT_OverrideCursor.h> #include <gui/SUIT_OverrideCursor.h>
#include <SalomeApp_Application.h> #include <gui/SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
// OCCT includes // OCCT includes
#include <TColStd_ListOfInteger.hxx> #include <TColStd_ListOfInteger.hxx>

22
src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
View File

@ -32,20 +32,20 @@
#include <SMESH_TypeFilter.hxx> #include <SMESH_TypeFilter.hxx>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SalomeApp_Study.h> #include <gui/SalomeApp_Study.h>
#include <LightApp_Application.h> #include <gui/LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SALOME_ListIO.hxx> #include <gui/SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx> #include <gui/SALOME_ListIteratorOfListIO.hxx>
#include <SVTK_Selection.h> #include <gui/SVTK_Selection.h>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
// Qt includes // Qt includes
#include <QHBoxLayout> #include <QHBoxLayout>

6
src/SMESHGUI/SMESHGUI_Dialog.cxx
View File

@ -29,9 +29,9 @@
#include <SMESH_Type.h> #include <SMESH_Type.h>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SalomeApp_Application.h> #include <gui/SalomeApp_Application.h>
// Qt includes // Qt includes
#include <QFrame> #include <QFrame>

2
src/SMESHGUI/SMESHGUI_Dialog.h
View File

@ -30,7 +30,7 @@
#include "SMESH_SMESHGUI.hxx" #include "SMESH_SMESHGUI.hxx"
// SALOME GUI includes // SALOME GUI includes
#include <LightApp_Dialog.h> #include <gui/LightApp_Dialog.h>
class SUIT_Desktop; class SUIT_Desktop;
class SUIT_ResourceMgr; class SUIT_ResourceMgr;

10
src/SMESHGUI/SMESHGUI_Displayer.cxx
View File

@ -29,11 +29,11 @@
#include "SMESHGUI_VTKUtils.h" #include "SMESHGUI_VTKUtils.h"
// SALOME GUI includes // SALOME GUI includes
#include <SalomeApp_Study.h> #include <gui/SalomeApp_Study.h>
#include <SalomeApp_Application.h> #include <gui/SalomeApp_Application.h>
#include <SUIT_ViewManager.h> #include <gui/SUIT_ViewManager.h>
#include <SVTK_ViewModel.h> #include <gui/SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
SMESHGUI_Displayer::SMESHGUI_Displayer( SalomeApp_Application* app ) SMESHGUI_Displayer::SMESHGUI_Displayer( SalomeApp_Application* app )
: LightApp_Displayer(), : LightApp_Displayer(),

2
src/SMESHGUI/SMESHGUI_Displayer.h
View File

@ -30,7 +30,7 @@
#include "SMESH_SMESHGUI.hxx" #include "SMESH_SMESHGUI.hxx"
// SALOME GUI includes // SALOME GUI includes
#include <LightApp_Displayer.h> #include <gui/LightApp_Displayer.h>
class SalomeApp_Application; class SalomeApp_Application;
class SalomeApp_Study; class SalomeApp_Study;

20
src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
View File

@ -38,18 +38,18 @@
#include <SMDS_Mesh.hxx> #include <SMDS_Mesh.hxx>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_OverrideCursor.h> #include <gui/SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <gui/LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SVTK_ViewModel.h> #include <gui/SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
#include <SALOME_ListIO.hxx> #include <gui/SALOME_ListIO.hxx>
// OCCT includes // OCCT includes
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>

18
src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
View File

@ -42,19 +42,19 @@
#include <SMDS_Mesh.hxx> #include <SMDS_Mesh.hxx>
// SALOME GEOM includes // SALOME GEOM includes
#include <GEOMBase.h> #include <geom/GEOMBase.h>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SUIT_OverrideCursor.h> #include <gui/SUIT_OverrideCursor.h>
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <LightApp_Application.h> #include <gui/LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
// OCCT includes // OCCT includes
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>

20
src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
View File

@ -41,19 +41,19 @@
#include <SMDS_Mesh.hxx> #include <SMDS_Mesh.hxx>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_OverrideCursor.h> #include <gui/SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <gui/LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SVTK_ViewModel.h> #include <gui/SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
#include <SalomeApp_IntSpinBox.h> #include <gui/SalomeApp_IntSpinBox.h>
// OCCT includes // OCCT includes
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>

2
src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
View File

@ -30,7 +30,7 @@
#include "SMESH_SMESHGUI.hxx" #include "SMESH_SMESHGUI.hxx"
// SALOME GUI includes // SALOME GUI includes
#include <SALOME_InteractiveObject.hxx> #include <gui/SALOME_InteractiveObject.hxx>
// Qt includes // Qt includes
#include <QDialog> #include <QDialog>

2
src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
View File

@ -25,7 +25,7 @@
// //
#include "SMESHGUI_FileInfoDlg.h" #include "SMESHGUI_FileInfoDlg.h"
#include <MED_Common.hxx> #include <med/MED_Common.hxx>
#include <QGridLayout> #include <QGridLayout>
#include <QLabel> #include <QLabel>

2
src/SMESHGUI/SMESHGUI_FileInfoDlg.h
View File

@ -26,7 +26,7 @@
#ifndef SMESHGUI_FILEINFODLG_H #ifndef SMESHGUI_FILEINFODLG_H
#define SMESHGUI_FILEINFODLG_H #define SMESHGUI_FILEINFODLG_H
#include <QtxDialog.h> #include <gui/QtxDialog.h>
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(MED) #include CORBA_CLIENT_HEADER(MED)

4
src/SMESHGUI/SMESHGUI_FileValidator.cxx
View File

@ -27,8 +27,8 @@
#include "SMESHGUI_FileValidator.h" #include "SMESHGUI_FileValidator.h"
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_Tools.h> #include <gui/SUIT_Tools.h>
// Qt includes // Qt includes
#include <QFileInfo> #include <QFileInfo>

2
src/SMESHGUI/SMESHGUI_FileValidator.h
View File

@ -30,7 +30,7 @@
#include "SMESH_SMESHGUI.hxx" #include "SMESH_SMESHGUI.hxx"
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_FileValidator.h> #include <gui/SUIT_FileValidator.h>
class SMESHGUI_EXPORT SMESHGUI_FileValidator : public SUIT_FileValidator class SMESHGUI_EXPORT SMESHGUI_FileValidator : public SUIT_FileValidator
{ {

2
src/SMESHGUI/SMESHGUI_Filter.h
View File

@ -30,7 +30,7 @@
#include "SMESH_SMESHGUI.hxx" #include "SMESH_SMESHGUI.hxx"
// SALOME GUI includes // SALOME GUI includes
#include <VTKViewer_Filter.h> #include <gui/VTKViewer_Filter.h>
// IDL includes // IDL includes
#include <SALOMEconfig.h> #include <SALOMEconfig.h>

34
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -38,30 +38,30 @@
#include <SMESH_TypeFilter.hxx> #include <SMESH_TypeFilter.hxx>
// SALOME GEOM includes // SALOME GEOM includes
#include <GEOMBase.h> #include <geom/GEOMBase.h>
#include <GEOM_FaceFilter.h> #include <geom/GEOM_FaceFilter.h>
#include <GEOM_TypeFilter.h> #include <geom/GEOM_TypeFilter.h>
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <QtxColorButton.h> #include <gui/QtxColorButton.h>
#include <LightApp_Application.h> #include <gui/LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <gui/LightApp_SelectionMgr.h>
#include <SalomeApp_Tools.h> #include <gui/SalomeApp_Tools.h>
#include <SalomeApp_Study.h> #include <gui/SalomeApp_Study.h>
#include <SALOME_ListIO.hxx> #include <gui/SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx> #include <gui/SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx> #include <gui/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx>
#include <SVTK_ViewWindow.h> #include <gui/SVTK_ViewWindow.h>
// SALOME KERNEL includes // SALOME KERNEL includes
#include <SALOMEDSClient_Study.hxx> #include <kernel/SALOMEDSClient_Study.hxx>
// OCCT includes // OCCT includes
#include <StdSelect_TypeOfFace.hxx> #include <StdSelect_TypeOfFace.hxx>

4
src/SMESHGUI/SMESHGUI_FilterDlg.h
View File

@ -36,8 +36,8 @@
#include <QList> #include <QList>
// SALOME GUI includes // SALOME GUI includes
#include <SALOME_DataMapOfIOMapOfInteger.hxx> #include <gui/SALOME_DataMapOfIOMapOfInteger.hxx>
#include <SVTK_Selection.h> #include <gui/SVTK_Selection.h>
// IDL includes // IDL includes
#include <SALOMEconfig.h> #include <SALOMEconfig.h>

12
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
View File

@ -31,13 +31,13 @@
#include "SMESHGUI_FilterDlg.h" #include "SMESHGUI_FilterDlg.h"
// SALOME GUI includes // SALOME GUI includes
#include <SUIT_Session.h> #include <gui/SUIT_Session.h>
#include <SUIT_Desktop.h> #include <gui/SUIT_Desktop.h>
#include <SUIT_FileDlg.h> #include <gui/SUIT_FileDlg.h>
#include <SUIT_MessageBox.h> #include <gui/SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h> #include <gui/SUIT_ResourceMgr.h>
#include <LightApp_Application.h> #include <gui/LightApp_Application.h>
// Qt includes // Qt includes
#include <QApplication> #include <QApplication>

Some files were not shown because too many files have changed in this diff Show More