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

diff --git a/adm_local/unix/config_files/check_VISU.m4 b/adm_local/unix/config_files/check_VISU.m4
index 1fde1814ea2f4873d2384fef60dd371f926eee00..1bce9cf47809199ec3c2bc94f9ee1117faf0035e 100755 (executable)
--- a/adm_local/unix/config_files/check_VISU.m4
+++ b/adm_local/unix/config_files/check_VISU.m4
@@ -58,7 +58,7 @@ if test -f ${VISU_DIR}/idl/salome/VISU_Gen.idl ; then
    AC_SUBST(VISU_ROOT_DIR)
 
    VISU_LDFLAGS=-L${VISU_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-   VISU_CXXFLAGS=-I${VISU_DIR}/include/salome
+   VISU_CXXFLAGS="-I${VISU_DIR}/include/salome -I${VISU_DIR}/include/salome/skel"
 
    AC_SUBST(VISU_LDFLAGS)
    AC_SUBST(VISU_CXXFLAGS)

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 958becf8564566d11855aa565cddef256ebfbc82..c169b4e22b9719b02146ed6d8916e53552387a6a 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
 purebindir         = $(prefix)/bin

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 28f4db672cdd9924b55e7da4da12a0a7aefd379b..0a31071a4dc15df6339f786ae0b5a5e555fbe424 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -38,7 +38,7 @@ lib_LTLIBRARIES = libSalomeIDLVISU.la
 nodist_libSalomeIDLVISU_la_SOURCES = VISU_GenSK.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)
 
 libSalomeIDLVISU_la_CPPFLAGS =                 \
        -I$(top_builddir)/idl                   \

diff --git a/src/CONVERTOR/VISUConvertor.cxx b/src/CONVERTOR/VISUConvertor.cxx
index 6e6170d9793db28e1a1220d96425588ae89b4f9f..3ee6ba436b0726af45c197e5bb7d202ed84ef811 100644 (file)
--- a/src/CONVERTOR/VISUConvertor.cxx
+++ b/src/CONVERTOR/VISUConvertor.cxx
@@ -42,7 +42,7 @@
 #include <QStringList>
 
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/CONVERTOR/VISU_ConvertorDef.hxx b/src/CONVERTOR/VISU_ConvertorDef.hxx
index 9e9099d358d8ab90b6ca2b3f1a9c65f9ea8d7dc9..c494f50cee0f89569a6d9d69a9159ffb24c1b4ed 100644 (file)
--- a/src/CONVERTOR/VISU_ConvertorDef.hxx
+++ b/src/CONVERTOR/VISU_ConvertorDef.hxx
@@ -32,7 +32,7 @@
   \brief The file contains predeclarations for basic classes of the VISU CONVERTER package
 */
 
-#include "MED_SharedPtr.hxx"
+#include <med/MED_SharedPtr.hxx>
 
 namespace VISU
 {

diff --git a/src/CONVERTOR/VISU_ConvertorUtils.hxx b/src/CONVERTOR/VISU_ConvertorUtils.hxx
index 2d51c376486a44c3fb70dbfd029c3b887d224cd3..5f5f7db7da0d5cf8e660377e9b8ea3778447a3ea 100644 (file)
--- a/src/CONVERTOR/VISU_ConvertorUtils.hxx
+++ b/src/CONVERTOR/VISU_ConvertorUtils.hxx
@@ -31,9 +31,9 @@
 
 #include "VISU_ConvertorDef.hxx"
 #include "VISU_IDMapper.hxx"
-#include "MED_Utilities.hxx"
+#include <med/MED_Utilities.hxx>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 #include <vtkSystemIncludes.h>
 
 #include <string>

diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx
index f3c03075f9d39c2eac6aa095b8c5a450fa156307..292805c63864943933a8eb7d8e63e83f1025cd2a 100644 (file)
--- a/src/CONVERTOR/VISU_Convertor_impl.cxx
+++ b/src/CONVERTOR/VISU_Convertor_impl.cxx
@@ -31,7 +31,7 @@
 
 #include "VISU_AppendFilter.hxx"
 #include "VISU_AppendPolyData.hxx"
-#include "VTKViewer_CellLocationsArray.h"
+#include <gui/VTKViewer_CellLocationsArray.h>
 #include "VISU_CommonCellsFilter.hxx"
 
 #include "VISU_ConvertorUtils.hxx"

diff --git a/src/CONVERTOR/VISU_IDMapper.hxx b/src/CONVERTOR/VISU_IDMapper.hxx
index 5a9fec79fead17514cd6ce72a5bd6623e6669431..00705ba073e97d94ec5f6b4778d2f7d540dc2bce 100644 (file)
--- a/src/CONVERTOR/VISU_IDMapper.hxx
+++ b/src/CONVERTOR/VISU_IDMapper.hxx
@@ -34,9 +34,9 @@
 
 #include "VISUConvertor.hxx"
 
-#include "MED_SharedPtr.hxx"
-#include "MED_Vector.hxx"
-#include "VTKViewer.h"
+#include <med/MED_SharedPtr.hxx>
+#include <med/MED_Vector.hxx>
+#include <gui/VTKViewer.h>
 
 #include <string>
 #include <map>

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 457fde69d2a28dbe5a76b76fc6f9f28778b81b08..f1410c56911db73811714fd31f2f02c2ba601c09 100644 (file)
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -27,10 +27,10 @@
 #include "VISU_MedConvertor.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
-#include "MED_Factory.hxx"
-#include "MED_Algorithm.hxx"
-#include "MED_GaussUtils.hxx"
-#include "MED_Utilities.hxx"
+#include <med/MED_Factory.hxx>
+#include <med/MED_Algorithm.hxx>
+#include <med/MED_GaussUtils.hxx>
+#include <med/MED_Utilities.hxx>
 
 #include "SALOMEconfig.h"
 

diff --git a/src/CONVERTOR/VISU_MedConvertor.hxx b/src/CONVERTOR/VISU_MedConvertor.hxx
index 216e8a15044b0a63c6dfd53073bb1cdf32fb49b0..c2dee74bab315425a33f7740333b45a85966a5ef 100644 (file)
--- a/src/CONVERTOR/VISU_MedConvertor.hxx
+++ b/src/CONVERTOR/VISU_MedConvertor.hxx
@@ -32,10 +32,10 @@
 #include "VISU_PointCoords.hxx"
 #include "VISU_MeshValue.hxx"
 
-#include "MED_Wrapper.hxx"
-#include "MED_Common.hxx"
-#include "MED_Structures.hxx"
-#include "MED_GaussUtils.hxx"
+#include <med/MED_Wrapper.hxx>
+#include <med/MED_Common.hxx>
+#include <med/MED_Structures.hxx>
+#include <med/MED_GaussUtils.hxx>
 
 #include <boost/thread/mutex.hpp>
 

diff --git a/src/CONVERTOR/VISU_MeshValue.hxx b/src/CONVERTOR/VISU_MeshValue.hxx
index e29f2922a3848a3041be619c3c8e8bbf3ce28fe6..e78e36db8794c8fdae086c46f59f598561fb42ab 100644 (file)
--- a/src/CONVERTOR/VISU_MeshValue.hxx
+++ b/src/CONVERTOR/VISU_MeshValue.hxx
@@ -35,8 +35,8 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_ConvertorDef_impl.hxx"
 
-#include "MED_SliceArray.hxx"
-#include "MED_Vector.hxx"
+#include <med/MED_SliceArray.hxx>
+#include <med/MED_Vector.hxx>
 
 namespace VISU
 {

diff --git a/src/CONVERTOR/VISU_PointCoords.hxx b/src/CONVERTOR/VISU_PointCoords.hxx
index b1fcd87b711d358ab18451eb96ebe6a427cfe033..1f4a1ce39bf828006c78c610dc0529697f5006b5 100644 (file)
--- a/src/CONVERTOR/VISU_PointCoords.hxx
+++ b/src/CONVERTOR/VISU_PointCoords.hxx
@@ -36,8 +36,8 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_ConvertorDef_impl.hxx"
 
-#include "MED_SliceArray.hxx"
-#include "MED_Structures.hxx"
+#include <med/MED_SliceArray.hxx>
+#include <med/MED_Structures.hxx>
 
 #include <vtkSmartPointer.h>
 

diff --git a/src/CONVERTOR/VISU_Structures.hxx b/src/CONVERTOR/VISU_Structures.hxx
index 70f620fb19280a1e9e5931a99d3bae631201de04..993ad66e2ee14be3b0ad381b632c64bede73c2ce 100644 (file)
--- a/src/CONVERTOR/VISU_Structures.hxx
+++ b/src/CONVERTOR/VISU_Structures.hxx
@@ -35,7 +35,7 @@
 #include "VISU_IDMapper.hxx"
 #include "VISU_ConvertorDef.hxx"
 
-#include "MED_Vector.hxx"
+#include <med/MED_Vector.hxx>
 
 #include <map>
 #include <set>

diff --git a/src/CONVERTOR/VISU_TableReader.cxx b/src/CONVERTOR/VISU_TableReader.cxx
index cb431dab5177bb53ca87649bf1772aa896ef6b67..60e7b474ef09719de68d1cdcfb8c70bdec742e93 100644 (file)
--- a/src/CONVERTOR/VISU_TableReader.cxx
+++ b/src/CONVERTOR/VISU_TableReader.cxx
@@ -45,7 +45,7 @@
 #include <vtkStructuredGrid.h>
 #include <vtkStructuredGridGeometryFilter.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;

diff --git a/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx b/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
index b6e3a872369fc32bc92f8609eed5564289c9f8f2..ec7118c00511940228189489bf2144da06af1ec9 100644 (file)
--- a/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
@@ -55,7 +55,7 @@
 #include <vtkFloatArray.h>
 
 // MED Warpper includes
-#include "MED_Factory.hxx"
+#include <med/MED_Factory.hxx>
 
 // STL includes
 #include <string>

diff --git a/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx b/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx
index 506107074b65d05514f21dce415b1c25c123b2a3..2c6dfbc6ff751f25c2cfe8aae483bb62b539db34 100644 (file)
--- a/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx
+++ b/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx
@@ -28,7 +28,7 @@
 
 #include "VISUConvertor.hxx"
 
-#include <MED_Common.hxx>
+#include <med/MED_Common.hxx>
 #include <vtkIntArray.h>
 #include <vtkDataSet.h>
 

diff --git a/src/ENGINE/VISU_Engine_i.cc b/src/ENGINE/VISU_Engine_i.cc
index 2d0f66ad2a4cdd5fe770b9e29db33fcb1af18c47..77c76de8a27e5bb1376fe36de309d945c2fca7db 100644 (file)
--- a/src/ENGINE/VISU_Engine_i.cc
+++ b/src/ENGINE/VISU_Engine_i.cc
@@ -20,12 +20,12 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #include "VISU_Engine_i.hh"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog)
 
-#include "SALOME_NamingService.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 using namespace std;
 

diff --git a/src/ENGINE/VISU_Engine_i.hh b/src/ENGINE/VISU_Engine_i.hh
index 950246d38a81944eebe208deb66e21973d8354f1..53723c3492b070a4c1ce505b32701962c1a2d85a 100644 (file)
--- a/src/ENGINE/VISU_Engine_i.hh
+++ b/src/ENGINE/VISU_Engine_i.hh
@@ -30,7 +30,7 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 
-#include "SALOME_Component_i.hxx"
+#include <kernel/SALOME_Component_i.hxx>
 
 namespace VISU
 {

diff --git a/src/GUITOOLS/VisuGUI_TableDlg.cxx b/src/GUITOOLS/VisuGUI_TableDlg.cxx
index b782a88121bf21fb5275103640a52d85ea6e273e..b320ed788c0bf964365f32020ee2cda18a7641d1 100644 (file)
--- a/src/GUITOOLS/VisuGUI_TableDlg.cxx
+++ b/src/GUITOOLS/VisuGUI_TableDlg.cxx
@@ -25,20 +25,20 @@
 //
 #include "VisuGUI_TableDlg.h"
 
-#include "SUIT_Tools.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
-#include "SALOMEDSClient_Study.hxx"
-#include "SALOMEDSClient_GenericAttribute.hxx"
-#include "SALOMEDSClient_AttributeTableOfInteger.hxx"
-#include "SALOMEDSClient_AttributeTableOfReal.hxx"
-#include "SALOMEDSClient_StudyBuilder.hxx"
+#include <kernel/SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_GenericAttribute.hxx>
+#include <kernel/SALOMEDSClient_AttributeTableOfInteger.hxx>
+#include <kernel/SALOMEDSClient_AttributeTableOfReal.hxx>
+#include <kernel/SALOMEDSClient_StudyBuilder.hxx>
 
 #include <QLayout>
 #include <QValidator>
@@ -53,7 +53,7 @@
 #include <QKeyEvent>
 #include <QHeaderView>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/GUITOOLS/VisuGUI_TableDlg.h b/src/GUITOOLS/VisuGUI_TableDlg.h
index 9f708ae703449de46c3a1df599c535bdc9974c33..89820cf39429da5547e5327db88004cad5614c78 100644 (file)
--- a/src/GUITOOLS/VisuGUI_TableDlg.h
+++ b/src/GUITOOLS/VisuGUI_TableDlg.h
@@ -34,7 +34,7 @@
 class QTableWidget;
 class VisuGUI_TableWidget;
 
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 #include "VisuGUITools.h"
 

diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index 20a5a8427e62168feacb26bde3c651d4808f1992..8302a152f7fe0b1389ba2277befbd6f6cb64e1a0 100644 (file)
--- a/src/OBJECT/VISU_Actor.cxx
+++ b/src/OBJECT/VISU_Actor.cxx
@@ -33,17 +33,17 @@
 
 #include "VISU_PipeLine.hxx"
 
-#include "SVTK_Actor.h"
-#include "SVTK_Event.h"
+#include <gui/SVTK_Actor.h>
+#include <gui/SVTK_Event.h>
 
-#include "VTKViewer_FramedTextActor.h"
-#include "VTKViewer_ShrinkFilter.h"
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_FramedTextActor.h>
+#include <gui/VTKViewer_ShrinkFilter.h>
+#include <gui/VTKViewer_GeometryFilter.h>
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <stdexcept>
 #include <sstream>
@@ -84,7 +84,7 @@
 
 #include <boost/bind.hpp>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "VISU_PipeLineUtils.hxx"
 

diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h
index 41152cfcf319fd49084f7e95e8455c8b08a7daeb..78b45663d22aa5d4202859fd3515110a34711230 100644 (file)
--- a/src/OBJECT/VISU_Actor.h
+++ b/src/OBJECT/VISU_Actor.h
@@ -29,10 +29,10 @@
 
 #include "VISU_OBJECT.h"
 
-#include "SALOME_Actor.h"
+#include <gui/SALOME_Actor.h>
 #include "VISU_ActorBase.h"
 #include "VISU_BoostSignals.h"
-#include "SVTK_DeviceActor.h"
+#include <gui/SVTK_DeviceActor.h>
 
 #include <string>
 #include <vtkTimeStamp.h>

diff --git a/src/OBJECT/VISU_ActorBase.cxx b/src/OBJECT/VISU_ActorBase.cxx
index 44dbbc6f74f30a34bd9c11714d81a18ff1b373b2..07bb20d60ed33934b57629705dab0cef51ad2fd8 100644 (file)
--- a/src/OBJECT/VISU_ActorBase.cxx
+++ b/src/OBJECT/VISU_ActorBase.cxx
@@ -27,7 +27,7 @@
 //
 #include "VISU_ActorBase.h"
 #include "VISU_ActorFactory.h"
-#include "VTKViewer_ShrinkFilter.h"
+#include <gui/VTKViewer_ShrinkFilter.h>
 
 #include <vtkObjectFactory.h>
 #include <vtkProperty.h>
@@ -37,7 +37,7 @@
 #include <vtkShrinkPolyData.h>
 #include <vtkUnstructuredGrid.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <boost/bind.hpp>
 

diff --git a/src/OBJECT/VISU_ActorBase.h b/src/OBJECT/VISU_ActorBase.h
index 7a39f0a534c2d3bd1da34ddedb632b7d3d021162..dba175f14f7e6f5ff14b95c0af543869170200fc 100644 (file)
--- a/src/OBJECT/VISU_ActorBase.h
+++ b/src/OBJECT/VISU_ActorBase.h
@@ -29,7 +29,7 @@
 #define VISU_ACTOR_BASE_H
 
 #include "VISU_OBJECT.h"
-#include "SALOME_Actor.h"
+#include <gui/SALOME_Actor.h>
 #include "VISU_BoostSignals.h"
 #include <boost/bind.hpp>
 

diff --git a/src/OBJECT/VISU_Event.h b/src/OBJECT/VISU_Event.h
index 4b50add95225ab1468c87d3aea50dc4da71f9dbf..182b9784550ce3e837d9b9798381ed46228b81c6 100644 (file)
--- a/src/OBJECT/VISU_Event.h
+++ b/src/OBJECT/VISU_Event.h
@@ -28,8 +28,8 @@
 #ifndef VISU_Event_h
 #define VISU_Event_h
 
-#include "SVTK_Event.h"
-#include "SVTK_Selection.h"
+#include <gui/SVTK_Event.h>
+#include <gui/SVTK_Selection.h>
 
 namespace VISU
 {

diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index 1071352ae6e480900e5a9d99d259e0a371bb6491..6d3c502e4a00244d14c7c83eba8f8c23bc75c9a6 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -37,8 +37,8 @@
 #include "VISU_ScalarBarActor.hxx"
 
 #include "VISU_Event.h" 
-#include "SVTK_Actor.h"
-#include "VTKViewer_FramedTextActor.h"
+#include <gui/SVTK_Actor.h>
+#include <gui/VTKViewer_FramedTextActor.h>
 #include <SALOME_ExtractPolyDataGeometry.h>
 
 #include <vtkCamera.h>
@@ -82,7 +82,7 @@
 
 #include <vtkViewport.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;

diff --git a/src/OBJECT/VISU_GaussPtsDeviceActor.cxx b/src/OBJECT/VISU_GaussPtsDeviceActor.cxx
index 72faaef41480c10d0d518c0543ece404e61a541c..60e558c1fd48d103ea66ab5e317fdd2a63f323f0 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsDeviceActor.cxx
+++ b/src/OBJECT/VISU_GaussPtsDeviceActor.cxx
@@ -30,8 +30,8 @@
 #include "VISU_GaussPointsPL.hxx"
 #include "VISU_OpenGLPointSpriteMapper.hxx"
 
-#include "VTKViewer_Transform.h"
-#include "VTKViewer_TransformFilter.h"
+#include <gui/VTKViewer_Transform.h>
+#include <gui/VTKViewer_TransformFilter.h>
 #include <SALOME_ExtractPolyDataGeometry.h>
 
 #include <vtkObjectFactory.h>
@@ -45,7 +45,7 @@
 
 #include <QFileInfo>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "VISU_PipeLineUtils.hxx"
 
 #ifdef _DEBUG_

diff --git a/src/OBJECT/VISU_GaussPtsDeviceActor.h b/src/OBJECT/VISU_GaussPtsDeviceActor.h
index 6a9b650125e6efd9b664183be6984be80e871160..b092d31044eb17d0b9da7564c91b23f49ad4c54f 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsDeviceActor.h
+++ b/src/OBJECT/VISU_GaussPtsDeviceActor.h
@@ -30,7 +30,7 @@
 
 #include "VISU_OBJECT.h"
 #include "VISU_Actor.h"
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_GeometryFilter.h>
 
 #include <vtkLODActor.h>
 #include <vtkSmartPointer.h>

diff --git a/src/OBJECT/VISU_GaussPtsSettings.cxx b/src/OBJECT/VISU_GaussPtsSettings.cxx
index bb9dd393956aadc23b1b0154fbd5d96e05d359ed..35d3ae69404ba3b2b8fc69f34c661bfbd6baedbd 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsSettings.cxx
+++ b/src/OBJECT/VISU_GaussPtsSettings.cxx
@@ -26,11 +26,11 @@
 //  $Header$
 //
 #include "VISU_GaussPtsSettings.h"
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
 #include <vtkObjectFactory.h>
 #include <vtkImageData.h>

diff --git a/src/OBJECT/VISU_GaussPtsSettings.h b/src/OBJECT/VISU_GaussPtsSettings.h
index 627d8980eb7c61c417049dbcb5ad89ac0cfd588d..686a78f14697b63012698645f2edd8a92b7f4653 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsSettings.h
+++ b/src/OBJECT/VISU_GaussPtsSettings.h
@@ -33,7 +33,7 @@
 #include <vtkObject.h>
 #include <vtkCommand.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class vtkImageData;
 

diff --git a/src/OBJECT/VISU_MeshAct.cxx b/src/OBJECT/VISU_MeshAct.cxx
index 13e81879493bac50d3210f29503c5989114bc876..03f32974711eca15e7c165009ca38f5819ab06e2 100644 (file)
--- a/src/OBJECT/VISU_MeshAct.cxx
+++ b/src/OBJECT/VISU_MeshAct.cxx
@@ -27,8 +27,8 @@
 //
 #include "VISU_MeshAct.h"
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
 #include <vtkObjectFactory.h>
 #include <vtkRenderer.h>

diff --git a/src/OBJECT/VISU_MeshAct.h b/src/OBJECT/VISU_MeshAct.h
index 1c041bde8cdafbfbad0db7f7305022f255425ff5..0a044fca05baafe6798ee42786c3d490867126b7 100644 (file)
--- a/src/OBJECT/VISU_MeshAct.h
+++ b/src/OBJECT/VISU_MeshAct.h
@@ -30,7 +30,7 @@
 
 #include "VISU_OBJECT.h"
 #include "VISU_DataSetActor.h"
-#include "SVTK_DeviceActor.h"
+#include <gui/SVTK_DeviceActor.h>
 
 
 class VISU_OBJECT_EXPORT VISU_MeshAct : public VISU_DataSetActor 

diff --git a/src/OBJECT/VISU_PickingSettings.cxx b/src/OBJECT/VISU_PickingSettings.cxx
index 9cbdeaed10f9027bee62362b77bf918acfcfbb6e..7690299d9568b87c7b6e9eda0bd51d88ff336a72 100644 (file)
--- a/src/OBJECT/VISU_PickingSettings.cxx
+++ b/src/OBJECT/VISU_PickingSettings.cxx
@@ -26,8 +26,8 @@
 //
 #include "VISU_PickingSettings.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
 #include <vtkObjectFactory.h>
 

diff --git a/src/OBJECT/VISU_PickingSettings.h b/src/OBJECT/VISU_PickingSettings.h
index e5b894d13824ebd9470a79a717323d265ae319da..b7116a6e0b0ba248279dacdee48416156c65a6fb 100644 (file)
--- a/src/OBJECT/VISU_PickingSettings.h
+++ b/src/OBJECT/VISU_PickingSettings.h
@@ -31,7 +31,7 @@
 #include <vtkObject.h>
 #include <vtkCommand.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 #include "VISU_Actor.h"
 

diff --git a/src/OBJECT/VISU_PointMap3dActor.cxx b/src/OBJECT/VISU_PointMap3dActor.cxx
index d92b698ab51d73dcfb5e8883ea040ce1f175feab..c3803c761387a5944bb831fc08a8bbb2209b2f69 100644 (file)
--- a/src/OBJECT/VISU_PointMap3dActor.cxx
+++ b/src/OBJECT/VISU_PointMap3dActor.cxx
@@ -30,9 +30,9 @@
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_DeformedGridPL.hxx"
 
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include <vtkRenderer.h>
 #include <vtkObjectFactory.h>
 

diff --git a/src/OBJECT/VISU_PointMap3dActor.h b/src/OBJECT/VISU_PointMap3dActor.h
index cf0ab13cb7b1480f3327e5aa28652c7c1120b409..7fb32c2010437f1c3daa2abdc046885613a6a93e 100644 (file)
--- a/src/OBJECT/VISU_PointMap3dActor.h
+++ b/src/OBJECT/VISU_PointMap3dActor.h
@@ -29,7 +29,7 @@
 #define VISU_PointMap3dActor_HeaderFile
 
 #include "VISU_OBJECT.h"
-#include "SALOME_Actor.h"
+#include <gui/SALOME_Actor.h>
 #include "VISU_DataSetActor.h"
 #include "VISU_BoostSignals.h"
 

diff --git a/src/OBJECT/VISU_ScalarMapAct.cxx b/src/OBJECT/VISU_ScalarMapAct.cxx
index 7daf7259a8754418dff4932831d2aaf9bd90948b..82fb0d9e860a120382b4c5b07c8a2d14723e202c 100644 (file)
--- a/src/OBJECT/VISU_ScalarMapAct.cxx
+++ b/src/OBJECT/VISU_ScalarMapAct.cxx
@@ -36,8 +36,8 @@
 #include "VISU_PipeLineUtils.hxx"
 
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
 #include <SALOME_ExtractGeometry.h>
 #include <SALOME_ExtractPolyDataGeometry.h>

diff --git a/src/OBJECT/VISU_VectorsAct.cxx b/src/OBJECT/VISU_VectorsAct.cxx
index 0742a57a90efa6ca4c5f8e8c8e4550ee6a62418c..b978051e07c2394450e71559c0738baf29126ed4 100644 (file)
--- a/src/OBJECT/VISU_VectorsAct.cxx
+++ b/src/OBJECT/VISU_VectorsAct.cxx
@@ -26,7 +26,7 @@
 
 #include "VISU_VectorsAct.h"
 #include "VISU_VectorsPL.hxx"
-#include <SVTK_Actor.h>
+#include <gui/SVTK_Actor.h>
  
 // VTK Includes
 #include <vtkObjectFactory.h>

diff --git a/src/PIPELINE/VISUPipeLine.cxx b/src/PIPELINE/VISUPipeLine.cxx
index b789ff69d47cf8f961f5342795e6b14ccf8c4a39..873dd518e9b5887c7106a792719ed17874fb4370 100644 (file)
--- a/src/PIPELINE/VISUPipeLine.cxx
+++ b/src/PIPELINE/VISUPipeLine.cxx
@@ -43,7 +43,7 @@
 
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_OpenGLPointSpriteMapper.hxx"
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_GeometryFilter.h>
 
 #include "VISU_ElnoDisassembleFilter.hxx"
 #include "VISU_ElnoAssembleFilter.hxx"
@@ -107,7 +107,7 @@ typedef VISU_CutLinesPL TPresent;
 */
 //RKV:End
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 static int isOnlyMesh = false;
 

diff --git a/src/PIPELINE/VISU_CutLinesPL.cxx b/src/PIPELINE/VISU_CutLinesPL.cxx
index 3182a43e107a3e89f9c03d492f84ebad5340a4c6..e04456a16a9f0c57dec59b8c6532d3560e91b230 100644 (file)
--- a/src/PIPELINE/VISU_CutLinesPL.cxx
+++ b/src/PIPELINE/VISU_CutLinesPL.cxx
@@ -26,7 +26,7 @@
 #include "VISU_CutLinesPL.hxx"
 #include "VISU_FieldTransform.hxx"
 #include "VISU_PipeLineUtils.hxx"
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_GeometryFilter.h>
 
 #include <vtkAppendPolyData.h>
 

diff --git a/src/PIPELINE/VISU_CutPlanesPL.cxx b/src/PIPELINE/VISU_CutPlanesPL.cxx
index 247f894302b0f541f6ff44f8608719b68834d69c..7bb6ecd80969b42f06927897fd7af13d10d9d735 100644 (file)
--- a/src/PIPELINE/VISU_CutPlanesPL.cxx
+++ b/src/PIPELINE/VISU_CutPlanesPL.cxx
@@ -27,7 +27,7 @@
 #include "VISU_CutPlanesPL.hxx"
 #include "VISU_FieldTransform.hxx"
 #include "VISU_PipeLineUtils.hxx"
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_GeometryFilter.h>
 #include "VISU_MapperHolder.hxx"
 #include "VISU_DeformationPL.hxx"
 

diff --git a/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx
index 30b2ce064395f91df01781aeccfe732b09b70dc9..0bc5377ee5d387087c7a46307d268a6a66182aae 100644 (file)
--- a/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx
+++ b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx
@@ -29,8 +29,8 @@
 #include "VISU_Extractor.hxx"
 #include "VISU_LookupTable.hxx"
 #include "VISU_DeformedShapePL.hxx"
-#include "VTKViewer_TransformFilter.h"
-#include "VTKViewer_Transform.h"
+#include <gui/VTKViewer_TransformFilter.h>
+#include <gui/VTKViewer_Transform.h>
 #include "VISU_MergeFilter.hxx"
 #include "VISU_ElnoDisassembleFilter.hxx"
 #include "VISU_PipeLineUtils.hxx"

diff --git a/src/PIPELINE/VISU_DeformedShapePL.cxx b/src/PIPELINE/VISU_DeformedShapePL.cxx
index b3c93c87467bdae7534b9e5246205bad8636d0eb..3372ba2d41fd1de176b5a1bf1dd20cc4ceef923f 100644 (file)
--- a/src/PIPELINE/VISU_DeformedShapePL.cxx
+++ b/src/PIPELINE/VISU_DeformedShapePL.cxx
@@ -26,7 +26,7 @@
 //
 #include "VISU_DeformedShapePL.hxx"
 #include "VISU_PipeLineUtils.hxx"
-#include "VTKViewer_Transform.h"
+#include <gui/VTKViewer_Transform.h>
 
 #include <vtkWarpVector.h>
 

diff --git a/src/PIPELINE/VISU_Extractor.cxx b/src/PIPELINE/VISU_Extractor.cxx
index 52831311df4204ac3eaeaab31a830990be8e73bc..7c86179a57f85af4b38df5900fb158c0f87fddc9 100644 (file)
--- a/src/PIPELINE/VISU_Extractor.cxx
+++ b/src/PIPELINE/VISU_Extractor.cxx
@@ -28,8 +28,8 @@
 #include "VISU_ConvertorUtils.hxx"
 #include "VISU_MeshValue.hxx"
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <sstream>
 

diff --git a/src/PIPELINE/VISU_FieldTransform.cxx b/src/PIPELINE/VISU_FieldTransform.cxx
index 16a36d01084068c4df3ebee548056bcf338381d0..bde2903080444d75ebd56a2b41755c090bcae16d 100644 (file)
--- a/src/PIPELINE/VISU_FieldTransform.cxx
+++ b/src/PIPELINE/VISU_FieldTransform.cxx
@@ -23,7 +23,7 @@
 //  Module : VISU
 //
 #include "VISU_FieldTransform.hxx"
-#include "VTKViewer_Transform.h"
+#include <gui/VTKViewer_Transform.h>
 #include "VISU_PipeLineUtils.hxx"
 
 #include <vtkObjectFactory.h>

diff --git a/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx b/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
index 7adb1b8c0e9197bb299f1966af9592559cb02143..ce05e2557e975c0af91ac922d030c92cfb8890ea 100644 (file)
--- a/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
+++ b/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
@@ -32,7 +32,7 @@
 
 #include "VISUPipeline.hxx"
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class VISU_UnScaledActor: public vtkFollower
 {

diff --git a/src/PIPELINE/VISU_LookupTable.hxx b/src/PIPELINE/VISU_LookupTable.hxx
index 0026a7742e4e973d6062d35c4a9a739a2db4339b..af596eca2dfb4ed21f1de512846ad83cd4391e2c 100644 (file)
--- a/src/PIPELINE/VISU_LookupTable.hxx
+++ b/src/PIPELINE/VISU_LookupTable.hxx
@@ -30,7 +30,7 @@
 
 #include <vtkLookupTable.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class VISU_PIPELINE_EXPORT VISU_LookupTable: public vtkLookupTable 
 {

diff --git a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
index fbf5a895ff5e4d24ff8396e01797751bcc2923b5..c0e290d3d7903c69c27f3f591424982ca162e02a 100755 (executable)
--- a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
+++ b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
@@ -48,7 +48,7 @@
 #include <cmath>
 #include <string>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifndef WNT
 # ifndef GLX_GLXEXT_LEGACY

diff --git a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
index 94fa3b2311e831f6e890a9aaee400f334a2c46a6..ebb657e09c74d1d9143fa71215243ec27daab3d3 100755 (executable)
--- a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
+++ b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
@@ -40,7 +40,7 @@
 #include <vtkSmartPointer.h>
 #include <vtkConfigure.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class vtkCellArray;
 class vtkPoints;

diff --git a/src/PIPELINE/VISU_ScalarBarCtrl.hxx b/src/PIPELINE/VISU_ScalarBarCtrl.hxx
index a8f7bf3daf95d0a66bd1a66556db8147da1dfe44..06e497b756740b58a896f65eeac625eb730803d4 100644 (file)
--- a/src/PIPELINE/VISU_ScalarBarCtrl.hxx
+++ b/src/PIPELINE/VISU_ScalarBarCtrl.hxx
@@ -31,7 +31,7 @@
 
 #include <vtkObject.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class vtkRenderer;
 class VISU_LookupTable;

diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx
index 1a832266d90e4c9e278ef369c9bc6ac3582a0c02..214cc1d4839df829815d66b66e6693aa3b2a97b4 100644 (file)
--- a/src/PIPELINE/VISU_StreamLinesPL.cxx
+++ b/src/PIPELINE/VISU_StreamLinesPL.cxx
@@ -32,7 +32,7 @@
 #include "VISU_MaskPointsFilter.hxx"
 #include "VISU_PipeLineUtils.hxx"
 
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_GeometryFilter.h>
 
 #include <algorithm>
 

diff --git a/src/PIPELINE/VISU_VectorsPL.cxx b/src/PIPELINE/VISU_VectorsPL.cxx
index 4c0f2ebd023d7a2bf85c7ee2be35dbc15a733982..42b58ddb9a365c8b405785bb564aee959859c71b 100644 (file)
--- a/src/PIPELINE/VISU_VectorsPL.cxx
+++ b/src/PIPELINE/VISU_VectorsPL.cxx
@@ -28,8 +28,8 @@
 #include "VISU_FieldTransform.hxx"
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_UsedPointsFilter.hxx"
-#include "VTKViewer_TransformFilter.h"
-#include "VTKViewer_Transform.h"
+#include <gui/VTKViewer_TransformFilter.h>
+#include <gui/VTKViewer_Transform.h>
 
 #include <vtkGlyph3D.h>
 #include <vtkConeSource.h>

diff --git a/src/PIPELINE/VISU_WidgetCtrl.hxx b/src/PIPELINE/VISU_WidgetCtrl.hxx
index 7faa4c1f41034e74cf94a434ae2f56b27aabc537..a6aa28c56d2a782c379ebdbff514964141ed7a85 100644 (file)
--- a/src/PIPELINE/VISU_WidgetCtrl.hxx
+++ b/src/PIPELINE/VISU_WidgetCtrl.hxx
@@ -31,7 +31,7 @@
 #include "VISUPipeline.hxx"
 #include <vtkImplicitFunction.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class vtkImplicitFunction;
 class vtkObject;

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 792634a7eb6d84b1403a800190f480132609b0f0..e902b7671e301dbdcafe8565ac71f747d5cf2ce5 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -45,48 +45,48 @@
 #include <vtkTimerLog.h>
 
 // SALOME Includes
-#include "SALOME_LifeCycleCORBA.hxx"
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_MessageBox.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ViewManager.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_DataBrowser.h"
-#include "SUIT_OverrideCursor.h"
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_DataBrowser.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_ViewModel.h"
-#include "SVTK_Functor.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_Functor.h>
 //#include "SVTK_MainWindow.h"
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "SPlot2d_ViewModel.h"
+#include <gui/SPlot2d_ViewModel.h>
 #include "VisuGUI_SetupPlot2dDlg.h"
-#include "Plot2d_SetupCurveDlg.h"
-#include "Plot2d_ViewManager.h"
+#include <gui/Plot2d_SetupCurveDlg.h>
+#include <gui/Plot2d_ViewManager.h>
 
-#include "QtxPagePrefMgr.h"
-#include "OB_Browser.h"
+#include <gui/QtxPagePrefMgr.h>
+#include <gui/OB_Browser.h>
 
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include "SalomeApp_Application.h"
-#include "SalomeApp_DataModel.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_CheckFileDlg.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_DataModel.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_CheckFileDlg.h>
 
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_Selection.h"
-#include "LightApp_Preferences.h"
-#include "LightApp_DataOwner.h"
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Selection.h>
+#include <gui/LightApp_Preferences.h>
+#include <gui/LightApp_DataOwner.h>
 
-#include "QtxAction.h"
-#include "QtxFontEdit.h"
+#include <gui/QtxAction.h>
+#include <gui/QtxFontEdit.h>
 
 #include "VISUConfig.hh"
 #include "VISU_Gen_i.hh"
@@ -156,7 +156,7 @@
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(MED_Gen)
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "VisuGUI_ActionsDef.h"
 

diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h
index 90205718567e4edf2a3154268d8adfc49d256ac2..ccfce01d54d23ad6a41333f8bd32dfb2671be156 100644 (file)
--- a/src/VISUGUI/VisuGUI.h
+++ b/src/VISUGUI/VisuGUI.h
@@ -27,10 +27,10 @@
 #ifndef VisuGUI_HeaderFile
 #define VisuGUI_HeaderFile
 
-#include <SalomeApp_Module.h>
+#include <gui/SalomeApp_Module.h>
 
-#include <SVTK_ViewWindow.h>
-#include <VISU_Prs3d_i.hh>
+#include <gui/SVTK_ViewWindow.h>
+#include "VISU_Prs3d_i.hh"
 
 #include "VisuGUI_Panel.h"
 

diff --git a/src/VISUGUI/VisuGUI_BasePanel.cxx b/src/VISUGUI/VisuGUI_BasePanel.cxx
index 2db8ded09006a306621a1df1d57374915051ad5e..3d1d4c362c9056593e6ae4bcc2014aa5cc3815bc 100755 (executable)
--- a/src/VISUGUI/VisuGUI_BasePanel.cxx
+++ b/src/VISUGUI/VisuGUI_BasePanel.cxx
@@ -27,7 +27,7 @@
 #include "VisuGUI_BasePanel.h"
 #include "VisuGUI_Tools.h"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QScrollArea>
 #include <QHBoxLayout>

diff --git a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
index 1ac19ffdd07fcb7e0d5cdeb5d9b58a369f46edb0..3db9cd769142a5ca4df9ec09eaa14b62275724a6 100644 (file)
--- a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
+++ b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
@@ -29,12 +29,12 @@
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
 
-#include "SUIT_FileDlg.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
 #include <vtkTimerLog.h>
 

diff --git a/src/VISUGUI/VisuGUI_CacheDlg.cxx b/src/VISUGUI/VisuGUI_CacheDlg.cxx
index e4b5748f7a4d6cbb637b12cee1c10234185b64cc..6a015de1bfb5fed9ed74caa797148b3863412ffc 100644 (file)
--- a/src/VISUGUI/VisuGUI_CacheDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CacheDlg.cxx
@@ -30,16 +30,16 @@
 
 #include "VISU_PipeLine.hxx"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SalomeApp_Module.h"
+#include <gui/SalomeApp_Module.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QButtonGroup>
 #include <QGroupBox>

diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx
index 31bf08c8817d54a245dd8074cc2bd25e159eae89..6c6af88ed5f469da125013ddbb8dfde56f879917 100644 (file)
--- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx
@@ -32,19 +32,19 @@
 #include "VISU_PipeLine.hxx"
 #include "VISU_DataSetActor.h"
 
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_Application.h"
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
 
-#include "SVTK_ViewWindow.h"
-#include <VTKViewer_Utilities.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_Utilities.h>
 
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_OverrideCursor.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include "SALOME_Actor.h"
+#include <gui/SALOME_Actor.h>
 #include "VISU_ViewManager_i.hh"
 
 // QT Includes

diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.h b/src/VISUGUI/VisuGUI_ClippingDlg.h
index aabea3009cdd6cb2126b9e9f3e95473aeb3287f1..233498388942dc8a314742f11e8c69eee142734c 100644 (file)
--- a/src/VISUGUI/VisuGUI_ClippingDlg.h
+++ b/src/VISUGUI/VisuGUI_ClippingDlg.h
@@ -22,9 +22,9 @@
 #ifndef DIALOGBOX_CLIPPING_H
 #define DIALOGBOX_CLIPPING_H
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 // QT Includes
 #include <QDialog>

diff --git a/src/VISUGUI/VisuGUI_ClippingPanel.cxx b/src/VISUGUI/VisuGUI_ClippingPanel.cxx
index 2aa3ed50792c957548bfd101e27fb6131f1ee6fc..7b5a22d07324000f3dc7179cb5ca8c16108c25be 100644 (file)
--- a/src/VISUGUI/VisuGUI_ClippingPanel.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingPanel.cxx
@@ -30,15 +30,15 @@
 #include <VISU_Gen_i.hh>
 #include <VISU_ColoredPrs3dHolder_i.hh>
 
-#include <LightApp_Application.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewWindow.h>
-#include <SVTK_ViewWindow.h>
-#include <VTKViewer_Utilities.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_Utilities.h>
 
 
 
@@ -57,8 +57,8 @@
 #include <vtkCutter.h>
 #include <vtkPolyDataMapper.h>
 
-#include <SALOMEDSClient_AttributeSequenceOfReal.hxx>
-#include <SALOMEDSClient_AttributeInteger.hxx>
+#include <kernel/SALOMEDSClient_AttributeSequenceOfReal.hxx>
+#include <kernel/SALOMEDSClient_AttributeInteger.hxx>
 
 
 

diff --git a/src/VISUGUI/VisuGUI_ClippingPanel.h b/src/VISUGUI/VisuGUI_ClippingPanel.h
index a3d6f004083144aae1fe941eab7eb9b7dae5e330..b3a814d339745c169b0efa18a8500329c5df4b47 100644 (file)
--- a/src/VISUGUI/VisuGUI_ClippingPanel.h
+++ b/src/VISUGUI/VisuGUI_ClippingPanel.h
@@ -37,13 +37,13 @@ class vtkCutter;
 #include "VISU_Prs3d_i.hh"
 #include "VisuGUI_Panel.h"
 //#include <VisuGUI_SegmentationMgr.h>
-#include <VISU_ClippingPlaneMgr.hxx>
+#include "VISU_ClippingPlaneMgr.hxx"
 
 #include <QList>
 #include <vtkActor.h>
 #include <vtkPlane.h>
 
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 
 /*class CutPlaneFunction: public vtkPlane

diff --git a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx
index b3a4f662b5206407050e834acdda0de59896a88b..de9d173743fba578469e645c5fd7ab62ab85c02d 100644 (file)
--- a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx
@@ -26,15 +26,15 @@
 
 #include <VISU_Gen_i.hh>
 
-#include <LightApp_Application.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <QtxDoubleSpinBox.h>
-#include <SVTK_ViewWindow.h>
-#include <VTKViewer_Utilities.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_Utilities.h>
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>

diff --git a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h
index 91aa434c0c8496d942fddc23f94debd82d93d5dd..349c2c120f1b03aeaf5ff825da60badfc86cac40 100644 (file)
--- a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h
+++ b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h
@@ -35,7 +35,7 @@ class SVTK_ViewWindow;
 #include <QDialog>
 #include <vtkSmartPointer.h>
 #include "VisuGUI_ClippingPanel.h"
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 
 class VisuGUI_ClippingPlaneDlg: public QDialog

diff --git a/src/VISUGUI/VisuGUI_CursorDlg.cxx b/src/VISUGUI/VisuGUI_CursorDlg.cxx
index a3d1b0d67a95b1fe0137681c0b97d12c7eaddbb9..6a7776ddd83cbda2277425d1acf0cd30a3d8e303 100644 (file)
--- a/src/VISUGUI/VisuGUI_CursorDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CursorDlg.cxx
@@ -31,11 +31,11 @@ using namespace std;
 #include "VisuGUI.h"
 #include "VisuGUI_CursorDlg.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
 #include <QLayout>
 #include <QLabel>

diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
index 365f4e0b1ff3168f9e90597871de75e341633fd4..08f4c83e97822084fbaef0785a0a7be1a4a585e9 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
@@ -40,18 +40,18 @@
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_CutLinesPL.hxx"
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "LightApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#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>
 
 //TO DO
-//#include "OB_Browser.h"
+//#include <gui/OB_Browser.h>
 
 #include "VisuGUI_TableDlg.h"
 

diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
index 5b48ab40fe390edbeb225477f19e0a84b24e94fc..463ade9ce7512c6a4f4a61cb891e4ff5de135679 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
@@ -39,21 +39,21 @@
 #include "VISU_Result_i.hh"
 #include "VISU_CutPlanesPL.hxx"
 
-//#include "OB_Browser.h"
+//#include <gui/OB_Browser.h>
 
 #include "VisuGUI_TableDlg.h"
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "SUIT_Application.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ViewManager.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QLayout>
 #include <QLabel>

diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.h b/src/VISUGUI/VisuGUI_CutPlanesDlg.h
index dd668ec8cb78a2dff0bac51e9cfbf9911e195a86..686e166f0fa1d5dec21297f33f4479d029ad7b2f 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.h
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.h
@@ -30,9 +30,9 @@
 
 #include "VisuGUI_Prs3dDlg.h"
 
-#include <SALOME_Actor.h>
+#include <gui/SALOME_Actor.h>
 
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QFrame>
 

diff --git a/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx b/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx
index 56ba80cef2bd849ce629109282e25e6db0e2d2bb..b5a724a0176ae089258dbdc144582e31cf29c2e7 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx
@@ -37,12 +37,12 @@
 #include "VISU_PipeLine.hxx"
 #include "VISU_CutSegmentPL.hxx"
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "LightApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QLayout>
 #include <QTabWidget>

diff --git a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
index 9f7781705c8e6da82abaf1627152e54da8d37ab7..22124e0e638cb03eda837e288a3ec10975b0c142 100644 (file)
--- a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
@@ -38,19 +38,19 @@
 
 #include "VISU_Convertor.hxx"
 
-#include <QtxDoubleSpinBox.h>
-#include <SalomeApp_Module.h>
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <SALOME_ListIO.hxx>
-
-#include <SALOMEDSClient_AttributeString.hxx>
-#include <SALOMEDSClient_AttributeName.hxx>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/SalomeApp_Module.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/SALOME_ListIO.hxx>
+
+#include <kernel/SALOMEDSClient_AttributeString.hxx>
+#include <kernel/SALOMEDSClient_AttributeName.hxx>
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>

diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
index 03f87a4c30a4c73aa7bcdd35999b5dc0a6f2e8e7..d792f2fd95695a836bb8c491be800d17d194f63e 100644 (file)
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
@@ -36,13 +36,13 @@
 #include "VISU_Gen_i.hh"
 #include "VISU_Result_i.hh"
 #include "VisuGUI_Prs3dTools.h"
-#include "SVTK_ViewWindow.h"
-#include "SalomeApp_Module.h"
-#include "LightApp_Application.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SalomeApp_Module.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QLayout>
 #include <QDialog>

diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.h b/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
index 5589baf4c3ddf79a12343ca8aa87459818ef50ab..f44ce7d262fc334e1f5878634406c9ef8b59d959 100644 (file)
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
@@ -30,7 +30,7 @@
 
 #include "VisuGUI_Prs3dDlg.h"
 
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QCheckBox>
 

diff --git a/src/VISUGUI/VisuGUI_Displayer.cxx b/src/VISUGUI/VisuGUI_Displayer.cxx
index 49fa883c4ad5e656650b59ae6555bb73e2ef65a3..1d55c3b726e44786a2335fdf6b949858e18aa02f 100644 (file)
--- a/src/VISUGUI/VisuGUI_Displayer.cxx
+++ b/src/VISUGUI/VisuGUI_Displayer.cxx
@@ -35,19 +35,19 @@
 
 //#include "VVTK_ViewModel.h"
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <SPlot2d_ViewModel.h>
-#include <SPlot2d_Prs.h>
-#include <Plot2d_ViewWindow.h>
+#include <gui/SPlot2d_ViewModel.h>
+#include <gui/SPlot2d_Prs.h>
+#include <gui/Plot2d_ViewWindow.h>
 
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <SUIT_ViewManager.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
 
 VisuGUI_Displayer::VisuGUI_Displayer( SalomeApp_Application* app )
 : LightApp_Displayer(),

diff --git a/src/VISUGUI/VisuGUI_Displayer.h b/src/VISUGUI/VisuGUI_Displayer.h
index 8a625784eb5441c40dfe004324f626a253f553f0..67b6bb27538cc7d8e045f394bc15d089990810e0 100644 (file)
--- a/src/VISUGUI/VisuGUI_Displayer.h
+++ b/src/VISUGUI/VisuGUI_Displayer.h
@@ -28,10 +28,10 @@
 #ifndef VISUGUI_DISPLAYER_HEADER
 #define VISUGUI_DISPLAYER_HEADER
 
-#include <LightApp_Displayer.h>
-#include <VISU_Prs3d_i.hh>
-#include <VISU_Table_i.hh>
-#include <VISU_PointMap3d_i.hh>
+#include <gui/LightApp_Displayer.h>
+#include "VISU_Prs3d_i.hh"
+#include "VISU_Table_i.hh"
+#include "VISU_PointMap3d_i.hh"
 
 class SalomeApp_Application;
 class SVTK_ViewWindow;

diff --git a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx
index d5dd350a9d703ae4851c4255429d943df305ecdc..76e48056bbe36120800dae1b7734aed05133c6b8 100644 (file)
--- a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx
+++ b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx
@@ -30,11 +30,11 @@
 
 #include "VISU_Table_i.hh"
 
-#include "SalomeApp_Application.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QLayout>
 #include <QCheckBox>

diff --git a/src/VISUGUI/VisuGUI_EditContainerDlg.h b/src/VISUGUI/VisuGUI_EditContainerDlg.h
index 2c9cbd67e031d8d09b4227e649b3d37653777d55..da57aea081fefef6485e03d7dd5e3525ef8a6905 100644 (file)
--- a/src/VISUGUI/VisuGUI_EditContainerDlg.h
+++ b/src/VISUGUI/VisuGUI_EditContainerDlg.h
@@ -33,7 +33,7 @@ class QTreeWidget;
 class QToolButton;
 
 
-#include "SALOMEDSClient_SObject.hxx"
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 class VisuGUI;
 

diff --git a/src/VISUGUI/VisuGUI_EvolutionDlg.cxx b/src/VISUGUI/VisuGUI_EvolutionDlg.cxx
index b5298f1461c83ea40131554aff1c8438267620c2..ae00d36716ad29b62d267e6b35b553c9726d87fd 100644 (file)
--- a/src/VISUGUI/VisuGUI_EvolutionDlg.cxx
+++ b/src/VISUGUI/VisuGUI_EvolutionDlg.cxx
@@ -36,16 +36,16 @@
 
 #include <VISU_Convertor.hxx>
 
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
 
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SPlot2d_ViewModel.h>
-#include <Plot2d_ViewFrame.h>
+#include <gui/SPlot2d_ViewModel.h>
+#include <gui/Plot2d_ViewFrame.h>
 
 #include <QComboBox>
 #include <QGroupBox>

diff --git a/src/VISUGUI/VisuGUI_EvolutionDlg.h b/src/VISUGUI/VisuGUI_EvolutionDlg.h
index bf86a0bbf678de2493de2e3db012ec3893ec991d..4ab8457b2214bcf71be297375351e0c705b42e84 100644 (file)
--- a/src/VISUGUI/VisuGUI_EvolutionDlg.h
+++ b/src/VISUGUI/VisuGUI_EvolutionDlg.h
@@ -26,11 +26,11 @@
 #ifndef VISUGUI_EVOLUTIONDLG_H
 #define VISUGUI_EVOLUTIONDLG_H
 
-#include <QtxDialog.h>
+#include <gui/QtxDialog.h>
 
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
-#include <SVTK_Selection.h>
+#include <gui/SVTK_Selection.h>
 
 class QComboBox;
 class QIntValidator;

diff --git a/src/VISUGUI/VisuGUI_Factory.cxx b/src/VISUGUI/VisuGUI_Factory.cxx
index a09a628efc9db36ddd3fd2b67f6abbc2263e0030..7ef9a30fb55d75b0d50e0f5616d7c0e72afed520 100644 (file)
--- a/src/VISUGUI/VisuGUI_Factory.cxx
+++ b/src/VISUGUI/VisuGUI_Factory.cxx
@@ -27,7 +27,7 @@
 //
 #include "VisuGUI_Module.h"
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
 #ifdef WNT
 #if defined VISU_VISUGUI_EXPORTS || defined VISU_EXPORTS

diff --git a/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx b/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx
index 9e0c33c8dfef084e660be6b89af1be37bb7b8624..544750785cd0c3bfe330761739e1f6eb30daad07 100644 (file)
--- a/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx
+++ b/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx
@@ -37,15 +37,15 @@
 #include <QLayout>
 #include <QPushButton>
 
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SalomeApp_Application.h>
+#include <gui/SalomeApp_Application.h>
 
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 VisuGUI_FeatureEdgesPanel::VisuGUI_FeatureEdgesPanel( VisuGUI* theModule, QWidget* theParent ) :
   VisuGUI_Panel( tr( "WINDOW_TITLE" ), theModule, theParent, ApplyBtn | CloseBtn | HelpBtn ),

diff --git a/src/VISUGUI/VisuGUI_FieldFilter.cxx b/src/VISUGUI/VisuGUI_FieldFilter.cxx
index 526eabedba80cd5f9e2eaeaffdef4f3a10a807f8..93c7c30f2942c7a82e8b476a83bee2526ee0668a 100644 (file)
--- a/src/VISUGUI/VisuGUI_FieldFilter.cxx
+++ b/src/VISUGUI/VisuGUI_FieldFilter.cxx
@@ -31,10 +31,10 @@
 #include "VISUConfig.hh"
 #include "VISU_ColoredPrs3dFactory.hh"
 
-#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>
 
 using namespace VISU;
 

diff --git a/src/VISUGUI/VisuGUI_FieldFilter.h b/src/VISUGUI/VisuGUI_FieldFilter.h
index d9215fc0c23275569dd365cd469698888297ad3c..ca2c439b2999bd2fee164be4f137514338e4b3dd 100644 (file)
--- a/src/VISUGUI/VisuGUI_FieldFilter.h
+++ b/src/VISUGUI/VisuGUI_FieldFilter.h
@@ -28,7 +28,7 @@
 
 #include "VISUConfig.hh"
 
-#include "SUIT_SelectionFilter.h"
+#include <gui/SUIT_SelectionFilter.h>
 
 class SUIT_DataOwner;
 

diff --git a/src/VISUGUI/VisuGUI_FileDlg.cxx b/src/VISUGUI/VisuGUI_FileDlg.cxx
index d37e8e06c64cc9bb092a12dc8452ec1802dfca9a..604923dc5deae53bc812410da9e6b2817d3f1be7 100644 (file)
--- a/src/VISUGUI/VisuGUI_FileDlg.cxx
+++ b/src/VISUGUI/VisuGUI_FileDlg.cxx
@@ -32,7 +32,7 @@
 
 #include "VISUConfig.hh"
 #include "VisuGUI_FileDlg.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 using namespace std;
 

diff --git a/src/VISUGUI/VisuGUI_FileDlg.h b/src/VISUGUI/VisuGUI_FileDlg.h
index 3c236a6b8673afc3d9856104cd9a73612bac1d05..4160046611703bf0da3aa823f227260d9cc0132a 100644 (file)
--- a/src/VISUGUI/VisuGUI_FileDlg.h
+++ b/src/VISUGUI/VisuGUI_FileDlg.h
@@ -27,7 +27,7 @@
 #ifndef VISU_FILEDIALOG_H
 #define VISU_FILEDIALOG_H
 
-#include "SUIT_FileDlg.h"
+#include <gui/SUIT_FileDlg.h>
 
 class QCheckBox;
 

diff --git a/src/VISUGUI/VisuGUI_FileInfoDlg.cxx b/src/VISUGUI/VisuGUI_FileInfoDlg.cxx
index 5a7ffb4052ab30ab017995a54d01c594b0067f61..cf920c5a9a13a42fa2dbf047867ad7a5d3e1f640 100644 (file)
--- a/src/VISUGUI/VisuGUI_FileInfoDlg.cxx
+++ b/src/VISUGUI/VisuGUI_FileInfoDlg.cxx
@@ -26,7 +26,7 @@
 //
 #include "VisuGUI_FileInfoDlg.h"
 
-#include <MED_Common.hxx>
+#include <med/MED_Common.hxx>
 
 #include <QGridLayout>
 #include <QLabel>

diff --git a/src/VISUGUI/VisuGUI_FileInfoDlg.h b/src/VISUGUI/VisuGUI_FileInfoDlg.h
index 098997374e8b2cf4d52184a71ce00ed4fdb11062..b814c6997be82e7face9e2c564f8e5ac5832f168 100644 (file)
--- a/src/VISUGUI/VisuGUI_FileInfoDlg.h
+++ b/src/VISUGUI/VisuGUI_FileInfoDlg.h
@@ -27,7 +27,7 @@
 #define VISUGUI_FILEINFODLG_H
 
 #include <MED.hh>
-#include <QtxDialog.h>
+#include <gui/QtxDialog.h>
 
 class VisuGUI_FileInfoDlg : public QtxDialog
 {

diff --git a/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx b/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
index f94d05abc66e1723ce8cef75d822574066350ae1..996c35023d88bc79eb9459f05d064f31709441a4 100644 (file)
--- a/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
@@ -27,13 +27,13 @@
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
 
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QPushButton>
 #include <QVBoxLayout>

diff --git a/src/VISUGUI/VisuGUI_FindPane.cxx b/src/VISUGUI/VisuGUI_FindPane.cxx
index 07b2cdc8a725d106ee13370f7b6d837b80f19e1a..41e2c6be16e748504e336af60ec76f8bedbe4362 100644 (file)
--- a/src/VISUGUI/VisuGUI_FindPane.cxx
+++ b/src/VISUGUI/VisuGUI_FindPane.cxx
@@ -35,8 +35,8 @@
 #include "VISU_GaussPointsPL.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QComboBox>
 #include <QLabel>

diff --git a/src/VISUGUI/VisuGUI_FindPane.h b/src/VISUGUI/VisuGUI_FindPane.h
index 40d374ae8e66b60992b7a80f27efab8a6fa2fd0e..023ea71a3f0b8d2992350133f3938aa8db320fc4 100644 (file)
--- a/src/VISUGUI/VisuGUI_FindPane.h
+++ b/src/VISUGUI/VisuGUI_FindPane.h
@@ -27,7 +27,7 @@
 #ifndef VISUGUI_FINDPANE_H
 #define VISUGUI_FINDPANE_H
 
-#include <SVTK_Selection.h>
+#include <gui/SVTK_Selection.h>
 
 #include <QGroupBox>
 

diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
index 89ddfa56fef3692c2430c384ce0c5055e7060841..43b5619471da67e0003575d134cbb4965c6f8a3f 100644 (file)
--- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
@@ -41,16 +41,16 @@
 #include "VVTK_PrimitiveBox.h"
 #include "VVTK_SizeBox.h"
 
-#include "LightApp_Application.h"
-#include "SalomeApp_Module.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SVTK_FontWidget.h"
-
-#include "QtxDoubleSpinBox.h"
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_Module.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SVTK_FontWidget.h>
+
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QLayout>
 #include <QTabWidget>

diff --git a/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx b/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
index 7ae3c886a953298169ed852c7720a057bf625928..2615bf60f215fdc1c080fd3bfcced248db9fb41f 100644 (file)
--- a/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
+++ b/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
@@ -32,19 +32,19 @@
 #include "VISU_GaussPointsPL.hxx"
 #include "VISU_PickingSettings.h"
 
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
-#include "SVTK_Selector.h"
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
 //#include "SVTK_MainWindow.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <gui/SVTK_RenderWindowInteractor.h>
 
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
 
 #include <vtkActorCollection.h>
 #include <vtkCallbackCommand.h>
@@ -53,7 +53,7 @@
 #include <vtkGenericRenderWindowInteractor.h>
 #include <vtkSmartPointer.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -66,7 +66,7 @@
 #include <QIntValidator>
 #include <QToolButton>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
 namespace
 {

diff --git a/src/VISUGUI/VisuGUI_InputPane.cxx b/src/VISUGUI/VisuGUI_InputPane.cxx
index cf6197ef7384572cd35175b361a9156c4397e5d5..ba44b86ec078503644ceeee663b750dba5aa98b8 100644 (file)
--- a/src/VISUGUI/VisuGUI_InputPane.cxx
+++ b/src/VISUGUI/VisuGUI_InputPane.cxx
@@ -35,17 +35,17 @@
 #include "VISU_Result_i.hh"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SalomeApp_Module.h"
+#include <gui/SalomeApp_Module.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>
 
-#include "SALOMEDSClient_AttributeString.hxx"
-#include "SALOMEDSClient_AttributeName.hxx"
+#include <kernel/SALOMEDSClient_AttributeString.hxx>
+#include <kernel/SALOMEDSClient_AttributeName.hxx>
 
 //#include "QtxListBox.h"
 

diff --git a/src/VISUGUI/VisuGUI_InputPane.h b/src/VISUGUI/VisuGUI_InputPane.h
index ae807c854bb6f034485b91c68213cb90631d600b..9c38584b01e6858cc2529f53601d3f2e592f2094 100644 (file)
--- a/src/VISUGUI/VisuGUI_InputPane.h
+++ b/src/VISUGUI/VisuGUI_InputPane.h
@@ -29,7 +29,7 @@
 
 #include "VISUConfig.hh"
 
-#include "SALOME_ListIO.hxx"
+#include <gui/SALOME_ListIO.hxx>
 
 #include <QGroupBox>
 

diff --git a/src/VISUGUI/VisuGUI_InputPanel.h b/src/VISUGUI/VisuGUI_InputPanel.h
index c40029c711b5d1dd7a368e2b61a2cee4bffb1c7e..e5d48f3a80edbbd88dd126c35d49038482d56ba4 100755 (executable)
--- a/src/VISUGUI/VisuGUI_InputPanel.h
+++ b/src/VISUGUI/VisuGUI_InputPanel.h
@@ -27,7 +27,7 @@
 #ifndef VISUGUI_INPUTPANEL_H
 #define VISUGUI_INPUTPANEL_H
 
-#include <QtxDockWidget.h>
+#include <gui/QtxDockWidget.h>
 
 #include <QMap>
 

diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
index 7ab8e93ac76648d371f85763be459ce3bafb3a2d..a12661915dd829662c59c2fb1ab1012a8e7141f6 100644 (file)
--- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
@@ -33,13 +33,13 @@
 
 #include <VISU_ColoredPrs3dFactory.hh>
 
-#include <LightApp_Application.h>
+#include <gui/LightApp_Application.h>
 
-#include <QtxColorButton.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/QtxColorButton.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <limits.h>
 

diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx
index 5beb580f81644b15db135cce57fe4435f557972f..699f7a0d23dcbc4bb86bb41e9327ce666e22a358 100644 (file)
--- a/src/VISUGUI/VisuGUI_Module.cxx
+++ b/src/VISUGUI/VisuGUI_Module.cxx
@@ -27,37 +27,37 @@
 //
 #include "VisuGUI_Module.h"
 
-#include "QtxPopupMgr.h"
+#include <gui/QtxPopupMgr.h>
 
-#include "SUIT_Study.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Accel.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_Study.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Accel.h>
+#include <gui/SUIT_Session.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
-#include "SALOME_Event.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_VTKSelector.h"
-#include "LightApp_Preferences.h"
-#include "LightApp_Displayer.h"
+#include <gui/SALOME_Event.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_VTKSelector.h>
+#include <gui/LightApp_Preferences.h>
+#include <gui/LightApp_Displayer.h>
 
-#include "SALOMEDSClient_ClientFactory.hxx"
-#include "SALOMEDSClient_IParameters.hxx"
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/SALOMEDSClient_IParameters.hxx>
 
 //#include "VVTK_ViewManager.h"
 //#include "VVTK_ViewWindow.h"
 //#include "VVTK_ViewModel.h"
 
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewManager.h"
-#include "SVTK_ViewWindow.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewManager.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
 #include "VISU_Event.h"
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
 #include "VisuGUI_Prs3dTools.h"
 #include "VisuGUI_ClippingDlg.h"
@@ -79,39 +79,39 @@
 #include "VISU_PlanesWidget.hxx"
 #include "VISU_SphereWidget.hxx"
 
-#include "SalomeApp_Study.h"
+#include <gui/SalomeApp_Study.h>
 //#include "VVTK_MainWindow.h"
 #include "VISU_View_i.hh"
 
 #ifndef DISABLE_VTKVIEWER
 #ifndef DISABLE_SALOMEOBJECT
-  #include <SVTK_ViewWindow.h>
-  #include <SVTK_ViewModel.h>
+  #include <gui/SVTK_ViewWindow.h>
+  #include <gui/SVTK_ViewModel.h>
 #else
-  #include <VTKViewer_ViewWindow.h>
+  #include <gui/VTKViewer_ViewWindow.h>
 #endif
-  #include <VTKViewer_ViewModel.h>
+  #include <gui/VTKViewer_ViewModel.h>
 #endif
 #ifndef DISABLE_OCCVIEWER
-  #include <OCCViewer_ViewWindow.h>
-  #include <OCCViewer_ViewPort3d.h>
+  #include <gui/OCCViewer_ViewWindow.h>
+  #include <gui/OCCViewer_ViewPort3d.h>
 #ifndef DISABLE_SALOMEOBJECT
-  #include <SOCC_ViewModel.h>
+  #include <gui/SOCC_ViewModel.h>
 #else
-  #include <OCCViewer_ViewModel.h>
+  #include <gui/OCCViewer_ViewModel.h>
 #endif
 #endif
 #ifndef DISABLE_GLVIEWER
-  #include <GLViewer_ViewFrame.h>
-  #include <GLViewer_ViewPort.h>
+  #include <gui/GLViewer_ViewFrame.h>
+  #include <gui/GLViewer_ViewPort.h>
 #endif
 #ifndef DISABLE_PLOT2DVIEWER
-  #include <Plot2d_ViewWindow.h>
-  #include <Plot2d_ViewFrame.h>
+  #include <gui/Plot2d_ViewWindow.h>
+  #include <gui/Plot2d_ViewFrame.h>
 #ifndef DISABLE_SALOMEOBJECT
-  #include <SPlot2d_ViewModel.h>
+  #include <gui/SPlot2d_ViewModel.h>
 #else
-  #include <Plot2d_ViewModel.h>
+  #include <gui/Plot2d_ViewModel.h>
 #endif
 #endif
 

diff --git a/src/VISUGUI/VisuGUI_Module.h b/src/VISUGUI/VisuGUI_Module.h
index 52ccb9362a1b329fd03ed01890af15518f46ed1f..b78bb1802e3d95f7e6f41c2e001b983115780555 100644 (file)
--- a/src/VISUGUI/VisuGUI_Module.h
+++ b/src/VISUGUI/VisuGUI_Module.h
@@ -28,14 +28,14 @@
 #define VisuGUI_Module_HeaderFile
 
 #include "VisuGUI.h"
-#include "STD_Application.h"
-#include "SALOMEDSClient_SObject.hxx"
+#include <gui/STD_Application.h>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 class SUIT_ViewManager;
 class SVTK_ViewManager;
 class SVTK_ViewWindow;
 
-#include "MED_SharedPtr.hxx"
+#include <med/MED_SharedPtr.hxx>
 
 //! This class inherits base VisuGUI.
 /*! Used to display, erase end edit presentations in the VVTK viewer. */

diff --git a/src/VISUGUI/VisuGUI_NameDlg.cxx b/src/VISUGUI/VisuGUI_NameDlg.cxx
index 8c6300f88c288edfe196aa2092085e7ceec4dfcf..45a9a17ba33c471666c2dd9bfb7996705f51bd30 100644 (file)
--- a/src/VISUGUI/VisuGUI_NameDlg.cxx
+++ b/src/VISUGUI/VisuGUI_NameDlg.cxx
@@ -27,14 +27,14 @@
 #include "VisuGUI_NameDlg.h"
 #include "VisuGUI.h"
 
-#include <SUIT_Session.h>
-#include <SUIT_Application.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Tools.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-
-#include <LightApp_Application.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+
+#include <gui/LightApp_Application.h>
 
 #include <QGroupBox>
 #include <QLabel>

diff --git a/src/VISUGUI/VisuGUI_OffsetDlg.cxx b/src/VISUGUI/VisuGUI_OffsetDlg.cxx
index 1049e4c55690e2d31dd83e47f83380fd8cdb6514..7189a86ace50a70c6263420e74a1c3d2cff92edf 100644 (file)
--- a/src/VISUGUI/VisuGUI_OffsetDlg.cxx
+++ b/src/VISUGUI/VisuGUI_OffsetDlg.cxx
@@ -27,19 +27,19 @@
 #include "VISU_ViewManager_i.hh"
 #include "VISU_Actor.h"
 
-#include "LightApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SalomeApp_Application.h"
-#include "SVTK_ViewWindow.h"
-#include "SVTK_ViewModel.h"
-#include "SUIT_ViewManager.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-
-#include "QtxDoubleSpinBox.h"
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/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/QtxDoubleSpinBox.h>
 
 // VTK Includes
 #include "vtkRenderer.h"

diff --git a/src/VISUGUI/VisuGUI_OffsetDlg.h b/src/VISUGUI/VisuGUI_OffsetDlg.h
index 71e034d05bde58ff6b36cbe0c19e28589bfe18a7..a7a9e32f8aabab72d62b84c30b83b114683a7cb0 100644 (file)
--- a/src/VISUGUI/VisuGUI_OffsetDlg.h
+++ b/src/VISUGUI/VisuGUI_OffsetDlg.h
@@ -22,7 +22,7 @@
 #ifndef DIALOGBOX_OFFSET_H
 #define DIALOGBOX_OFFSET_H
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 #include "VISU_Prs3d_i.hh"
 #include "VISU_PointMap3d_i.hh"
 

diff --git a/src/VISUGUI/VisuGUI_Panel.cxx b/src/VISUGUI/VisuGUI_Panel.cxx
index 85d15da639de9ecbd11e8150ca94472851e7a3b3..cc405c91dd2f3ef0e70bb9569a8b52d7f5ea2e17 100755 (executable)
--- a/src/VISUGUI/VisuGUI_Panel.cxx
+++ b/src/VISUGUI/VisuGUI_Panel.cxx
@@ -29,7 +29,7 @@
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QScrollArea>
 #include <QHBoxLayout>

diff --git a/src/VISUGUI/VisuGUI_Panel.h b/src/VISUGUI/VisuGUI_Panel.h
index e7eedb4b965af3d6035112c095601df00a5c831c..6753775a6f9dc28e76480daffbc3aa81d07c67ab 100755 (executable)
--- a/src/VISUGUI/VisuGUI_Panel.h
+++ b/src/VISUGUI/VisuGUI_Panel.h
@@ -27,7 +27,7 @@
 #ifndef VISUGUI_PANEL_H
 #define VISUGUI_PANEL_H
 
-#include <QtxDockWidget.h>
+#include <gui/QtxDockWidget.h>
 
 class QScrollArea;
 class QPushButton;

diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
index 98954c0054d02f5f6032a500ba9c483057dbb03b..3e3b0d4b44ec9a27c23e0bd289bb8edd35dcdae8 100644 (file)
--- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
@@ -36,16 +36,16 @@
 #include "VISU_ViewManager_i.hh"
 #include "VISU_Plot3DPL.hxx"
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "SALOME_Actor.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "LightApp_Application.h"
+#include <gui/SALOME_Actor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/LightApp_Application.h>
 
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QLayout>
 #include <QValidator>

diff --git a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
index d0cb296d057e8381b051f423adcc62cb9b1e0443..c3f7affe3f6f3eb501e09ee176ba9cc69eb9da5c 100644 (file)
--- a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
@@ -31,8 +31,8 @@
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_InputPane.h"
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_FontWidget.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_FontWidget.h>
 
 #include "VISUConfig.hh"
 #include "VISU_Convertor.hxx"
@@ -45,12 +45,12 @@
 #include "VISU_Result_i.hh"
 #include "VISU_Prs3dUtils.hh"
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Desktop.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
 
 #include <QCheckBox>
 #include <QLineEdit>
@@ -68,7 +68,7 @@
 #include <QKeyEvent>
 #include <QGridLayout>
 
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <vtkTextProperty.h>
 

diff --git a/src/VISUGUI/VisuGUI_Prs3dTools.h b/src/VISUGUI/VisuGUI_Prs3dTools.h
index 7fa0e6570d1fea89ed0d0ea044ff9e199dfd8074..a43e08d077eb35cdb713a940255ea1fa52ee0737 100644 (file)
--- a/src/VISUGUI/VisuGUI_Prs3dTools.h
+++ b/src/VISUGUI/VisuGUI_Prs3dTools.h
@@ -34,10 +34,10 @@
 #include "VISU_PipeLine.hxx"
 #include "VisuGUI_DialogRunner.h"
 
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SPlot2d_ViewWindow.h>
+#include <gui/SPlot2d_ViewWindow.h>
 
 #include <vtkRenderer.h>
 

diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
index 5bf97d0acab9ff933da324e979b5a9aecd4db7cd..b1a557cab37ce78bf6dfc6c7784fd0273c08c444 100644 (file)
--- a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
@@ -32,8 +32,8 @@
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_InputPane.h"
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_FontWidget.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_FontWidget.h>
 
 #include "VISUConfig.hh"
 #include "VISU_Convertor.hxx"
@@ -45,11 +45,11 @@
 #include "VISU_Result_i.hh"
 #include "VISU_ColoredPrs3dFactory.hh"
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <limits.h>
 

diff --git a/src/VISUGUI/VisuGUI_Selection.cxx b/src/VISUGUI/VisuGUI_Selection.cxx
index 1610288d3f5c7bceac769b93fff6178b527a5e91..d618f50ab9eed808ca639af64b94a6baeea8197d 100644 (file)
--- a/src/VISUGUI/VisuGUI_Selection.cxx
+++ b/src/VISUGUI/VisuGUI_Selection.cxx
@@ -36,9 +36,9 @@
 #include "VISU_ScalarMapAct.h"
 #include "VISU_GaussPtsAct.h"
 
-#include "SalomeApp_Study.h"
-#include "LightApp_Study.h"
-#include "LightApp_Displayer.h"
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_Study.h>
+#include <gui/LightApp_Displayer.h>
 
 using namespace VISU;
 

diff --git a/src/VISUGUI/VisuGUI_Selection.h b/src/VISUGUI/VisuGUI_Selection.h
index 07fd80242b1eb926117693db5214a121bfced937..445c3ed2affcd79f8a808cce68c3da0e08836f88 100644 (file)
--- a/src/VISUGUI/VisuGUI_Selection.h
+++ b/src/VISUGUI/VisuGUI_Selection.h
@@ -27,7 +27,7 @@
 #ifndef VisuGUI_Selection_HeaderFile
 #define VisuGUI_Selection_HeaderFile
 
-#include <LightApp_Selection.h>
+#include <gui/LightApp_Selection.h>
 
 //////////////////////////////////////////////////
 // Class: VisuGUI_Selection

diff --git a/src/VISUGUI/VisuGUI_SelectionPanel.cxx b/src/VISUGUI/VisuGUI_SelectionPanel.cxx
index 943acf03e1eb4fa5b71b09e6c4533de8ad8b3797..77dcdfccc72b21eb1a32e6d099a5ea5b376d6033 100644 (file)
--- a/src/VISUGUI/VisuGUI_SelectionPanel.cxx
+++ b/src/VISUGUI/VisuGUI_SelectionPanel.cxx
@@ -45,28 +45,28 @@
 #include "VISU_GaussPtsSettings.h"
 #include "VISU_PickingSettings.h"
 
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_VTKSelector.h"
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_VTKSelector.h>
 
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_Session.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_ViewWindow.h"
-#include "SVTK_Selector.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 // OCCT Includes
 #include <TColStd_IndexedMapOfInteger.hxx>

diff --git a/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx b/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx
index 9615a0476b182f0ead050fbb8045b16536598958..5bdc854acf7ae801e4e2cb427eb2cf19855c4893 100644 (file)
--- a/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx
+++ b/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx
@@ -28,18 +28,18 @@
 
 #include "VISU_PickingSettings.h"
 
-#include <SUIT_Session.h>
-#include <SUIT_Application.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Tools.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-
-#include <LightApp_Application.h>
-
-#include <QtxColorButton.h>
-#include <QtxDoubleSpinBox.h>
-#include <QtxIntSpinBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+
+#include <gui/LightApp_Application.h>
+
+#include <gui/QtxColorButton.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
 
 #include <QComboBox>
 #include <QGroupBox>

diff --git a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
index a12fad46b8127b8ee893e717bb50760097262000..dd89f9ef8897d82577a20e2bc76a6c929ab259bf 100644 (file)
--- a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
@@ -26,19 +26,19 @@
 //
 #include "VisuGUI_SetupPlot2dDlg.h"
 #include "VisuGUI.h"
-#include "SPlot2d_Curve.h"
+#include <gui/SPlot2d_Curve.h>
 
-#include "SUIT_Tools.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include <QtxColorButton.h>
+#include <gui/QtxColorButton.h>
 
-#include <SALOMEDSClient_AttributeTableOfInteger.hxx>
-#include <SALOMEDSClient_AttributeTableOfReal.hxx>
+#include <kernel/SALOMEDSClient_AttributeTableOfInteger.hxx>
+#include <kernel/SALOMEDSClient_AttributeTableOfReal.hxx>
 
 #include <QLabel>
 #include <QPushButton>
@@ -55,7 +55,7 @@
 #include <vector>
 #include <string>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h
index 985c34f7c46c8ef19f7cb3f306f634df8c89f71e..d89f279c50f80813dc82d3954264a20e52180670 100644 (file)
--- a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h
+++ b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h
@@ -26,9 +26,9 @@
 #ifndef VISUGUI_SetupPlot2dDlg_H
 #define VISUGUI_SetupPlot2dDlg_H
 
-#include "Plot2d_Curve.h"
+#include <gui/Plot2d_Curve.h>
 
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 #include <QDialog>
 #include <QList>

diff --git a/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx
index 1037bb3a3d7ff2262376e9407198635529209cc1..f5eb8d9f6a6356d69724e610b4d231586b63cb6f 100644 (file)
--- a/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx
@@ -30,21 +30,21 @@
 #include "VisuGUI_Tools.h"
 #include "VISU_Actor.h"
 
-#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 "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "LightApp_Study.h"
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_Application.h"
+#include <gui/LightApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
 // QT Includes
 #include <QLabel>

diff --git a/src/VISUGUI/VisuGUI_Slider.cxx b/src/VISUGUI/VisuGUI_Slider.cxx
index e32654e7bda04754a5aa570feddc55b93b702130..8d01194760d95f97beaed2c94d7f5ffd3f34fdcc 100644 (file)
--- a/src/VISUGUI/VisuGUI_Slider.cxx
+++ b/src/VISUGUI/VisuGUI_Slider.cxx
@@ -26,15 +26,15 @@
 //
 #include "VisuGUI_Slider.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include "LightApp_SelectionMgr.h"
+#include <gui/LightApp_SelectionMgr.h>
 
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 #include "VISU_PipeLine.hxx"
 
@@ -45,11 +45,11 @@
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_Prs3dTools.h"
 
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
 
-#include "QtxDockWidget.h"
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDockWidget.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <vtkActorCollection.h>
 #include <vtkRenderer.h>

diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
index 55d9c65240517108b24d86bee1f376f0244093b7..aa13568a521a333a6b558aff98c1fea327d83177 100644 (file)
--- a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
@@ -36,23 +36,23 @@
 #include "VISU_StreamLinesPL.hxx"
 #include "VISU_Actor.h"
 
-#include "SalomeApp_Application.h"
-#include "LightApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_MessageBox.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include "SALOME_ListIO.hxx"
+#include <gui/SALOME_ListIO.hxx>
 
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
-#include <QtxDoubleSpinBox.h>
-#include <QtxColorButton.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxColorButton.h>
 
 #include <limits.h>
 

diff --git a/src/VISUGUI/VisuGUI_Sweep.cxx b/src/VISUGUI/VisuGUI_Sweep.cxx
index d5f5a9042f0da0b28376aa13f2a50efb63fa669f..867ebb0e439fe021aa608c1e5a3632b1d3f3d973 100644 (file)
--- a/src/VISUGUI/VisuGUI_Sweep.cxx
+++ b/src/VISUGUI/VisuGUI_Sweep.cxx
@@ -26,9 +26,9 @@
 //
 #include "VisuGUI_Sweep.h"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "LightApp_SelectionMgr.h"
+#include <gui/LightApp_SelectionMgr.h>
 
 #include "VISU_Actor.h"
 
@@ -38,9 +38,9 @@
 #include "VISU_ColoredPrs3d_i.hh"
 #include "VISU_Actor.h"
 
-#include "QtxDockWidget.h"
-#include "QtxIntSpinBox.h"
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDockWidget.h>
+#include <gui/QtxIntSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QMainWindow>
 #include <QComboBox>

diff --git a/src/VISUGUI/VisuGUI_Table3dDlg.cxx b/src/VISUGUI/VisuGUI_Table3dDlg.cxx
index a90fccc59ec85da3aa7d7b6bd338cef4772f7d11..d6036239b4673c22be59c6b5a13d90460e8f86af 100644 (file)
--- a/src/VISUGUI/VisuGUI_Table3dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Table3dDlg.cxx
@@ -34,15 +34,15 @@
 #include "VISU_ViewManager_i.hh"
 #include "VISU_Prs3dUtils.hh"
 
-#include <SVTK_ViewWindow.h>
-#include <SALOME_Actor.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <LightApp_Application.h>
-#include <SVTK_FontWidget.h>
-#include <QtxDoubleSpinBox.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_Actor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SVTK_FontWidget.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QGridLayout>
 #include <QHBoxLayout>

diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx
index 00192d5a2fa44306178b9ccc9384e3e62e48fdb8..393b64d5c0ec9daaa96aba8264edd6dca4a88f23 100644 (file)
--- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx
+++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx
@@ -59,19 +59,19 @@
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_Actor.h"
 
-#include "SalomeApp_Study.h"
-#include "LightApp_Application.h"
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_Application.h>
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "SUIT_OverrideCursor.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_FileDlg.h"
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_FileDlg.h>
 
 #include <vtkRenderer.h>
 #include <vtkMapper.h>

diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.h b/src/VISUGUI/VisuGUI_TimeAnimation.h
index 40f40f673edb9fd3a1010825f7c9ed3272dcec99..bbf83ace310545ca07ea3b61a7f91b416b777c7e 100644 (file)
--- a/src/VISUGUI/VisuGUI_TimeAnimation.h
+++ b/src/VISUGUI/VisuGUI_TimeAnimation.h
@@ -26,10 +26,10 @@
 #ifndef VISUGUI_TIMEANIMATION_H
 #define VISUGUI_TIMEANIMATION_H
 
-#include "QtxDoubleSpinBox.h"
-#include "SALOMEDSClient_Study.hxx"
+#include <gui/QtxDoubleSpinBox.h>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 #include <QDialog>
 #include <QButtonGroup>

diff --git a/src/VISUGUI/VisuGUI_Timer.cxx b/src/VISUGUI/VisuGUI_Timer.cxx
index d78348b59c947f94b6a35bb3632bdcb87a77d31a..a5fc0e09fb9420ab734afc53fb6f5f8cc7e68ddd 100644 (file)
--- a/src/VISUGUI/VisuGUI_Timer.cxx
+++ b/src/VISUGUI/VisuGUI_Timer.cxx
@@ -25,9 +25,9 @@
 //
 #include "VisuGUI_Timer.h"
 
-#include "SUIT_Desktop.h"
+#include <gui/SUIT_Desktop.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifndef WNT
 static struct timezone *tz=(struct timezone*) malloc(sizeof(struct timezone));

diff --git a/src/VISUGUI/VisuGUI_Timer.h b/src/VISUGUI/VisuGUI_Timer.h
index e5856d8cc42b85adc7358a035110cd9d159e9812..e639e16c50161cf3a6936209b6187f9cba277436 100644 (file)
--- a/src/VISUGUI/VisuGUI_Timer.h
+++ b/src/VISUGUI/VisuGUI_Timer.h
@@ -23,7 +23,7 @@
 //  File   : VisuGUI_Timer.h
 //  Module : SALOME
 //
-#include <Utils_Timer.hxx>
+#include <kernel/Utils_Timer.hxx>
 
 #include <QString>
 

diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx
index 665c0450804d2c42f03e57e4fd60adeaffb4cbd8..30bc28b53a1c03e0dc7ee4d02faecdda0400922b 100644 (file)
--- a/src/VISUGUI/VisuGUI_Tools.cxx
+++ b/src/VISUGUI/VisuGUI_Tools.cxx
@@ -44,34 +44,34 @@
 #include "VISU_Actor.h"
 #include "VISU_ScalarMapAct.h"
 
-#include "SalomeApp_Module.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
+#include <gui/SalomeApp_Module.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
-#include "LightApp_DataObject.h"
-#include "LightApp_SelectionMgr.h"
+#include <gui/LightApp_DataObject.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //TODO
-//#include "OB_Browser.h"
+//#include <gui/OB_Browser.h>
 
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_Functor.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_Functor.h>
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "SPlot2d_ViewModel.h"
-#include "Plot2d_ViewFrame.h"
-#include "Plot2d_ViewManager.h"
+#include <gui/SPlot2d_ViewModel.h>
+#include <gui/Plot2d_ViewFrame.h>
+#include <gui/Plot2d_ViewManager.h>
 
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_ViewWindow.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewWindow.h>
 
-#include "CAM_DataModel.h"
+#include <gui/CAM_DataModel.h>
 
 #include <vtkRenderer.h>
 #include <vtkActorCollection.h>

diff --git a/src/VISUGUI/VisuGUI_Tools.h b/src/VISUGUI/VisuGUI_Tools.h
index 33c55c7b26b3bcf95db8cd799884a2d8d75dfaf2..1b76a2dcd40efc5c665379b231183c9d9d3f507e 100644 (file)
--- a/src/VISUGUI/VisuGUI_Tools.h
+++ b/src/VISUGUI/VisuGUI_Tools.h
@@ -27,12 +27,12 @@
 #ifndef VisuGUI_Tools_HeaderFile
 #define VisuGUI_Tools_HeaderFile
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
 #include "VISUConfig.hh"
 #include "VISU_ColoredPrs3d_i.hh"
 
-#include "SALOMEDSClient_Study.hxx"
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(MED_Gen)

diff --git a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
index 0227625a267af9cda64ffa94f75fae9ade683ce3..e31d1cf87461fb5bf8632e4fe6869a2b06235ff3 100644 (file)
--- a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
+++ b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
@@ -32,21 +32,21 @@
 #include "VisuGUI_Tools.h"
 #include "VISU_Actor.h"
 
-#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 "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "LightApp_Study.h"
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_Application.h"
+#include <gui/LightApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
 // QT Includes
 #include <QLabel>

diff --git a/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx b/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx
index 54c71d161b62b2f0d569a7fa3c2254a5b8644589..3a370177d6dfdb7361a21898b9177d2d5a9f6a0f 100755 (executable)
--- a/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx
@@ -28,8 +28,8 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
-#include <QtxColorButton.h>
-#include <QtxFontEdit.h>
+#include <gui/QtxColorButton.h>
+#include <gui/QtxFontEdit.h>
 #include <QVBoxLayout>
 
 /*!

diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.cxx b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
index 640c6f13749e5f8766ece45a4d3a62879ca8fe89..998b81daa7b030f5e4fad4bc227856a4c52fd1ef 100644 (file)
--- a/src/VISUGUI/VisuGUI_VectorsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
@@ -33,15 +33,15 @@
 
 #include "VISU_ColoredPrs3dFactory.hh"
 #include "VISU_Vectors_i.hh"
-#include "LightApp_Application.h"
-#include "SalomeApp_Module.h"
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_Module.h>
 
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include <QtxColorButton.h>
+#include <gui/QtxColorButton.h>
 
 #include <QLayout>
 #include <QColorDialog>

diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.h b/src/VISUGUI/VisuGUI_VectorsDlg.h
index 6e0562d31a9ac579d586da8253071ca989a3a37e..6d31c88162bc4b7e3b34bed1ddb1cd2c75f1cc10 100644 (file)
--- a/src/VISUGUI/VisuGUI_VectorsDlg.h
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.h
@@ -29,7 +29,7 @@
 #define VISUGUI_VECTORSDLG_H
 
 #include "VisuGUI_Prs3dDlg.h"
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 class QGroupBox;
 class QTabWidget;

diff --git a/src/VISUGUI/VisuGUI_ViewExtender.cxx b/src/VISUGUI/VisuGUI_ViewExtender.cxx
index 3dff11344c6d83cf7a3c6335b6c865c3e42e5215..f05361133dea3c2d98788961e941cef0804ad31b 100644 (file)
--- a/src/VISUGUI/VisuGUI_ViewExtender.cxx
+++ b/src/VISUGUI/VisuGUI_ViewExtender.cxx
@@ -30,17 +30,17 @@
 #include "VisuGUI_SegmentationMgr.h"
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_Tools.h"
-#include <VTKViewer_Actor.h>
+#include <gui/VTKViewer_Actor.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
 
 #include <VISU_PipeLine.hxx>
-#include <SUIT_ViewManager.h>
-#include <SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_ViewWindow.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
 
 

diff --git a/src/VISUGUI/VisuGUI_ViewExtender.h b/src/VISUGUI/VisuGUI_ViewExtender.h
index 16303177d1d2963cddc9e1a30785c5e7b9c770ef..2ab6d013c7137672fe269bac92006ab4d0c9ebd8 100644 (file)
--- a/src/VISUGUI/VisuGUI_ViewExtender.h
+++ b/src/VISUGUI/VisuGUI_ViewExtender.h
@@ -28,7 +28,7 @@
 #define VisuGUI_ViewExtender_HeaderFile
 
 #include <CAM_ViewExtender.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 #include <QObject>
 #include <QMap>
 

diff --git a/src/VISUGUI/VisuGUI_ViewTools.cxx b/src/VISUGUI/VisuGUI_ViewTools.cxx
index 65aaeed9e0283746d0a6f58b70479aaf8ad8ca7a..a2fbf8e12d5948cf7580741c899efe7950a2f4fe 100644 (file)
--- a/src/VISUGUI/VisuGUI_ViewTools.cxx
+++ b/src/VISUGUI/VisuGUI_ViewTools.cxx
@@ -28,10 +28,10 @@
 
 #include "VISU_Actor.h"
 
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <SUIT_Desktop.h>
+#include <gui/SUIT_Desktop.h>
 
 namespace VISU 
 {

diff --git a/src/VISUGUI/VisuGUI_ViewTools.h b/src/VISUGUI/VisuGUI_ViewTools.h
index 772d780aed508051c52e9523b6918249d9efacf0..73a8025f44e7026eba856b50f7d4af454ebca31b 100644 (file)
--- a/src/VISUGUI/VisuGUI_ViewTools.h
+++ b/src/VISUGUI/VisuGUI_ViewTools.h
@@ -38,28 +38,28 @@
 
 #include "VISU_Actor.h"
 
-#include "SalomeApp_Module.h"
-#include "SalomeApp_Application.h"
+#include <gui/SalomeApp_Module.h>
+#include <gui/SalomeApp_Application.h>
 
 //#include "VVTK_ViewModel.h"
 //#include "VVTK_ViewWindow.h"
 
-#include "SVTK_Functor.h"
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_Functor.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include "SPlot2d_ViewModel.h"
+#include <gui/SPlot2d_ViewModel.h>
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ViewManager.h"
-#include "SUIT_ViewWindow.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_ViewWindow.h>
 
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 #include <vtkActorCollection.h>
 #include <vtkRenderer.h>

diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc
index 8407799acdfad214e9e1b8d7874fd586871a301c..1defae4dc0050deb204795e7f81022cbca509c43 100644 (file)
--- a/src/VISU_I/VISUConfig.cc
+++ b/src/VISU_I/VISUConfig.cc
@@ -26,16 +26,16 @@
 //
 #include "VISUConfig.hh"
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "SALOMEDSClient_GenericAttribute.hxx"
-#include "SALOMEDSClient_AttributeIOR.hxx"
+#include <kernel/SALOMEDSClient_GenericAttribute.hxx>
+#include <kernel/SALOMEDSClient_AttributeIOR.hxx>
 
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
 #include <QRegExp>
 

diff --git a/src/VISU_I/VISUConfig.hh b/src/VISU_I/VISUConfig.hh
index 27af4103b87bd0efe2b217664aafca35ce2eb8b4..e746eb72ed20930d2f73888c4f29ff0583203c9b 100644 (file)
--- a/src/VISU_I/VISUConfig.hh
+++ b/src/VISU_I/VISUConfig.hh
@@ -36,13 +36,13 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 
-#include "SALOME_NamingService.hxx"
-#include "SALOME_LifeCycleCORBA.hxx"
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
-#include "SALOMEDSClient_SObject.hxx"
-#include "SALOMEDSClient_Study.hxx"
+#include <kernel/SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // QT headers
 #include <QString>

diff --git a/src/VISU_I/VISU_ClippingPlaneMgr.cxx b/src/VISU_I/VISU_ClippingPlaneMgr.cxx
index d1346758877fa226c2873c76e2196e09b826ee92..7dd331fd118655ba6b5e81013758245ca2d70ef4 100644 (file)
--- a/src/VISU_I/VISU_ClippingPlaneMgr.cxx
+++ b/src/VISU_I/VISU_ClippingPlaneMgr.cxx
@@ -25,10 +25,10 @@
 //#include CORBA_SERVER_HEADER(SALOMEDS)
 //#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 
-#include "SALOMEDSClient_GenericAttribute.hxx"
-#include "SALOMEDSClient_AttributeName.hxx"
-#include "SALOMEDSClient_AttributeSequenceOfReal.hxx"
-#include "SALOMEDSClient_AttributeInteger.hxx"
+#include <kernel/SALOMEDSClient_GenericAttribute.hxx>
+#include <kernel/SALOMEDSClient_AttributeName.hxx>
+#include <kernel/SALOMEDSClient_AttributeSequenceOfReal.hxx>
+#include <kernel/SALOMEDSClient_AttributeInteger.hxx>
 
 
 #include <vtkImplicitFunctionCollection.h>

diff --git a/src/VISU_I/VISU_ClippingPlaneMgr.hxx b/src/VISU_I/VISU_ClippingPlaneMgr.hxx
index 09ca4759296eb7f971ea57cccf9b8d94f02244ec..95ed4c4d27eb31a8e0d6c64bc9ba9f0854494af2 100644 (file)
--- a/src/VISU_I/VISU_ClippingPlaneMgr.hxx
+++ b/src/VISU_I/VISU_ClippingPlaneMgr.hxx
@@ -29,7 +29,7 @@
 
 #include "VISU_I.hxx"
 #include "VISUConfig.hh"
-#include "SALOME_Component_i.hxx"
+#include <kernel/SALOME_Component_i.hxx>
 #include "VISU_ColoredPrs3d_i.hh"
 
 #include <vtkPlane.h>

diff --git a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
index adfef8b8d38b15890f874c972feae412c69a1630..dbe7c525bc92089ddfa95246841fc0e52cb48fe2 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
@@ -39,19 +39,19 @@
 
 #include "VISU_PipeLine.hxx"
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
-#include "SVTK_ViewWindow.h"
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <vtkRenderWindow.h>
 
 #include <QtGlobal>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;

diff --git a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
index 539a7912763aec964b6b8dd2484f465b99029a4b..58fbfedc374c150571552f79856e544b796ce288 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
@@ -29,7 +29,7 @@
 #include "VISU_ColoredPrs3dCache_i.hh"
 #include "VISU_ColoredPrs3d_i.hh"
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
 using namespace VISU;
 using namespace std;

diff --git a/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh b/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh
index 40859e8cb46196286f8267e8a0295a0d04d68832..f3e3e23db0715385148100d114fbb1005a44cc84 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh
+++ b/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh
@@ -30,7 +30,7 @@
 #include "VISU_I.hxx"
 #include "VISU_PrsObject_i.hh"
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 namespace VISU
 {

diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc
index 0b984dd03e7c228ea7909a1dd4410ebb7c272282..1b12dcea9ffcff51e7f23771274a0831c11eecbe 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3d_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc
@@ -32,8 +32,8 @@
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <strstream>
 #include <vtkMapper.h>

diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx
index 262d93996bbb7ef77bf81f8a9d28a2b998b4a3ef..592629a4d83ae2eb10efe095f8dc0f72af7da490 100644 (file)
--- a/src/VISU_I/VISU_CorbaMedConvertor.cxx
+++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx
@@ -32,10 +32,10 @@
 
 #include <boost/tuple/tuple.hpp>
 
-#include "ReceiverFactory.hxx"
-#include "MED_SliceArray.hxx"
+#include <kernel/ReceiverFactory.hxx>
+#include <med/MED_SliceArray.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #define USER_INTERLACE MED_FULL_INTERLACE
 

diff --git a/src/VISU_I/VISU_CutLinesBase_i.cc b/src/VISU_I/VISU_CutLinesBase_i.cc
index 2a256794ef0cdba6b47dc86b33d17b88c32be356..6d9232c242287716b50c6c2be3ce8cc2fd6df89e 100644 (file)
--- a/src/VISU_I/VISU_CutLinesBase_i.cc
+++ b/src/VISU_I/VISU_CutLinesBase_i.cc
@@ -32,7 +32,7 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_PipeLineUtils.hxx"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <vtkAppendPolyData.h>
 

diff --git a/src/VISU_I/VISU_CutLines_i.cc b/src/VISU_I/VISU_CutLines_i.cc
index a1dccb01ee4899bcca00e57490c7971d14125ebd..299c0a1f8d5845812f601992d096afe931dcf729 100644 (file)
--- a/src/VISU_I/VISU_CutLines_i.cc
+++ b/src/VISU_I/VISU_CutLines_i.cc
@@ -33,8 +33,8 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_PipeLineUtils.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkAppendPolyData.h>
 

diff --git a/src/VISU_I/VISU_CutPlanes_i.cc b/src/VISU_I/VISU_CutPlanes_i.cc
index c9411b389c583869fcd787136ca34860ffe58b69..a5a8a1c2c1ad3d0b5e7f5acb32c6186a84c4dfef 100644 (file)
--- a/src/VISU_I/VISU_CutPlanes_i.cc
+++ b/src/VISU_I/VISU_CutPlanes_i.cc
@@ -32,8 +32,8 @@
 #include "VISU_Result_i.hh"
 #include "VISU_Actor.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;

diff --git a/src/VISU_I/VISU_CutSegment_i.cc b/src/VISU_I/VISU_CutSegment_i.cc
index 4e01b20bbe909c375cf635c681f9222a3a23a94f..9666171650662ff4e43b5bf7e391c32a6129b9f4 100644 (file)
--- a/src/VISU_I/VISU_CutSegment_i.cc
+++ b/src/VISU_I/VISU_CutSegment_i.cc
@@ -32,8 +32,8 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_PipeLineUtils.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkAppendPolyData.h>
 

diff --git a/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc
index 8fa94e4d2e4146fdce912d95d3f65e3ee09e2754..b8b98b4eea80e01636b21c0e6518d4d5ee3bfecb 100644 (file)
--- a/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc
+++ b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc
@@ -32,8 +32,8 @@
 #include "VISU_DeformedShapeAndScalarMapPL.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkUnstructuredGrid.h>
 #include <vtkProperty.h>

diff --git a/src/VISU_I/VISU_DeformedShape_i.cc b/src/VISU_I/VISU_DeformedShape_i.cc
index fa280ebf1af303c12ec38d2e2f48824a9e20a181..26059a6f514cb6ee4f31dc917ae9b0c820844e45 100644 (file)
--- a/src/VISU_I/VISU_DeformedShape_i.cc
+++ b/src/VISU_I/VISU_DeformedShape_i.cc
@@ -33,8 +33,8 @@
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkDataSetMapper.h>
 #include <vtkProperty.h>

diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc
index e07a785f600e5951e2e1d30a395a631ae8e08258..409512d7e9295e2776cced01c5b9a331e626d836 100644 (file)
--- a/src/VISU_I/VISU_DumpPython.cc
+++ b/src/VISU_I/VISU_DumpPython.cc
@@ -46,7 +46,7 @@
 #include "VISU_ColoredPrs3dCache_i.hh"
 #include "VISU_ColoredPrs3dHolder_i.hh"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <cctype>
 #include <strstream>

diff --git a/src/VISU_I/VISU_Evolution.cxx b/src/VISU_I/VISU_Evolution.cxx
index 75e971cd4a72634b0991657d75ad59b58309aa19..0d5486f5ec1e3bd9e8281cb73d1b2dbef370c5b0 100644 (file)
--- a/src/VISU_I/VISU_Evolution.cxx
+++ b/src/VISU_I/VISU_Evolution.cxx
@@ -35,12 +35,12 @@
 #include <VISU_Structures_impl.hxx>
 #include <VISU_VTKTypeList.hxx>
 
-#include <SUIT_Session.h>
+#include <gui/SUIT_Session.h>
 
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <SALOME_Event.h>
+#include <gui/SALOME_Event.h>
 
 //------------------------------------------------------------------------
 template<int EDataType> bool ProcessValForTime( VISU::PValForTimeImpl theValForTime,

diff --git a/src/VISU_I/VISU_Evolution.h b/src/VISU_I/VISU_Evolution.h
index b40e9aec0a331984470172859b89a83df5759a37..0a6a86558603db00ad6060740f7d36431bfc0b81 100644 (file)
--- a/src/VISU_I/VISU_Evolution.h
+++ b/src/VISU_I/VISU_Evolution.h
@@ -28,8 +28,8 @@
 
 #include "VISUConfig.hh"
 
-#include <VISU_ConvertorDef_impl.hxx>
-#include <SALOMEDSClient_Study.hxx>
+#include "VISU_ConvertorDef_impl.hxx"
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 #include <QList>
 #include <QMap>

diff --git a/src/VISU_I/VISU_GaussPoints_i.cc b/src/VISU_I/VISU_GaussPoints_i.cc
index ac8886f350d588e70802a5e8163d7b9b4e41fc21..0f17745379117ea3a405587cdac073061cfa24a9 100644 (file)
--- a/src/VISU_I/VISU_GaussPoints_i.cc
+++ b/src/VISU_I/VISU_GaussPoints_i.cc
@@ -39,7 +39,7 @@
 #include "VISU_LookupTable.hxx"
 #include "VISU_MedConvertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include "VISU_PipeLineUtils.hxx"
 

diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index 3c2304e0011a8e114c541bf65283c383072ba0c0..64d0f6a4a14e649bdc82b1265a163a8e6c2afac6 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -44,23 +44,23 @@
 
 #include "VISU_Actor.h"
 
-#include "HDFascii.hxx"
-#include "SALOMEDS_Tool.hxx"
+#include <kernel/HDFascii.hxx>
+#include <kernel/SALOMEDS_Tool.hxx>
 
-#include "SALOMEDSClient_AttributeName.hxx"
-#include "SALOMEDSClient_AttributePixMap.hxx"
+#include <kernel/SALOMEDSClient_AttributeName.hxx>
+#include <kernel/SALOMEDSClient_AttributePixMap.hxx>
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewWindow.h"
-#include "SALOME_Event.h"
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_Event.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 // IDL Headers
 #include <omnithread.h>
@@ -80,7 +80,7 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
 
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/Utils_ExceptHandlers.hxx>
 UNEXPECT_CATCH(SalomeException, SALOME::SALOME_Exception);
 
 // STL Includes

diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh
index 32eec815397bb2a4119dd0bd7eb361887f4326cb..6b4fa2a60a1836a9abc55d33bb28b27b6197112e 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.hh
+++ b/src/VISU_I/VISU_Gen_i.hh
@@ -29,8 +29,8 @@
 #include "VISUConfig.hh"
 
 #include "VISU_I.hxx"
-#include "SALOME_Component_i.hxx"
-#include "SALOME_NamingService.hxx"
+#include <kernel/SALOME_Component_i.hxx>
+#include <kernel/SALOME_NamingService.hxx>
 #include "VISU_ColoredPrs3d_i.hh"
 #include "VISU_ClippingPlaneMgr.hxx"
 

diff --git a/src/VISU_I/VISU_IsoSurfaces_i.cc b/src/VISU_I/VISU_IsoSurfaces_i.cc
index 906aef86d74b9fea8fb56422a2d7ef7fdc3ccb5e..215c842ab395fd63e5308d9a56e98e45a883c489 100644 (file)
--- a/src/VISU_I/VISU_IsoSurfaces_i.cc
+++ b/src/VISU_I/VISU_IsoSurfaces_i.cc
@@ -33,8 +33,8 @@
 #include "VISU_ScalarMapAct.h"
 #include "VISU_IsoSurfActor.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 #include <vtkMapper.h>
 
 #ifdef _DEBUG_

diff --git a/src/VISU_I/VISU_Mesh_i.cc b/src/VISU_I/VISU_Mesh_i.cc
index f703ca22a779dffc96c7423357420fedaa3ad688..c916ffed2c586e4d9761285d7b0bdc139e5cf245 100644 (file)
--- a/src/VISU_I/VISU_Mesh_i.cc
+++ b/src/VISU_I/VISU_Mesh_i.cc
@@ -34,9 +34,9 @@
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;

diff --git a/src/VISU_I/VISU_MultiResult_i.cc b/src/VISU_I/VISU_MultiResult_i.cc
index 42ef355fa59a6887496166a1384afb5aea9116a1..45435f48ea82f37623b15ea422e103779bbc8104 100644 (file)
--- a/src/VISU_I/VISU_MultiResult_i.cc
+++ b/src/VISU_I/VISU_MultiResult_i.cc
@@ -32,12 +32,12 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
-#include "MULTIPR_Obj.hxx"
-#include "MULTIPR_API.hxx"
-#include "MULTIPR_Exceptions.hxx"
+#include <med/MULTIPR_Obj.hxx>
+#include <med/MULTIPR_API.hxx>
+#include <med/MULTIPR_Exceptions.hxx>
 
-#include "SALOMEDS_Tool.hxx"
-#include "HDFascii.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
+#include <kernel/HDFascii.hxx>
 
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>

diff --git a/src/VISU_I/VISU_MultiResult_i.hh b/src/VISU_I/VISU_MultiResult_i.hh
index 1bbfad1b7c9740d5a14ec06e22ca4aaaac8d6c17..d7b74fda0f46b63adf614d00a5dabff0a38eb729 100644 (file)
--- a/src/VISU_I/VISU_MultiResult_i.hh
+++ b/src/VISU_I/VISU_MultiResult_i.hh
@@ -33,7 +33,7 @@
 #  define RESULT_CLASS_NAME MultiResult_i
 
 #include "VISU_Result_i.hh"
-#include "MULTIPR_Obj.hxx"
+#include <med/MULTIPR_Obj.hxx>
 
 #include <set>
 

diff --git a/src/VISU_I/VISU_Plot3D_i.cc b/src/VISU_I/VISU_Plot3D_i.cc
index cea07c35fbd21cd97246f2b97f24952e1f19b2e3..ff8cd1164279e90b6380fdecd0c57c75980e48f4 100644 (file)
--- a/src/VISU_I/VISU_Plot3D_i.cc
+++ b/src/VISU_I/VISU_Plot3D_i.cc
@@ -26,8 +26,8 @@
 #include "VISU_Plot3DPL.hxx"
 #include "VISU_Actor.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;

diff --git a/src/VISU_I/VISU_PointMap3d_i.cc b/src/VISU_I/VISU_PointMap3d_i.cc
index f0533c30c9452035f86ff053b9c759b764c5b3dd..32ab674c9fc0df30dc748b97fa8b4102628113d7 100644 (file)
--- a/src/VISU_I/VISU_PointMap3d_i.cc
+++ b/src/VISU_I/VISU_PointMap3d_i.cc
@@ -31,18 +31,18 @@
 #include "VISU_Result_i.hh"
 #include "VISU_ViewManager_i.hh"
 #include "VISU_ScalarBarActor.hxx"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 #include "VISU_Prs3dUtils.hh"
-#include "SPlot2d_Curve.h"
+#include <gui/SPlot2d_Curve.h>
 #include "VISU_PipeLineUtils.hxx"
 
 #include "VISU_TableReader.hxx"
 #include "VISU_ConvertorUtils.hxx"
 #include "VISU_DeformedGridPL.hxx"
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 #include "VISU_Gen_i.hh"
 
 #include <vtkTextProperty.h>

diff --git a/src/VISU_I/VISU_PointMap3d_i.hh b/src/VISU_I/VISU_PointMap3d_i.hh
index 547191d8b5624413a03fd2714366263930070632..68a77f864c74e21e11f8e3de111295d065dafa48 100644 (file)
--- a/src/VISU_I/VISU_PointMap3d_i.hh
+++ b/src/VISU_I/VISU_PointMap3d_i.hh
@@ -28,7 +28,7 @@
 #define VISU_PointMap3d_i_HeaderFile
 
 #include "VISU_PrsObject_i.hh"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 #include "VISU_TableReader.hxx"
 #include "VISU_PointMap3dActor.h"

diff --git a/src/VISU_I/VISU_Prs3dUtils.cc b/src/VISU_I/VISU_Prs3dUtils.cc
index 35685d9fe12589c69518e1eaee8ec9aa6d1d5bbc..0df479486370315c68e2130fd8f9e695c9bb5a66 100644 (file)
--- a/src/VISU_I/VISU_Prs3dUtils.cc
+++ b/src/VISU_I/VISU_Prs3dUtils.cc
@@ -25,8 +25,8 @@
 //  Module : VISU
 //
 #include "VISU_Prs3dUtils.hh"
-#include "SalomeApp_Study.h"
-#include "SALOME_Event.h"
+#include <gui/SalomeApp_Study.h>
+#include <gui/SALOME_Event.h>
 
 
 namespace VISU

diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc
index 17468de966fc0c5e2384614cecb7901f5d3a7fbc..d21fe0669141eda8af837c1575ebd7201d7d05ea 100644 (file)
--- a/src/VISU_I/VISU_Prs3d_i.cc
+++ b/src/VISU_I/VISU_Prs3d_i.cc
@@ -31,9 +31,9 @@
 #include "VISU_Result_i.hh"
 #include "VISU_Actor.h"
 
-#include "SALOME_Event.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_MessageBox.h"
+#include <gui/SALOME_Event.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
 
 #include <vtkActorCollection.h>
 #include <vtkUnstructuredGrid.h>

diff --git a/src/VISU_I/VISU_Prs3d_i.hh b/src/VISU_I/VISU_Prs3d_i.hh
index 6f54053ccfdbd1d2c715a54c38fca958b70a2bf8..e6bc967ca87aca33f780912340607f128a7f31c4 100644 (file)
--- a/src/VISU_I/VISU_Prs3d_i.hh
+++ b/src/VISU_I/VISU_Prs3d_i.hh
@@ -32,11 +32,11 @@
 #include "VISU_ActorFactory.h"
 #include "VISU_ConvertorDef.hxx"
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 #include "SALOME_GenericObjPointer.hh"
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 #include <vtkSmartPointer.h>
 #include <vtkTimeStamp.h>

diff --git a/src/VISU_I/VISU_ResultUtils.cc b/src/VISU_I/VISU_ResultUtils.cc
index 640dd24edfa9b91ec6ef0caf8a72510e8ea3932e..e52997ff52be8152d495244dcb9be3523953ca01 100644 (file)
--- a/src/VISU_I/VISU_ResultUtils.cc
+++ b/src/VISU_I/VISU_ResultUtils.cc
@@ -26,10 +26,10 @@
 //
 #include "VISU_ResultUtils.hh"
 
-#include "SUIT_Session.h"
-#include "SALOME_Event.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SALOME_Event.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
 #include "VISU_Convertor.hxx"
 #include "VISU_ConvertorUtils.hxx"

diff --git a/src/VISU_I/VISU_ResultUtils.hh b/src/VISU_I/VISU_ResultUtils.hh
index 639e22a0e203765ed6ce195363e4c04d734882f1..8acf84b03558f39dc15fcfb348372546ea16af39 100644 (file)
--- a/src/VISU_I/VISU_ResultUtils.hh
+++ b/src/VISU_I/VISU_ResultUtils.hh
@@ -28,7 +28,7 @@
 #define __VISU_RESULT_UTILS_H__
 
 #include "VISU_Result_i.hh"
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
 #include <set>
 

diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc
index 3099bec2751cc4a89e897c8859fc6f8e2020b882..0d56744aaf20799320f1998fd0a2305b0e38e86c 100644 (file)
--- a/src/VISU_I/VISU_Result_i.cc
+++ b/src/VISU_I/VISU_Result_i.cc
@@ -33,18 +33,18 @@
 #include "VISU_ConvertorUtils.hxx"
 #include "VISU_PipeLine.hxx"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SALOMEDS_Tool.hxx"
-#include "HDFascii.hxx"
-#include "Basics_Utils.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
+#include <kernel/HDFascii.hxx>
+#include <kernel/Basics_Utils.hxx>
 
-#include "SUIT_Session.h"
-#include "SALOME_Event.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SALOME_Event.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
-#include "MED_Factory.hxx"
+#include <med/MED_Factory.hxx>
 
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>

diff --git a/src/VISU_I/VISU_Result_i.hh b/src/VISU_I/VISU_Result_i.hh
index 8871cfccfaccace36d45a09fe954967d8f6694a0..8008cb5f0eab912d14770edc5b1c443108e26d88 100644 (file)
--- a/src/VISU_I/VISU_Result_i.hh
+++ b/src/VISU_I/VISU_Result_i.hh
@@ -29,10 +29,10 @@
 
 #include "VISU_PrsObject_i.hh"
 #include "VISU_BoostSignals.h"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
-#include "SALOME_Event.h"
-#include "VTKViewer.h"
+#include <gui/SALOME_Event.h>
+#include <gui/VTKViewer.h>
 
 #include <boost/shared_ptr.hpp>
 #include <gp_Dir.hxx>

diff --git a/src/VISU_I/VISU_ScalarMap_i.cc b/src/VISU_I/VISU_ScalarMap_i.cc
index 8b0326d6c5e00f79fd41f8afb1f63286496cf4f6..e1385d1cd119ee32ebc6e04a99c6daf5c0e67c65 100644 (file)
--- a/src/VISU_I/VISU_ScalarMap_i.cc
+++ b/src/VISU_I/VISU_ScalarMap_i.cc
@@ -37,12 +37,12 @@
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SUIT_Session.h"
-#include "SALOME_Event.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SALOME_Event.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
 #include <vtkDataSetMapper.h>
 #include <vtkTextProperty.h>

diff --git a/src/VISU_I/VISU_StreamLines_i.cc b/src/VISU_I/VISU_StreamLines_i.cc
index de15f7729916608e53938e06b298c8b8fc899e96..93f4d974658dcca9237d26a08cd12cf8a7cb42d1 100644 (file)
--- a/src/VISU_I/VISU_StreamLines_i.cc
+++ b/src/VISU_I/VISU_StreamLines_i.cc
@@ -32,8 +32,8 @@
 #include "VISU_StreamLinesPL.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkDataSetMapper.h>
 #include <vtkAppendFilter.h>

diff --git a/src/VISU_I/VISU_Table_i.cc b/src/VISU_I/VISU_Table_i.cc
index fa9e334a16874830a82516541661e5df93a38e46..e175e88d74c2b628459dd9b6fc1386734ecae8c7 100644 (file)
--- a/src/VISU_I/VISU_Table_i.cc
+++ b/src/VISU_I/VISU_Table_i.cc
@@ -31,15 +31,15 @@
 #include "VISU_Result_i.hh"
 #include "VISU_ViewManager_i.hh"
 
-#include "SALOME_Event.h"
-#include "SPlot2d_Curve.h"
+#include <gui/SALOME_Event.h>
+#include <gui/SPlot2d_Curve.h>
 
 #include "VISU_TableReader.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 

diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index c2b29a6858ab4084fd4471b03e950231d14714ec..120b210fddb920331501c2e5354a688e074cc12a 100644 (file)
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -52,22 +52,22 @@
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_Actor.h"
 
-#include "SalomeApp_Study.h"
+#include <gui/SalomeApp_Study.h>
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Application.h"
-#include "SUIT_Session.h"
-#include "SUIT_Study.h"
-#include "SUIT_MessageBox.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Study.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include "SALOMEDSClient_AttributeString.hxx"
-#include "SALOMEDSClient_AttributeName.hxx"
+#include <kernel/SALOMEDSClient_AttributeString.hxx>
+#include <kernel/SALOMEDSClient_AttributeName.hxx>
 
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <QPixmap>
 #include <QImage>

diff --git a/src/VISU_I/VISU_Tools.cxx b/src/VISU_I/VISU_Tools.cxx
index e2963b9dccb81e5da127f5ef2f629976eb91736d..28869f9f6887589dbd2c0d96863510df6c282375 100644 (file)
--- a/src/VISU_I/VISU_Tools.cxx
+++ b/src/VISU_I/VISU_Tools.cxx
@@ -29,14 +29,14 @@
 #include "VISU_Table_i.hh"
 #include "VISU_ViewManager_i.hh"
 
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
-#include <SPlot2d_ViewModel.h>
-#include <Plot2d_ViewFrame.h>
-#include <Plot2d_ViewManager.h>
+#include <gui/SPlot2d_ViewModel.h>
+#include <gui/Plot2d_ViewFrame.h>
+#include <gui/Plot2d_ViewManager.h>
 
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 //=============================================================================
 namespace VISU

diff --git a/src/VISU_I/VISU_Tools.h b/src/VISU_I/VISU_Tools.h
index bae032d8aa04ed22c244fe241c593bab90684e0b..76078e0a299c3472e855a52fca86aef47662c3bb 100644 (file)
--- a/src/VISU_I/VISU_Tools.h
+++ b/src/VISU_I/VISU_Tools.h
@@ -29,7 +29,7 @@
 #include "VISUConfig.hh"
 #include "VISU_I.hxx"
 
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 class SPlot2d_Curve;
 class Plot2d_ViewFrame;

diff --git a/src/VISU_I/VISU_Vectors_i.cc b/src/VISU_I/VISU_Vectors_i.cc
index d2d4cfd345029695e0608d035fafcddcf080325e..e7bd3ac52836012081ff684a8eb22655fc2db682 100644 (file)
--- a/src/VISU_I/VISU_Vectors_i.cc
+++ b/src/VISU_I/VISU_Vectors_i.cc
@@ -33,8 +33,8 @@
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkProperty.h>
 

diff --git a/src/VISU_I/VISU_ViewManager_i.cc b/src/VISU_I/VISU_ViewManager_i.cc
index 0bc32345878ea84cd9e60b52587437417965c0e6..159e647ab2cc0fb4e1b980de8c58511e601efe37 100644 (file)
--- a/src/VISU_I/VISU_ViewManager_i.cc
+++ b/src/VISU_I/VISU_ViewManager_i.cc
@@ -32,29 +32,29 @@
 #include "VISU_Actor.h"
 #include "VISU_ActorFactory.h"
 
-#include "SUIT_Tools.h"
-#include "SUIT_Session.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ViewManager.h"
-
-#include "SVTK_ViewWindow.h"
-#include "SVTK_ViewModel.h"
-#include "VTKViewer_Algorithm.h"
-#include "SPlot2d_Curve.h"
-#include "Plot2d_ViewFrame.h"
-#include "Plot2d_ViewWindow.h"
-#include "Plot2d_ViewModel.h"
-
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-
-#include "SALOME_Event.h"
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
-
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SPlot2d_Curve.h>
+#include <gui/Plot2d_ViewFrame.h>
+#include <gui/Plot2d_ViewWindow.h>
+#include <gui/Plot2d_ViewModel.h>
+
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SALOME_Event.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
 
 #include <vtkCamera.h>
 #include <vtkRenderer.h>

diff --git a/src/VISU_I/VISU_View_i.cc b/src/VISU_I/VISU_View_i.cc
index 89ebe9d23e1db20499d70ae7e18d137f0c1f4919..783a054c87d00e810fe5ca4cbe8a4ea9ea5af7e9 100644 (file)
--- a/src/VISU_I/VISU_View_i.cc
+++ b/src/VISU_I/VISU_View_i.cc
@@ -40,27 +40,27 @@
 #include "VISU_PointMap3dActor.h"
 #include "VISU_DeformedGridPL.hxx"
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ViewManager.h"
-#include "SUIT_Tools.h"
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_Tools.h>
 
-#include "STD_MDIDesktop.h"
-#include "STD_TabDesktop.h"
+#include <gui/STD_MDIDesktop.h>
+#include <gui/STD_TabDesktop.h>
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_ViewModel.h"
-#include "VTKViewer_Algorithm.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "SPlot2d_ViewModel.h"
-#include "Plot2d_ViewFrame.h"
+#include <gui/SPlot2d_ViewModel.h>
+#include <gui/Plot2d_ViewFrame.h>
 
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <QtxWorkstack.h>
-#include <QtxWorkspace.h>
+#include <gui/QtxWorkstack.h>
+#include <gui/QtxWorkspace.h>
 
 #include <QWorkspace>
 #include <QImage>

diff --git a/src/VISU_I/VISU_View_i.hh b/src/VISU_I/VISU_View_i.hh
index 6e644af50ef50c879db80659027123f4d4e0c8c5..4117945e145bb0c260ec927baab4926d706a8824 100644 (file)
--- a/src/VISU_I/VISU_View_i.hh
+++ b/src/VISU_I/VISU_View_i.hh
@@ -28,7 +28,7 @@
 #define VISU_View_i_HeaderFile
 
 #include "VISUConfig.hh"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 class QWidget;
 

diff --git a/src/VVTK/VVTK_ImageWriter.cxx b/src/VVTK/VVTK_ImageWriter.cxx
index 326498f2654b1b5d8591eaa1a3e7c977b26b4e82..b84acb538e5baae0bf9f391bd0eb6f96a76c9746 100755 (executable)
--- a/src/VVTK/VVTK_ImageWriter.cxx
+++ b/src/VVTK/VVTK_ImageWriter.cxx
@@ -29,7 +29,7 @@
 
 #include <QSemaphore>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <vtkImageData.h>
 #include <vtkImageClip.h>

diff --git a/src/VVTK/VVTK_ImageWriterMgr.cxx b/src/VVTK/VVTK_ImageWriterMgr.cxx
index bba9094aaf483e0f728d75da2ae32af51824a9cb..a33c77e8b2799731a05aedf1ee70e74ceb003e33 100755 (executable)
--- a/src/VVTK/VVTK_ImageWriterMgr.cxx
+++ b/src/VVTK/VVTK_ImageWriterMgr.cxx
@@ -32,7 +32,7 @@
 
 #include <QSemaphore>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <limits>
 

diff --git a/src/VVTK/VVTK_InteractorStyle.cxx b/src/VVTK/VVTK_InteractorStyle.cxx
index c50c8cd030023a268926a002c42ba2e57c9bb975..3809e1029a9a5154ff379299370a7fb1eeefe94a 100644 (file)
--- a/src/VVTK/VVTK_InteractorStyle.cxx
+++ b/src/VVTK/VVTK_InteractorStyle.cxx
@@ -27,7 +27,7 @@
 //
 #include "VVTK_InteractorStyle.h"
 #include "VISU_GaussPtsSettings.h"
-#include "SVTK_Selector.h"
+#include <gui/SVTK_Selector.h>
 #include "VISU_Event.h" 
 
 #include <vtkObjectFactory.h>

diff --git a/src/VVTK/VVTK_InteractorStyle.h b/src/VVTK/VVTK_InteractorStyle.h
index 86702bedfca9af4a30f3c5349c9d01966f43d47d..0c379d4e475f394b23eda24c63215218bdfb046e 100644 (file)
--- a/src/VVTK/VVTK_InteractorStyle.h
+++ b/src/VVTK/VVTK_InteractorStyle.h
@@ -31,7 +31,7 @@
 
 #include "VVTK.h"
 
-#include "SVTK_InteractorStyle.h"
+#include <gui/SVTK_InteractorStyle.h>
 //
 //-------------------------------------------
 //! Control the value of increment in new style of interaction.

diff --git a/src/VVTK/VVTK_MainWindow.cxx b/src/VVTK/VVTK_MainWindow.cxx
index b032440853c42d704e001e573b8db04b71074f93..5442360c8759a861e54d11f7941190f89332f1d6 100644 (file)
--- a/src/VVTK/VVTK_MainWindow.cxx
+++ b/src/VVTK/VVTK_MainWindow.cxx
@@ -33,22 +33,22 @@
 #include "VISU_GaussPtsAct.h"
 #include "VISU_Event.h" 
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
 #include "VVTK_Renderer.h"
 #include "VVTK_PickingDlg.h"
 #include "VVTK_SegmentationCursorDlg.h"
 
-#include "SUIT_Application.h"
-#include "SUIT_Session.h"
-#include "SUIT_Tools.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Accel.h"
-#include "SUIT_MessageBox.h"
-#include "QtxAction.h"
-#include "QtxMultiAction.h"
-#include "QtxActionToolMgr.h"
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Accel.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/QtxAction.h>
+#include <gui/QtxMultiAction.h>
+#include <gui/QtxActionToolMgr.h>
 
 #include <QImage>
 #include <QToolBar>

diff --git a/src/VVTK/VVTK_PickingDlg.cxx b/src/VVTK/VVTK_PickingDlg.cxx
index 37730f7f02d804ec3186c9596174e5fc7e79f63b..693241368b4518f605121498c8a19280229c9abb 100644 (file)
--- a/src/VVTK/VVTK_PickingDlg.cxx
+++ b/src/VVTK/VVTK_PickingDlg.cxx
@@ -29,18 +29,18 @@
 #include "VISU_PickingSettings.h"
 #include "VISU_GaussPointsPL.hxx"
 
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
-#include "SVTK_Selector.h"
+#include <gui/SVTK_Selector.h>
 #include "SVTK_MainWindow.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <gui/SVTK_RenderWindowInteractor.h>
 
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
 
 #include <vtkActorCollection.h>
 #include <vtkCallbackCommand.h>
@@ -49,7 +49,7 @@
 #include <vtkGenericRenderWindowInteractor.h>
 #include <vtkSmartPointer.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <QCheckBox>
 #include <QColorDialog>
@@ -62,12 +62,12 @@
 #include <QKeyEvent>
 #include <QIntValidator>
 
-#include "QtxAction.h"
-#include "QtxDoubleSpinBox.h"
-#include "QtxIntSpinBox.h"
-#include "QtxColorButton.h"
+#include <gui/QtxAction.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
+#include <gui/QtxColorButton.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
 namespace
 {

diff --git a/src/VVTK/VVTK_PickingDlg.h b/src/VVTK/VVTK_PickingDlg.h
index 0b06abaec813037f3bfc4c29f22be607baa4c90a..9787f5c43419172f3f9467261144d8f25aa193b9 100644 (file)
--- a/src/VVTK/VVTK_PickingDlg.h
+++ b/src/VVTK/VVTK_PickingDlg.h
@@ -26,7 +26,7 @@
 #ifndef VVTK_PICKINGDLG_H
 #define VVTK_PICKINGDLG_H
 
-#include "SVTK_DialogBase.h"
+#include <gui/SVTK_DialogBase.h>
 
 #include <vtkObject.h>
 #include <vtkSmartPointer.h>

diff --git a/src/VVTK/VVTK_PrimitiveBox.cxx b/src/VVTK/VVTK_PrimitiveBox.cxx
index 67023c5cd714b17118e8b9a9075cc0e9676432db..e2db2f2411bef34802802fd059035b74e790def0 100644 (file)
--- a/src/VVTK/VVTK_PrimitiveBox.cxx
+++ b/src/VVTK/VVTK_PrimitiveBox.cxx
@@ -28,11 +28,11 @@
 
 #include "VISU_OpenGLPointSpriteMapper.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "QtxDoubleSpinBox.h"
-#include "QtxIntSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
 
 #include <QLayout>
 #include <QLabel>

diff --git a/src/VVTK/VVTK_Recorder.cxx b/src/VVTK/VVTK_Recorder.cxx
index 9ef0f6dcfae933916f87e56a1c34b2eb6b04e3b8..440c4076b2437155123f531a05905843e0502e4e 100755 (executable)
--- a/src/VVTK/VVTK_Recorder.cxx
+++ b/src/VVTK/VVTK_Recorder.cxx
@@ -51,7 +51,7 @@
 #include <QFileInfo>
 #include <QDir>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;

diff --git a/src/VVTK/VVTK_RecorderDlg.cxx b/src/VVTK/VVTK_RecorderDlg.cxx
index 5b68652d85a0ebe4e9666355d7e962c365b51664..026877f364e6c24d8052ee6a523167fed4f837b4 100644 (file)
--- a/src/VVTK/VVTK_RecorderDlg.cxx
+++ b/src/VVTK/VVTK_RecorderDlg.cxx
@@ -27,17 +27,17 @@
 #include "VVTK_RecorderDlg.h"
 #include "VVTK_Recorder.h"
 
-#include "SUIT_FileDlg.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "QtxDoubleSpinBox.h"
-#include "QtxIntSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
 #include <QCheckBox>
 #include <QComboBox>

diff --git a/src/VVTK/VVTK_Renderer.cxx b/src/VVTK/VVTK_Renderer.cxx
index 23cc1c54c5716eb7f409195d054e075480a462cb..b60977fe0118a9147a1e9c282b0c39592508aa4e 100644 (file)
--- a/src/VVTK/VVTK_Renderer.cxx
+++ b/src/VVTK/VVTK_Renderer.cxx
@@ -33,7 +33,7 @@
 #include "VISU_PlanesWidget.hxx"
 #include "VISU_SphereWidget.hxx"
 
-#include <VTKViewer_Algorithm.h>
+#include <gui/VTKViewer_Algorithm.h>
 
 #include <vtkObjectFactory.h>
 #include <vtkProperty.h>
@@ -66,7 +66,7 @@
 #include <vtkTextProperty.h>
 #include <vtkRenderer.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;

diff --git a/src/VVTK/VVTK_Renderer.h b/src/VVTK/VVTK_Renderer.h
index ae558db242c972b661097131c26101940ef83080..660ad8356dda95a534c56b10ddc9c960110a8828 100644 (file)
--- a/src/VVTK/VVTK_Renderer.h
+++ b/src/VVTK/VVTK_Renderer.h
@@ -30,7 +30,7 @@
 
 #include "VVTK.h"
 
-#include "SVTK_Renderer.h"
+#include <gui/SVTK_Renderer.h>
 
 class VISU_WidgetCtrl;
 class VISU_InsideCursorSettings;

diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.cxx b/src/VVTK/VVTK_SegmentationCursorDlg.cxx
index 5b927c7ea9d259c2e371b86e8aa8c1e0035e93cb..1f2108e270b32565ee55fb2bee9fdd85f3ba1368 100644 (file)
--- a/src/VVTK/VVTK_SegmentationCursorDlg.cxx
+++ b/src/VVTK/VVTK_SegmentationCursorDlg.cxx
@@ -37,13 +37,13 @@
 #include "VISU_GaussPointsPL.hxx"
 #include "VISU_OpenGLPointSpriteMapper.hxx"
 
-#include <LightApp_Application.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include <SVTK_RenderWindowInteractor.h>
-#include <VTKViewer_Algorithm.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
+#include <gui/VTKViewer_Algorithm.h>
 
 #include <vtkActorCollection.h>
 #include <vtkCallbackCommand.h>
@@ -53,7 +53,7 @@
 #include <vtkSmartPointer.h>
 #include <vtkImageData.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <QButtonGroup>
 #include <QColorDialog>
@@ -67,10 +67,10 @@
 #include <QRadioButton>
 #include <QTabWidget>
 
-#include <QtxAction.h>
-#include <QtxDoubleSpinBox.h>
-#include <QtxIntSpinBox.h>
-#include <CAM_Module.h>
+#include <gui/QtxAction.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
+#include <gui/CAM_Module.h>
 
 //----------------------------------------------------------------
 VVTK_SegmentationCursorDlg::VVTK_SegmentationCursorDlg( QWidget* parent, const char* name )

diff --git a/src/VVTK/VVTK_SizeBox.cxx b/src/VVTK/VVTK_SizeBox.cxx
index 7d040131396351c969e42fa9f3c0e52b35978fc4..27a4872b8a1f9cd61095d215e4c43fb923077943 100644 (file)
--- a/src/VVTK/VVTK_SizeBox.cxx
+++ b/src/VVTK/VVTK_SizeBox.cxx
@@ -26,12 +26,12 @@
 //
 #include "VVTK_SizeBox.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include <QtxDoubleSpinBox.h>
-#include <QtxIntSpinBox.h>
-#include <QtxColorButton.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
+#include <gui/QtxColorButton.h>
 
 #include <QLayout>
 #include <QLabel>

diff --git a/src/VVTK/VVTK_ViewManager.cxx b/src/VVTK/VVTK_ViewManager.cxx
index 2c9f851263715dd96e6ed1fe2796639c24c3a025..a1feabf8f8d5b5141fd1e57ff46115c38ad9311d 100644 (file)
--- a/src/VVTK/VVTK_ViewManager.cxx
+++ b/src/VVTK/VVTK_ViewManager.cxx
@@ -22,7 +22,7 @@
 #include "VVTK_ViewManager.h"
 #include "VVTK_ViewModel.h"
 
-#include <SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewWindow.h>
 
 int VVTK_ViewManager::_VVTKViewMgr_Id = 0;
 

diff --git a/src/VVTK/VVTK_ViewManager.h b/src/VVTK/VVTK_ViewManager.h
index 5bc84e43a763ae33c36a6ef9df174a03970d9827..630aa6f7c5f9c9da78cd69f60387f1ce7e85b424 100644 (file)
--- a/src/VVTK/VVTK_ViewManager.h
+++ b/src/VVTK/VVTK_ViewManager.h
@@ -22,7 +22,7 @@
 #ifndef VVTK_VIEWMANAGER_H
 #define VVTK_VIEWMANAGER_H
 
-#include "SVTK_ViewManager.h"
+#include <gui/SVTK_ViewManager.h>
 #include "VVTK.h"
 
 class SUIT_Desktop;

diff --git a/src/VVTK/VVTK_ViewModel.cxx b/src/VVTK/VVTK_ViewModel.cxx
index a06b2ca38081ff2001f7eaf484ff841eb119338a..92cb2531fd740be9551300b4cdecebbd18d384de 100644 (file)
--- a/src/VVTK/VVTK_ViewModel.cxx
+++ b/src/VVTK/VVTK_ViewModel.cxx
@@ -23,13 +23,13 @@
 #include "VISU_ActorFactory.h"
 #include "VVTK_ViewWindow.h"
 
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
 #include "VISU_ActorBase.h"
-#include "SVTK_View.h"
-#include "SVTK_Prs.h"
+#include <gui/SVTK_View.h>
+#include <gui/SVTK_Prs.h>
 
-#include <SUIT_ViewManager.h>
+#include <gui/SUIT_ViewManager.h>
 
 #include <vtkActorCollection.h>
 #include <vtkRenderer.h>

diff --git a/src/VVTK/VVTK_ViewModel.h b/src/VVTK/VVTK_ViewModel.h
index 7cfb87c38f311d67095273cdaec3c0b9b38e9f9b..877e5da021255136daabcbe3641cd152a8db740e 100644 (file)
--- a/src/VVTK/VVTK_ViewModel.h
+++ b/src/VVTK/VVTK_ViewModel.h
@@ -25,7 +25,7 @@
 #include <QColor>
 
 #include "VVTK.h"
-#include "SVTK_ViewModel.h"
+#include <gui/SVTK_ViewModel.h>
 
 class VVTK_ViewWindow;
 

diff --git a/src/VVTK/VVTK_ViewWindow.cxx b/src/VVTK/VVTK_ViewWindow.cxx
index 1d5be16bc0988e6441406e6e4a151475bd4bfe29..7297982e2baa975a701d6c50777d1ae2439b4660 100755 (executable)
--- a/src/VVTK/VVTK_ViewWindow.cxx
+++ b/src/VVTK/VVTK_ViewWindow.cxx
@@ -28,15 +28,15 @@
 #include "VVTK_ViewWindow.h"
 #include "VVTK_ViewModel.h"
 #include "VVTK_MainWindow.h"
-#include "SVTK_View.h"
+#include <gui/SVTK_View.h>
 
-#include "SUIT_Session.h"
+#include <gui/SUIT_Session.h>
 
 #include "VVTK_Renderer.h"
-#include "SVTK_Selector.h"
-#include "SVTK_InteractorStyle.h"
-#include "SVTK_RenderWindowInteractor.h"
-#include "SVTK_GenericRenderWindowInteractor.h"
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_InteractorStyle.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
+#include <gui/SVTK_GenericRenderWindowInteractor.h>
 
 #include <vtkRenderWindow.h>
 

diff --git a/src/VVTK/VVTK_ViewWindow.h b/src/VVTK/VVTK_ViewWindow.h
index bedf4b44c8d147f82d9c1931ebf60502070ad1f6..c992b2455b63adc59db287544a3b496d3d74b4fd 100755 (executable)
--- a/src/VVTK/VVTK_ViewWindow.h
+++ b/src/VVTK/VVTK_ViewWindow.h
@@ -27,7 +27,7 @@
 #endif
 
 #include "VVTK.h"
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
 #include <QImage>