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

diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4
index 9314497685c06088cab0f9517ddb5c2b6d194804..86876d4ab35166654eba59ebe021fa4840b5a729 100755 (executable)
--- a/adm_local/unix/config_files/check_GUI.m4
+++ b/adm_local/unix/config_files/check_GUI.m4
@@ -74,7 +74,7 @@ else
     GUI_ROOT_DIR=${SALOME_GUI_DIR}
 
     GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-    GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome
+    GUI_CXXFLAGS="-I${SALOME_GUI_DIR}/include/salome -I${SALOME_GUI_DIR}/include/salome/skel"
 
     AC_CHECKING(for full GUI)
     if test -f ${SALOME_GUI_DIR}/bin/salome/SALOME_Session_Server ; then

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

diff --git a/idl/Makefile.am b/idl/Makefile.am
index c234fd06e3e227d2a18cf68343a4957fc4443e3a..0505b25a34555b20f8f76c83e4102cdb83226f09 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -38,7 +38,7 @@ lib_LTLIBRARIES = libSalomeIDLGUI.la
 nodist_libSalomeIDLGUI_la_SOURCES = SalomeApp_EngineSK.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)
 
 libSalomeIDLGUI_la_CPPFLAGS = \
        -I$(top_builddir)/idl \

diff --git a/src/CAF/CAF_Tools.h b/src/CAF/CAF_Tools.h
index 2674afeb54016d7d0ae2656a93b4cea85ec4a671..66b3ac6d420222d3ee725849be872d067738447b 100755 (executable)
--- a/src/CAF/CAF_Tools.h
+++ b/src/CAF/CAF_Tools.h
@@ -27,7 +27,7 @@
 
 #include "CAF.h"
 
-#include <SUIT_Tools.h>
+#include "SUIT_Tools.h"
 
 #include <QColor>
 

diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h
index 14dc928131e07dc555e2ee2ba401de7d4aec6f1e..e4e90481ef704a1b3439fad24f3c7a289698a4ba 100755 (executable)
--- a/src/CAM/CAM_Application.h
+++ b/src/CAM/CAM_Application.h
@@ -24,7 +24,7 @@
 
 #include "CAM.h"
 
-#include <STD_Application.h>
+#include "STD_Application.h"
 #include <QList>
 
 class QMenu;

diff --git a/src/CAM/CAM_DataObject.h b/src/CAM/CAM_DataObject.h
index a2f9aae40f311b8472d6bd212c332ae07cee44cd..6e49edf1ee3f868090ed2653fdfe547df86e7853 100755 (executable)
--- a/src/CAM/CAM_DataObject.h
+++ b/src/CAM/CAM_DataObject.h
@@ -24,7 +24,7 @@
 
 #include "CAM.h"
 
-#include <SUIT_DataObject.h>
+#include "SUIT_DataObject.h"
 
 class CAM_Module;
 class CAM_DataModel;

diff --git a/src/CAM/CAM_Study.h b/src/CAM/CAM_Study.h
index a90d0e5c5079959b5c5caba81b4accede99a8550..eeecc27931a8dc3412da476e4eb2f3675736d061 100755 (executable)
--- a/src/CAM/CAM_Study.h
+++ b/src/CAM/CAM_Study.h
@@ -24,7 +24,7 @@
 
 #include "CAM.h"
 
-#include <SUIT_Study.h>
+#include "SUIT_Study.h"
 #include <QList>
 
 class CAM_DataModel;

diff --git a/src/GLViewer/GLViewer_ToolTip.h b/src/GLViewer/GLViewer_ToolTip.h
index fc81dfe27a3504dc36f15408a826e669d2e35737..b40603a4c51a3086527464b7b34aa0107d351f72 100644 (file)
--- a/src/GLViewer/GLViewer_ToolTip.h
+++ b/src/GLViewer/GLViewer_ToolTip.h
@@ -29,7 +29,7 @@
 #include "GLViewer.h"
 
 //#include <qtooltip.h>
-//#include <QtxToolTip.h>
+//#include "QtxToolTip.h"
 #include <QObject>
 #include <QPoint>
 

diff --git a/src/GLViewer/GLViewer_ViewFrame.h b/src/GLViewer/GLViewer_ViewFrame.h
index 86cb9ccf73c8384922ad82e7f32d25bbe1031246..5fe060adbb7d537ed25d045ea729f1d661843124 100644 (file)
--- a/src/GLViewer/GLViewer_ViewFrame.h
+++ b/src/GLViewer/GLViewer_ViewFrame.h
@@ -36,7 +36,7 @@ class SUIT_Desktop;
 class GLViewer_Viewer;
 class GLViewer_ViewPort;
 
-#include <QtxAction.h>
+#include "QtxAction.h"
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/GLViewer/GLViewer_Viewer.h b/src/GLViewer/GLViewer_Viewer.h
index c6626f6228b99c3e9ac007c8208ce1febc94ec93..306368528d2ef22dff90a41c38db2870d876c68e 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer.h
+++ b/src/GLViewer/GLViewer_Viewer.h
@@ -28,7 +28,7 @@
 
 #include "GLViewer.h"
 #include "GLViewer_Defs.h"
-#include <SUIT_ViewModel.h>
+#include "SUIT_ViewModel.h"
 
 #include <QCursor>
 #include <QObject>

diff --git a/src/LightApp/LightApp_AboutDlg.h b/src/LightApp/LightApp_AboutDlg.h
index 71216a37e5950f09a9f3d563ae7639d850c54532..18a52997c856d212c2547a89f37f54d9cc8a899f 100644 (file)
--- a/src/LightApp/LightApp_AboutDlg.h
+++ b/src/LightApp/LightApp_AboutDlg.h
@@ -28,7 +28,7 @@
 
 #include "LightApp.h"
 
-#include <QtxDialog.h>
+#include "QtxDialog.h"
 
 class QLabel;
 

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 02a85782afdaaf4fd6593f9c29e5fa988dbe5a4a..8a9da8c42cb47c60df1148e3664b9cb9cbad4323 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -161,7 +161,7 @@
 #include <QProcess>
 #include <QTimer>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #define FIRST_HELP_ID 1000000
 

diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 27d0852afb498397de19554f759a6e3907330a40..6d9fae10c62338c14360dcf3fc86897b4998c2b5 100644 (file)
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.h
@@ -31,7 +31,7 @@
 #endif // _MSC_VER > 1000
 
 #include "LightApp.h"
-#include <CAM_Application.h>
+#include "CAM_Application.h"
 
 #include <QPointer>
 

diff --git a/src/LightApp/LightApp_DataObject.h b/src/LightApp/LightApp_DataObject.h
index 94b4b838bbe7e9a77be92b974c87fa82773203f9..9d693589dd969a4863a712be0c261fbed1a8aa87 100644 (file)
--- a/src/LightApp/LightApp_DataObject.h
+++ b/src/LightApp/LightApp_DataObject.h
@@ -26,7 +26,7 @@
 #define LIGHTAPP_DATAOBJECT_H
 
 #include "LightApp.h"
-#include <CAM_DataObject.h>
+#include "CAM_DataObject.h"
 
 class CAM_DataModel;
 class LightApp_Study;

diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h
index e7bd0db0d08fb90db21c9ec7d7f86f3d57f11b93..d2ab47ef4418a4cb831b6b9410ff19af474275eb 100644 (file)
--- a/src/LightApp/LightApp_Dialog.h
+++ b/src/LightApp/LightApp_Dialog.h
@@ -26,7 +26,7 @@
 #define LIGHTAPP_DIALOG_H
 
 #include "LightApp.h"
-#include <QtxDialog.h>
+#include "QtxDialog.h"
 
 #include <QList>
 #include <QMap>

diff --git a/src/LightApp/LightApp_Displayer.h b/src/LightApp/LightApp_Displayer.h
index 4e3544f2a6fceb1bb042946d02115ec170c2659b..1e29b89ce3233ea7a66cd80c1f52ef7503044ab3 100644 (file)
--- a/src/LightApp/LightApp_Displayer.h
+++ b/src/LightApp/LightApp_Displayer.h
@@ -24,7 +24,7 @@
 
 #include "LightApp.h"
 
-#include <SALOME_Prs.h>
+#include "SALOME_Prs.h"
 
 class QString;
 

diff --git a/src/LightApp/LightApp_GLSelector.h b/src/LightApp/LightApp_GLSelector.h
index 45260e314de6fc4b8cb886f77c23e9c0d95b0e48..27e2dcd6d9067bad74a5015c05e594ccca7905dc 100644 (file)
--- a/src/LightApp/LightApp_GLSelector.h
+++ b/src/LightApp/LightApp_GLSelector.h
@@ -24,9 +24,9 @@
 
 #include "LightApp.h"
 
-#include <SUIT_Selector.h>
+#include "SUIT_Selector.h"
 
-#include <GLViewer_Viewer2d.h>
+#include "GLViewer_Viewer2d.h"
 
 #include <QObject>
 

diff --git a/src/LightApp/LightApp_HDFDriver.cxx b/src/LightApp/LightApp_HDFDriver.cxx
index 168f18013bbd19a20549aa1a6fe0b0117309f5a9..8fdf8bc58df431061074fc81918f56b72b21653c 100644 (file)
--- a/src/LightApp/LightApp_HDFDriver.cxx
+++ b/src/LightApp/LightApp_HDFDriver.cxx
@@ -21,7 +21,7 @@
 //
 #include "LightApp_HDFDriver.h"
 
-#include "HDFOI.hxx"
+#include "kernel/HDFOI.hxx"
 
 // OCCT Includes
 #include <TCollection_AsciiString.hxx>

diff --git a/src/LightApp/LightApp_Module.h b/src/LightApp/LightApp_Module.h
index c608497e52197b151afc0b15a2b386256a865fc9..5a81044fb78bacf96bf3751d29bef00988448b07 100644 (file)
--- a/src/LightApp/LightApp_Module.h
+++ b/src/LightApp/LightApp_Module.h
@@ -28,7 +28,7 @@
 
 #include "LightApp.h"
 #include "LightApp_Preferences.h"
-#include <CAM_Module.h>
+#include "CAM_Module.h"
 
 class LightApp_Application;
 class LightApp_Selection;

diff --git a/src/LightApp/LightApp_ModuleAction.h b/src/LightApp/LightApp_ModuleAction.h
index 4be268decea3c76a6eacf5e047bf9b03bd1986d6..7a3859292d11ee456865deab2e5de55d4b33840d 100755 (executable)
--- a/src/LightApp/LightApp_ModuleAction.h
+++ b/src/LightApp/LightApp_ModuleAction.h
@@ -27,7 +27,7 @@
 
 #include "LightApp.h"
 
-#include <QtxAction.h>
+#include "QtxAction.h"
 
 #ifdef WIN32
 #pragma warning ( disable:4251 )

diff --git a/src/LightApp/LightApp_OBSelector.h b/src/LightApp/LightApp_OBSelector.h
index 7426335656d0da67e8fb396641ebfa93193010e0..73a2d095543fcbd485756d31f6341a7938330b45 100644 (file)
--- a/src/LightApp/LightApp_OBSelector.h
+++ b/src/LightApp/LightApp_OBSelector.h
@@ -27,8 +27,8 @@
 
 #include "LightApp.h"
 
-#include <SUIT_Selector.h>
-#include <SUIT_DataOwner.h>
+#include "SUIT_Selector.h"
+#include "SUIT_DataOwner.h"
 
 #include <QObject>
 

diff --git a/src/LightApp/LightApp_OCCSelector.h b/src/LightApp/LightApp_OCCSelector.h
index d266c7f5045443dfe3ccd320b41359babfac2ada..8dc11a39c9576539a82e092e74e3618bf23f7dd0 100644 (file)
--- a/src/LightApp/LightApp_OCCSelector.h
+++ b/src/LightApp/LightApp_OCCSelector.h
@@ -24,13 +24,13 @@
 
 #include "LightApp.h"
 
-#include <SUIT_Selector.h>
-#include <SUIT_DataOwner.h>
+#include "SUIT_Selector.h"
+#include "SUIT_DataOwner.h"
 
 #include <QObject>
 
 #ifndef DISABLE_OCCVIEWER
-#include <OCCViewer_ViewModel.h>
+#include "OCCViewer_ViewModel.h"
 
 class Handle_AIS_InteractiveObject;
 #endif

diff --git a/src/LightApp/LightApp_Operation.h b/src/LightApp/LightApp_Operation.h
index c48787502dfe65e8bf51242d03ad6f19ad0725e9..ccc5d3f7030a883dfb484001baa454dbe2a32fda 100755 (executable)
--- a/src/LightApp/LightApp_Operation.h
+++ b/src/LightApp/LightApp_Operation.h
@@ -27,7 +27,7 @@
 #define LightApp_Operation_H
 
 #include "LightApp.h"
-#include <SUIT_Operation.h>
+#include "SUIT_Operation.h"
 
 class LightApp_Module;
 class LightApp_SelectionMgr;

diff --git a/src/LightApp/LightApp_Plot2dSelector.h b/src/LightApp/LightApp_Plot2dSelector.h
index b9ba299a3d260b950f0ec603baf6b151d5698e0e..676c45daedcbf598fb4c35a498d30c48b04c0489 100755 (executable)
--- a/src/LightApp/LightApp_Plot2dSelector.h
+++ b/src/LightApp/LightApp_Plot2dSelector.h
@@ -24,9 +24,9 @@
 
 #include "LightApp.h"
 
-#include <SUIT_Selector.h>
-#include <SUIT_DataOwner.h>
-#include <SPlot2d_ViewModel.h>
+#include "SUIT_Selector.h"
+#include "SUIT_DataOwner.h"
+#include "SPlot2d_ViewModel.h"
 
 class LightApp_DataObject;
 

diff --git a/src/LightApp/LightApp_Preferences.h b/src/LightApp/LightApp_Preferences.h
index 8ab8fbd82a0c58c9dd5274e4d961329d316abe25..ed71cb235677e7b47ee9340b188c901ddf60f00b 100644 (file)
--- a/src/LightApp/LightApp_Preferences.h
+++ b/src/LightApp/LightApp_Preferences.h
@@ -26,7 +26,7 @@
 #define LIGHTAPP_PREFERENCES_H
 
 #include "LightApp.h"
-#include <SUIT_PreferenceMgr.h>
+#include "SUIT_PreferenceMgr.h"
 
 #include <QMap>
 

diff --git a/src/LightApp/LightApp_PreferencesDlg.h b/src/LightApp/LightApp_PreferencesDlg.h
index 64299c97210927ed1ea2bee21ae784a4a941308e..7a257a7c2326efe0cb0f933cbbc5347f873b2db0 100644 (file)
--- a/src/LightApp/LightApp_PreferencesDlg.h
+++ b/src/LightApp/LightApp_PreferencesDlg.h
@@ -27,7 +27,7 @@
 
 #include "LightApp.h"
 
-#include <QtxDialog.h>
+#include "QtxDialog.h"
 
 class LightApp_Preferences;
 

diff --git a/src/LightApp/LightApp_Selection.h b/src/LightApp/LightApp_Selection.h
index 5e2e17a19c84166ffb4dd342558d8ee2841711f7..25fddc6356ce71b4a6bffdc809f987ddb5ad1335 100644 (file)
--- a/src/LightApp/LightApp_Selection.h
+++ b/src/LightApp/LightApp_Selection.h
@@ -29,7 +29,7 @@
 #define LIGHTAPP_SELECTION_HeaderFile
 
 #include "LightApp.h"
-#include <QtxPopupMgr.h>
+#include "QtxPopupMgr.h"
 
 class LightApp_SelectionMgr;
 class LightApp_DataOwner;

diff --git a/src/LightApp/LightApp_SelectionMgr.h b/src/LightApp/LightApp_SelectionMgr.h
index 9a6b11804baab82c119518fcb3050002ea1936b8..d68089cfe52e6f895eb96e4552a6580b7b63144f 100644 (file)
--- a/src/LightApp/LightApp_SelectionMgr.h
+++ b/src/LightApp/LightApp_SelectionMgr.h
@@ -24,10 +24,10 @@
 
 #include "LightApp.h"
 
-#include <SUIT_SelectionMgr.h>
+#include "SUIT_SelectionMgr.h"
 
 #ifndef DISABLE_SALOMEOBJECT
-  #include <SALOME_InteractiveObject.hxx>
+  #include "SALOME_InteractiveObject.hxx"
   #include <QMap>
   #include <NCollection_DataMap.hxx>
 

diff --git a/src/LightApp/LightApp_Study.h b/src/LightApp/LightApp_Study.h
index d47e7c0549a93db1274ce95b5ee0a529b2dda1b7..5081f8f197453ead589ea97d5a34a798fc7fe78f 100644 (file)
--- a/src/LightApp/LightApp_Study.h
+++ b/src/LightApp/LightApp_Study.h
@@ -25,7 +25,7 @@
 #include "LightApp.h"
 #include "LightApp_Driver.h"
 
-#include <CAM_Study.h>
+#include "CAM_Study.h"
 
 #include "string"
 #include "vector"

diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h
index f552a42292ff55fe9f79cfbb382821b899ffd7b1..40d2e817acd0003133fa5405796d05ea24db4226 100755 (executable)
--- a/src/LogWindow/LogWindow.h
+++ b/src/LogWindow/LogWindow.h
@@ -36,7 +36,7 @@
 #  define LOGWINDOW_EXPORT
 #endif
 
-#include <SUIT_PopupClient.h>
+#include "SUIT_PopupClient.h"
 
 #include <QWidget>
 #include <QMap>

diff --git a/src/OBJECT/SALOME_AISObject.hxx b/src/OBJECT/SALOME_AISObject.hxx
index b94df74c82ed8412c89041418cf718c4e686d15e..ac5cb380fac2759d7e09539edf2ac040b908a880 100755 (executable)
--- a/src/OBJECT/SALOME_AISObject.hxx
+++ b/src/OBJECT/SALOME_AISObject.hxx
@@ -37,7 +37,7 @@
 #include <AIS_InteractiveObject.hxx>
 #endif
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include <Handle_SALOME_InteractiveObject.hxx>
+#include "Handle_SALOME_InteractiveObject.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>

diff --git a/src/OBJECT/SALOME_AISShape.hxx b/src/OBJECT/SALOME_AISShape.hxx
index 9d5cc5a24a4050ed6d773596cbe0171f408ce03c..6dd577210af2b584ee031101fdb6443c4aa17cae 100755 (executable)
--- a/src/OBJECT/SALOME_AISShape.hxx
+++ b/src/OBJECT/SALOME_AISShape.hxx
@@ -37,7 +37,7 @@
 #include <Standard_CString.hxx>
 #endif
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include <Handle_SALOME_InteractiveObject.hxx>
+#include "Handle_SALOME_InteractiveObject.hxx"
 #endif
 #ifndef _AIS_Shape_HeaderFile
 #include <AIS_Shape.hxx>

diff --git a/src/OBJECT/SALOME_TypeFilter.hxx b/src/OBJECT/SALOME_TypeFilter.hxx
index b4304ce892dd800be934c5c6d2324c6bb4895d9d..4d7e26e36b66355da32ce8a2f7f644877d2099ce 100644 (file)
--- a/src/OBJECT/SALOME_TypeFilter.hxx
+++ b/src/OBJECT/SALOME_TypeFilter.hxx
@@ -43,7 +43,7 @@
 #include <Standard_Boolean.hxx>
 #endif
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include <Handle_SALOME_InteractiveObject.hxx>
+#include "Handle_SALOME_InteractiveObject.hxx"
 #endif
 
 class SALOME_TypeFilter : public SALOME_Filter {

diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
index bc67b546861b8da5f2fec58ef8155ec51bae4a52..c5431d76b0e0a50640c2a40bb4a625a0560c3bfb 100755 (executable)
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
@@ -27,8 +27,8 @@
 #include "OCCViewer_ViewModel.h"
 #include "OCCViewer_ViewWindow.h"
 
-#include <QtxDialog.h>
-#include <SUIT_Application.h>
+#include "QtxDialog.h"
+#include "SUIT_Application.h"
 
 #include <QDialog>
 #include <QListWidget>

diff --git a/src/OCCViewer/OCCViewer_ToolTip.h b/src/OCCViewer/OCCViewer_ToolTip.h
index 5ff60c81ce693ed0611dbd2ae8d9b30b392c8b0b..731c98d93edde0146488f2e395906c0e8800e8dc 100644 (file)
--- a/src/OCCViewer/OCCViewer_ToolTip.h
+++ b/src/OCCViewer/OCCViewer_ToolTip.h
@@ -23,7 +23,7 @@
 #define OCCVIEWER_TOOLTIP_H
 
 #include "OCCViewer.h"
-#include <QtxToolTip.h>
+#include "QtxToolTip.h"
 #include <QFont>
 
 class OCCViewer_ViewWindow;

diff --git a/src/Plot2d/Plot2d_ToolTip.h b/src/Plot2d/Plot2d_ToolTip.h
index 95afdf43226c38522f4241296114ec0cb9c05784..10ebd71f84f52696828a79b508d4329dad51790b 100644 (file)
--- a/src/Plot2d/Plot2d_ToolTip.h
+++ b/src/Plot2d/Plot2d_ToolTip.h
@@ -26,7 +26,7 @@
 #define PLOT2D_TOOLTIP_H
 
 #include "Plot2d.h"
-#include <QtxToolTip.h>
+#include "QtxToolTip.h"
 
 class Plot2d_ViewFrame;
 class Plot2d_Plot2d;

diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h
index bd3c15dcb2e48a1e255e369422a6707d9539aa08..3dbc0d0dfa3ab25ea50d01b75611b242ff3d041e 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewWindow.h
+++ b/src/Plot2d/Plot2d_ViewWindow.h
@@ -26,7 +26,7 @@
 #define PLOT2D_VIEWWINDOW_H
 
 #include "Plot2d.h"
-#include <SUIT_ViewWindow.h>
+#include "SUIT_ViewWindow.h"
 #include <QMap>
 
 

diff --git a/src/PyConsole/PyConsole_Console.h b/src/PyConsole/PyConsole_Console.h
index 790450c61b6e1e12e6aa7e44dfa7978c2d73887f..5460282d800f7492e36c5f78a178b657c567db5c 100644 (file)
--- a/src/PyConsole/PyConsole_Console.h
+++ b/src/PyConsole/PyConsole_Console.h
@@ -27,7 +27,7 @@
 
 #include "PyConsole.h"
 
-#include <SUIT_PopupClient.h>
+#include "SUIT_PopupClient.h"
 #include <QWidget>
 #include <QMap>
 

diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h
index 8bc0f1c58a69225d7a82b1560551f4fa7f981e26..aabaa2dc7b847a51953e0320e36877c2977d158b 100644 (file)
--- a/src/QDS/QDS_ComboBox.h
+++ b/src/QDS/QDS_ComboBox.h
@@ -28,7 +28,7 @@
 #include <QPixmap>
 #include <QStringList>
 
-#include <Qtx.h>
+#include "Qtx.h"
 
 class QtxComboBox;
 

diff --git a/src/QDS/QDS_Datum.h b/src/QDS/QDS_Datum.h
index e438a4e17f2ebc9c3f49cd29d11588c8db0f9314..ecfcd428b94a41aef47af50175258b292f5743ac 100644 (file)
--- a/src/QDS/QDS_Datum.h
+++ b/src/QDS/QDS_Datum.h
@@ -32,7 +32,7 @@ class QVBoxLayout;
 class QGridLayout;
 class QValidator;
 
-#include <DDS_DicItem.h>
+#include "DDS_DicItem.h"
 
 class QWidget;
 

diff --git a/src/QDS/QDS_RadioBox.h b/src/QDS/QDS_RadioBox.h
index 0d667d45c0f2ba7b4538a728c744b4a3923ff402..1f64dcaaf2f1f98c5aabafaf62a4051bad9962ee 100644 (file)
--- a/src/QDS/QDS_RadioBox.h
+++ b/src/QDS/QDS_RadioBox.h
@@ -24,7 +24,7 @@
 
 #include "QDS_Datum.h"
 
-#include <Qtx.h>
+#include "Qtx.h"
 
 #include <QMap>
 #include <QStringList>

diff --git a/src/QDS/QDS_Table.h b/src/QDS/QDS_Table.h
index 9384371aa1a6080ac8a76f457bf727131ae9a242..137f827bbd10f3aac09f97da12d964194534e058 100644 (file)
--- a/src/QDS/QDS_Table.h
+++ b/src/QDS/QDS_Table.h
@@ -24,7 +24,7 @@
 
 #include "QDS_Datum.h"
 
-#include <QtxTable.h>
+#include "QtxTable.h"
 
 #include <QMap>
 #include <QVector>

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index 10d777ce25873add7cc7721a289a8569c663055f..7ae9e597b2988eb27f92d3ebdf1664cac9cd112a 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
@@ -29,8 +29,8 @@
 #include "SalomeApp_Application.h"
 #include "SALOME_PYQT_ModuleLight.h"
 
-#include <SALOME_LifeCycleCORBA.hxx>
-#include <Container_init_python.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Container_init_python.hxx>
 #include <CORBA.h>
 
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
index 614dfba64070560ffaf38238f8406e33887d0200..8690b287baba6f163c1cf244f94198deb788765d 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
@@ -27,7 +27,7 @@
 #include "SALOME_PYQT_DataModelLight.h" 
 #include "SALOME_PYQT_DataObjectLight.h"
 #include "SALOME_PYQT_ModuleLight.h"
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #include <LightApp_Study.h>
 #include <CAM_Module.h>

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
index 275c084d4f16b0e5084543017a371f53de78dc7e..a48632abc2d509daeab60428d6c3fcfe83b514df 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
@@ -26,9 +26,9 @@
 #define SALOME_PYQT_DATAMODELLIGHT_H
 
 #include "SALOME_PYQT_GUILight.h"
-#include <LightApp_DataModel.h>
+#include "LightApp_DataModel.h"
 
-#include <CAM_Module.h>
+#include "CAM_Module.h"
 #include "SALOME_PYQT_DataObjectLight.h"
 
 class SALOME_PYQT_RootObjectLight;

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx
index 9e0ef56d621cdb3431aca02f7d7456ce7dc5f062..121e9a25e3913b65a65c8656df94af64a020a2ca 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx
@@ -26,7 +26,7 @@
 #include "SALOME_PYQT_DataObjectLight.h"
 #include <LightApp_Application.h>
 #include <SUIT_Session.h>
-#include <utilities.h>
+#include <kernel/utilities.h>
 #include <SUIT_ResourceMgr.h>
 
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
index a99e0212ab9945fde9c4f527d9ce78d379c3650b..979efe5f41685986c7e6600107a5be46b0656580 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
@@ -28,8 +28,8 @@
 
 
 #include "SALOME_PYQT_GUILight.h"
-#include <LightApp_DataObject.h>
-#include <LightApp_Study.h>
+#include "LightApp_DataObject.h"
+#include "LightApp_Study.h"
 
 #include <qstring.h>
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
index b9e9bed8d94c2d766770b5d3a15e83052129f0a5..5a85c726e0fdfb6e19203698b06021a328bf9dee 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
@@ -34,7 +34,7 @@
 #include "SALOME_PYQT_DataModelLight.h"
 
 #ifndef GUI_DISABLE_CORBA
-#include <Container_init_python.hxx>
+#include <kernel/Container_init_python.hxx>
 #endif
 
 #include <SUIT_ResourceMgr.h>
@@ -71,7 +71,7 @@
 #include "sipQtGuiQMenu.h"
 #endif
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 /*!
   \brief Default name of the module, replaced at the moment

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
index 6326e1df8568d25f986593e922b65ac8a325778b..5339b473814965119d0be1c5e776252426f2b219 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
@@ -30,7 +30,7 @@
 #include "SALOME_PYQT_GUILight.h"
 #include "LightApp_Module.h"
 #include "SALOME_PYQT_DataObjectLight.h"
-#include <CAM_Module.h>
+#include "CAM_Module.h"
 
 #include <map>
 #include <QStringList>

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx
index eac78e7eac3e79883cd5c2b88aca20be23278fe5..25a2d90996d47f84b8ac5f1c3bca73406990f106 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx
@@ -3,10 +3,10 @@
 
 #include <SUITApp_init_python.hxx>
 #include <PyInterp_Interp.h>
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #ifndef GUI_DISABLE_CORBA
-#include <Container_init_python.hxx>
+#include <kernel/Container_init_python.hxx>
 #endif
 
 

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index 0818fe7cf5a2a95b0ded3af40b2f037c9e467094..6a1d5c33d951627f60715c66862edb60f222c34c 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
@@ -29,8 +29,8 @@
 #include <QString>
 #include <QColor>
 
-#include <LightApp_Application.h>
-#include <LightApp_Preferences.h>
+#include "LightApp_Application.h"
+#include "LightApp_Preferences.h"
 
 class LightApp_SelectionMgr;
 class LightApp_Application;

diff --git a/src/SOCC/SOCC_Prs.h b/src/SOCC/SOCC_Prs.h
index 007a68f90ac7806063e62fc26b76f057f9a9ad0c..9fdd118ece84ef068e7749ac10c5873c5977a95c 100644 (file)
--- a/src/SOCC/SOCC_Prs.h
+++ b/src/SOCC/SOCC_Prs.h
@@ -30,7 +30,7 @@
 
 #include "SOCC.h"
 
-#include <SALOME_Prs.h>
+#include "SALOME_Prs.h"
 
 #include <AIS_ListOfInteractive.hxx>
 

diff --git a/src/SPlot2d/SPlot2d_Curve.h b/src/SPlot2d/SPlot2d_Curve.h
index 444fddda71b2dbfb3685e3e79538ab07a02da1cb..0dc4a734d7df8f4d03d580beef496395f60cba86 100644 (file)
--- a/src/SPlot2d/SPlot2d_Curve.h
+++ b/src/SPlot2d/SPlot2d_Curve.h
@@ -31,7 +31,7 @@
 #include "Plot2d_Curve.h"
 
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include <Handle_SALOME_InteractiveObject.hxx>
+#include "Handle_SALOME_InteractiveObject.hxx"
 #endif
 #include "SALOME_InteractiveObject.hxx"
 

diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h
index 6f8fc68fb189eb0b24950d34055034dec9d0f971..15be521fe9513eb6f7560bc8c2eab26ae3bc661b 100755 (executable)
--- a/src/STD/STD_Application.h
+++ b/src/STD/STD_Application.h
@@ -24,7 +24,7 @@
 
 #include "STD.h"
 
-#include <SUIT_Application.h>
+#include "SUIT_Application.h"
 
 #include <QList>
 

diff --git a/src/STD/STD_MDIDesktop.h b/src/STD/STD_MDIDesktop.h
index a229ab713d0c0f7fc7f3ef373e2491eb0c9643a9..c03e91f32ae7dc653939cdb168dcb0c681925b5a 100755 (executable)
--- a/src/STD/STD_MDIDesktop.h
+++ b/src/STD/STD_MDIDesktop.h
@@ -24,7 +24,7 @@
 
 #include "STD.h"
 
-#include <SUIT_Desktop.h>
+#include "SUIT_Desktop.h"
 
 class QtxWorkspace;
 class QtxWorkspaceAction;

diff --git a/src/STD/STD_SDIDesktop.h b/src/STD/STD_SDIDesktop.h
index d5e17e891968b506cbd213adc8aef326586162d5..e6883f2f1d4b34f1b1327ebdbe5a674169f255a7 100755 (executable)
--- a/src/STD/STD_SDIDesktop.h
+++ b/src/STD/STD_SDIDesktop.h
@@ -24,7 +24,7 @@
 
 #include "STD.h"
 
-#include <SUIT_Desktop.h>
+#include "SUIT_Desktop.h"
 
 class QFrame;
 

diff --git a/src/STD/STD_TabDesktop.h b/src/STD/STD_TabDesktop.h
index 57d5195ad8fa5a2cf61db0363156b0570864f60d..5673f8bdd32ff33ef91251c06f055603fc15be3c 100644 (file)
--- a/src/STD/STD_TabDesktop.h
+++ b/src/STD/STD_TabDesktop.h
@@ -24,7 +24,7 @@
 
 #include "STD.h"
 
-#include <SUIT_Desktop.h>
+#include "SUIT_Desktop.h"
 
 class QtxWorkstack;
 class QtxWorkstackAction;

diff --git a/src/SUIT/SUIT_DataBrowser.h b/src/SUIT/SUIT_DataBrowser.h
index f619e4ff3b8445a6c4a606ad47adb21fa128fb13..16b32f454093c47516ac600716e82d90ad388b5f 100644 (file)
--- a/src/SUIT/SUIT_DataBrowser.h
+++ b/src/SUIT/SUIT_DataBrowser.h
@@ -28,7 +28,7 @@
 #include "SUIT.h"
 #include "SUIT_PopupClient.h"
 #include "SUIT_DataObject.h"
-#include <OB_Browser.h>
+#include "OB_Browser.h"
 
 class QShortcut;
 

diff --git a/src/SUIT/SUIT_Desktop.h b/src/SUIT/SUIT_Desktop.h
index ad49bd55e5462240f27173eb38f98ba86e813877..44f8775626cb85010d43d05ae2d6bfbb584c0f12 100755 (executable)
--- a/src/SUIT/SUIT_Desktop.h
+++ b/src/SUIT/SUIT_Desktop.h
@@ -27,7 +27,7 @@
 #include <QList>
 #include <QEvent>
 
-#include <QtxMainWindow.h>
+#include "QtxMainWindow.h"
 
 class QMovie;
 

diff --git a/src/SUIT/SUIT_ResourceMgr.h b/src/SUIT/SUIT_ResourceMgr.h
index e0ff7ce17bcfe57b5298870539b70f346bb550e0..b2159089b1bd5b23ed0e89f70b5261b1ea15d76e 100755 (executable)
--- a/src/SUIT/SUIT_ResourceMgr.h
+++ b/src/SUIT/SUIT_ResourceMgr.h
@@ -24,7 +24,7 @@
 
 #include "SUIT.h"
 
-#include <QtxResourceMgr.h>
+#include "QtxResourceMgr.h"
 
 class SUIT_EXPORT SUIT_ResourceMgr : public QtxResourceMgr
 {

diff --git a/src/SUIT/SUIT_Tools.h b/src/SUIT/SUIT_Tools.h
index ec252782682906afeefadb4957e3d42fb90144fd..e34c6bc16a6e91055e4e4c77d882198ddbf78711 100755 (executable)
--- a/src/SUIT/SUIT_Tools.h
+++ b/src/SUIT/SUIT_Tools.h
@@ -24,7 +24,7 @@
 
 #include "SUIT.h"
 
-#include <Qtx.h>
+#include "Qtx.h"
 
 #include <QRect>
 #include <QString>

diff --git a/src/SUIT/SUIT_TreeModel.h b/src/SUIT/SUIT_TreeModel.h
index 59828481ef040c0542cb1c3a67ead2e112cbbd6c..ec8a250003acf935abe68b39587b1b1b04cde630 100755 (executable)
--- a/src/SUIT/SUIT_TreeModel.h
+++ b/src/SUIT/SUIT_TreeModel.h
@@ -27,7 +27,7 @@
 
 #include "SUIT.h"
 
-#include <Qtx.h>
+#include "Qtx.h"
 
 #include <QAbstractItemModel>
 #include <QSortFilterProxyModel>

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
index 2bbf9d8d76b1e6d0e8f85c647059d4b842f294a5..72faad8f667ca5a5c659a565f6375d0426f19fe7 100755 (executable)
--- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
+++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
@@ -34,7 +34,7 @@
 #include "SUIT_PopupClient.h"
 #include "SUIT_ViewWindow.h"
 
-#include <QtxAction.h>
+#include "QtxAction.h"
 
 #ifdef WIN32
 #pragma warning ( disable:4251 )

diff --git a/src/SVTK/SVTK_Functor.h b/src/SVTK/SVTK_Functor.h
index 2cf0f02ce325896d2cf43b40ebfd39229ba9715e..6120985558cac9028abc63bdd6a0df5e3633c0e0 100644 (file)
--- a/src/SVTK/SVTK_Functor.h
+++ b/src/SVTK/SVTK_Functor.h
@@ -26,7 +26,7 @@
 
 #include <string>
 
-#include <VTKViewer_Functor.h>
+#include "VTKViewer_Functor.h"
 
 #include "SALOME_InteractiveObject.hxx"
 

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 41896b0b848bc6e54782420bc568b516b7027aa1..9f605a8aade6137212b9b273c0f347056c284b3a 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -70,9 +70,9 @@
 
 #include <PyConsole_Console.h>
 
-#include <Utils_ORB_INIT.hxx>
-#include <Utils_SINGLETON.hxx>
-#include <SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Utils_ORB_INIT.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
 #include <QApplication>
 #include <QAction>
@@ -84,8 +84,8 @@
 #include <QGridLayout>
 #include <QMenu>
 
-#include <SALOMEDSClient_ClientFactory.hxx>
-#include <Basics_Utils.hxx>
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #include <SALOME_ListIteratorOfListIO.hxx>
 #include <SALOME_ListIO.hxx>

diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index 57c3f87f71ff4e5da4ae3b592ef01cb723bc1ab0..d85f14de90ae9dd23a6133eeae49764cbd730bdb 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -31,15 +31,15 @@
 #endif // _MSC_VER > 1000
 
 #include "SalomeApp.h"
-#include <LightApp_Application.h>
+#include "LightApp_Application.h"
 
 #include <CORBA.h>
 
 //#include <SALOMEconfig.h>
 //#include CORBA_CLIENT_HEADER(SALOMEDS)
-#include <SALOME_NamingService.hxx>
+#include <kernel/SALOME_NamingService.hxx>
 
-#include "SALOMEDSClient.hxx"
+#include <kernel/SALOMEDSClient.hxx>
 
 class LightApp_Preferences;
 class SalomeApp_Study;

diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.h b/src/SalomeApp/SalomeApp_CheckFileDlg.h
index 74e857b6b6ca4fc72f05740c3eeca84e1a1f1383..af73e5e368782b09c996b57f20e4c41a884d55d7 100644 (file)
--- a/src/SalomeApp/SalomeApp_CheckFileDlg.h
+++ b/src/SalomeApp/SalomeApp_CheckFileDlg.h
@@ -24,7 +24,7 @@
 
 #include "SalomeApp.h"
 
-#include <SUIT_FileDlg.h>
+#include "SUIT_FileDlg.h"
 
 class QCheckBox;
 

diff --git a/src/SalomeApp/SalomeApp_DataModel.h b/src/SalomeApp/SalomeApp_DataModel.h
index 53b2f701c48bb76d8107f1207501c23a37e27c4e..89870dc014cdb8936b9d972916a0569443ff99e1 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataModel.h
+++ b/src/SalomeApp/SalomeApp_DataModel.h
@@ -33,7 +33,7 @@
 #include "SalomeApp.h"
 #include "LightApp_DataModel.h"
 
-#include "SALOMEDSClient.hxx"
+#include <kernel/SALOMEDSClient.hxx>
 
 class SalomeApp_Module;
 class SalomeApp_Study;

diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx
index dbc07fe6673095a61729b9baafa199015b7eb8ef..95f09b4bf264a3f41ff56e3b2efd8857dc253b2c 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataObject.cxx
+++ b/src/SalomeApp/SalomeApp_DataObject.cxx
@@ -32,8 +32,8 @@
 #include <SUIT_Application.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <SALOME_LifeCycleCORBA.hxx>
-#include <Basics_Utils.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #include <QObject>
 #include <QVariant>

diff --git a/src/SalomeApp/SalomeApp_DataObject.h b/src/SalomeApp/SalomeApp_DataObject.h
index b8f4b39a19868b0593bef9eda2ba564329582f5b..dff9b5fa5a8dc5aa07243c5d2d9674655f6ed683 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataObject.h
+++ b/src/SalomeApp/SalomeApp_DataObject.h
@@ -26,8 +26,8 @@
 #define SALOMEAPP_DATAOBJECT_H
 
 #include "SalomeApp.h"
-#include <LightApp_DataObject.h>
-#include <SALOMEDSClient.hxx>
+#include "LightApp_DataObject.h"
+#include <kernel/SALOMEDSClient.hxx>
 
 class SalomeApp_Study;
 

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
index f83897839832d876c939867e6b6f3c6b6c8e8ce6..390cfbe1c30bda2b678bbcef665df88e1883260e 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
@@ -28,7 +28,7 @@
 
 #include <SUIT_Session.h>
 
-#include "SALOMEDSClient_ClientFactory.hxx" 
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include <QKeyEvent>

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.h b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
index c5b6539ca6f12e686f1b9c52ba8f42faa4d8d115..f185ab72584937055fb69c111a23898adefdc958 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.h
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
@@ -24,7 +24,7 @@
 
 #include "SalomeApp.h"
 
-#include <QtxDoubleSpinBox.h>
+#include "QtxDoubleSpinBox.h"
 
 #include <QValidator>
 

diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.h b/src/SalomeApp/SalomeApp_ExceptionHandler.h
index 64a26afbe6be8f69a7309431482e6141ab8ba21a..1f705135ba062b07f77c93bafa4f8733516febb4 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.h
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.h
@@ -24,7 +24,7 @@
 
 #include "SalomeApp.h"
 
-#include <SUIT_ExceptionHandler.h>
+#include "SUIT_ExceptionHandler.h"
 
 class SALOMEAPP_EXPORT SalomeApp_ExceptionHandler : public SUIT_ExceptionHandler
 {

diff --git a/src/SalomeApp/SalomeApp_ImportOperation.h b/src/SalomeApp/SalomeApp_ImportOperation.h
index 337aa9a8306348b30bdd875fcf56f0ae73b400da..dea5e7ec357e5e1ea49b2c473e3cbb20858ab0f1 100644 (file)
--- a/src/SalomeApp/SalomeApp_ImportOperation.h
+++ b/src/SalomeApp/SalomeApp_ImportOperation.h
@@ -32,7 +32,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <SUIT_Operation.h>
+#include "SUIT_Operation.h"
 
 class SUIT_Application;
 

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.cxx b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
index 76625adc9c7c12da3e7279678a76f6fc196dd070..fafa466c3b5d79e060f220c14a6f4e76091c9276 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
@@ -28,7 +28,7 @@
 
 #include <SUIT_Session.h>
 
-#include "SALOMEDSClient_ClientFactory.hxx" 
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include <QKeyEvent>

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.h b/src/SalomeApp/SalomeApp_IntSpinBox.h
index d15fe99c1d811f777e93a1e645366729c124abb1..928a1fcfc647f977dc65fb1ceb5869855799ec5f 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.h
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.h
@@ -24,7 +24,7 @@
 
 #include "SalomeApp.h"
 
-#include <QtxIntSpinBox.h>
+#include "QtxIntSpinBox.h"
 
 #include <QValidator>
 

diff --git a/src/SalomeApp/SalomeApp_ListView.h b/src/SalomeApp/SalomeApp_ListView.h
index ea418cad6ca0ec7c4ca0a8ecdb1c8e92ae66ba8f..100eea1ffd15934340d805b81f6bc40da8f8fbc3 100644 (file)
--- a/src/SalomeApp/SalomeApp_ListView.h
+++ b/src/SalomeApp/SalomeApp_ListView.h
@@ -27,7 +27,7 @@
 
 //#include <QtxListView.h>
 
-#include <SUIT_PopupClient.h>
+#include "SUIT_PopupClient.h"
 
 #include <QTreeWidget>
 #include <QTreeWidgetItem>

diff --git a/src/SalomeApp/SalomeApp_Module.h b/src/SalomeApp/SalomeApp_Module.h
index b248966dbcfd4010ca587d4a6d7f64ccdab6b494..b3fbf2f01f03a7d8b10348f9e9786d44767127de 100644 (file)
--- a/src/SalomeApp/SalomeApp_Module.h
+++ b/src/SalomeApp/SalomeApp_Module.h
@@ -28,7 +28,7 @@
 
 #include "SalomeApp.h"
 
-#include <LightApp_Module.h>
+#include "LightApp_Module.h"
 
 class CAM_DataModel;
 class SalomeApp_Application;

diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
index e4e4934b9d8353c0c3779bf00ce0eb77953952c4..65cb60f4c33c35f77ac6f5bace7ab2a687282212 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
@@ -37,7 +37,7 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
 
-#include <SALOMEDS_Tool.hxx>
+#include <kernel/SALOMEDS_Tool.hxx>
 
 #include <QWidget>
 #include <QDialog>

diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.h b/src/SalomeApp/SalomeApp_NoteBookDlg.h
index 93709477c5b0be479d9bc67fa6d8cfb408da6158..afc3cb6d314351100cf11a1fadbc3abcfcd7709e 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBookDlg.h
+++ b/src/SalomeApp/SalomeApp_NoteBookDlg.h
@@ -25,7 +25,7 @@
 
 #include "SalomeApp.h"
 
-#include "SALOMEDSClient_ClientFactory.hxx" 
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include <QDialog>

diff --git a/src/SalomeApp/SalomeApp_PyInterp.cxx b/src/SalomeApp/SalomeApp_PyInterp.cxx
index 51868318c8bff4113aabbadbda4f623567e3c54c..5ec530862839bd494d5c1e7b27f2fabe7408c517 100755 (executable)
--- a/src/SalomeApp/SalomeApp_PyInterp.cxx
+++ b/src/SalomeApp/SalomeApp_PyInterp.cxx
@@ -27,8 +27,8 @@
 //
 #include "SalomeApp_PyInterp.h"
 
-#include <utilities.h>
-#include <Container_init_python.hxx>
+#include <kernel/utilities.h>
+#include <kernel/Container_init_python.hxx>
 
 #include "PyInterp.h" // this include must be first (see PyInterp_base.h)!
 

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index 4b18f8a6c04853cc125adf858ebca23bfb344874..17bf0cf91214fac8b60ee1e8545266be97041e4e 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -33,11 +33,11 @@
 
 #include <SUIT_ResourceMgr.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include "SALOMEDS_Tool.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
 
-#include "SALOMEDSClient_ClientFactory.hxx"
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Exception)

diff --git a/src/SalomeApp/SalomeApp_Study.h b/src/SalomeApp/SalomeApp_Study.h
index 217423d1a173ce62d835677b21dbd761fa3460ff..6e791fdeb488e687f182b4f1667e622c7859b54a 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.h
+++ b/src/SalomeApp/SalomeApp_Study.h
@@ -24,13 +24,13 @@
 
 #include "SalomeApp.h"
 
-#include <LightApp_Study.h>
+#include "LightApp_Study.h"
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
 #endif
 
-#include "SALOMEDSClient.hxx"
+#include <kernel/SALOMEDSClient.hxx>
 
 class SALOMEAPP_EXPORT SalomeApp_Study : public LightApp_Study
 {

diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
index ce56f996e97eee3c2a73579355233976316a950b..05e3395c4525431aa1c5fed576d58779d49f2fe3 100644 (file)
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
@@ -33,7 +33,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 class SalomeApp_ListView;
 class QPushButton;

diff --git a/src/SalomeApp/SalomeApp_Tools.cxx b/src/SalomeApp/SalomeApp_Tools.cxx
index 80f6a963933d74d8b42363b03c651f3c34e9a111..6e1a5f7013a4123bcbc63fd946df363fa019f5bc 100644 (file)
--- a/src/SalomeApp/SalomeApp_Tools.cxx
+++ b/src/SalomeApp/SalomeApp_Tools.cxx
@@ -25,7 +25,7 @@
 #include <SUIT_Desktop.h>
 #include <SUIT_MessageBox.h>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #include <QColor>
 #include <QString>

diff --git a/src/SalomeApp/SalomeApp_Tools.h b/src/SalomeApp/SalomeApp_Tools.h
index f341a2824f3fc512d23182e7212ac92acbf48529..87df8a2fe7f7f4f68f0340fe4c34ae63a17d2a85 100644 (file)
--- a/src/SalomeApp/SalomeApp_Tools.h
+++ b/src/SalomeApp/SalomeApp_Tools.h
@@ -24,7 +24,7 @@
 
 #include "SalomeApp.h"
 
-#include <SUIT_Tools.h>
+#include "SUIT_Tools.h"
 
 class QColor;
 class QString;

diff --git a/src/SalomeApp/SalomeApp_VisualState.cxx b/src/SalomeApp/SalomeApp_VisualState.cxx
index a642bd2dfcef126487155654402b607d5cc0baf8..7b86aa0e58f17ca3c6404ba1718dc26ddec5b782 100644 (file)
--- a/src/SalomeApp/SalomeApp_VisualState.cxx
+++ b/src/SalomeApp/SalomeApp_VisualState.cxx
@@ -36,8 +36,8 @@
 #include <QApplication>
 #include <QMultiHash>
 
-#include <SALOMEDSClient_ClientFactory.hxx>//?
-#include <SALOMEDSClient_IParameters.hxx>//?
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>//?
+#include <kernel/SALOMEDSClient_IParameters.hxx>//?
 
 #include <vector>//?
 #include <string>//?

diff --git a/src/SalomeApp/Test/TestSalomeApp.cxx b/src/SalomeApp/Test/TestSalomeApp.cxx
index bc917025cbb01f7496167d72e531795c06cb599a..32587cbd8e1e3d090c540efc2a9219fe1458ba69 100644 (file)
--- a/src/SalomeApp/Test/TestSalomeApp.cxx
+++ b/src/SalomeApp/Test/TestSalomeApp.cxx
@@ -29,4 +29,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION( SalomeAppTest );
 
 // --- generic Main program from Basic/Test
 
-#include "BasicMainTest.hxx"
+#include "kernel/BasicMainTest.hxx"

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index b9fdb1525c0806e341932c0a870ba32bd3123018..1c338a3bb8d44247bab412ca657dcb3fea3268dd 100755 (executable)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -24,15 +24,15 @@
 //  Author : Paul RASCLE, EDF
 //  Module : SALOME
 //
-#include <Container_init_python.hxx>
-#include <Utils_ORB_INIT.hxx>
-#include <Utils_SINGLETON.hxx>
-#include <SALOME_NamingService.hxx>
-#include <SALOME_ModuleCatalog_impl.hxx>
-#include <OpUtil.hxx>
-#include <RegistryService.hxx>
-#include <ConnectionManager_i.hxx>
-#include <SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Container_init_python.hxx>
+#include <kernel/Utils_ORB_INIT.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/SALOME_ModuleCatalog_impl.hxx>
+#include <kernel/OpUtil.hxx>
+#include <kernel/RegistryService.hxx>
+#include <kernel/ConnectionManager_i.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
 #ifdef ENABLE_TESTRECORDER
   #include <TestApplication.h>
@@ -46,15 +46,15 @@
 #include <QRegExp>
 #include <QTextStream>
 
-#include <Utils_SALOME_Exception.hxx>
-#include <Utils_CorbaException.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>
+#include <kernel/Utils_CorbaException.hxx>
 #include <SALOME_Event.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Session)
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 #include "Session_ServerLauncher.hxx"
 #include "Session_ServerCheck.hxx"
 

diff --git a/src/Session/SalomeApp_Engine_i.cxx b/src/Session/SalomeApp_Engine_i.cxx
index e861236f795ef804218052c4a5e54963eb1d2958..8355e8e9b894ba6092fb7bc757b4e1a5a91bd4af 100644 (file)
--- a/src/Session/SalomeApp_Engine_i.cxx
+++ b/src/Session/SalomeApp_Engine_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "SalomeApp_Engine_i.hxx"
 
-#include "SALOMEDS_Tool.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
 
 #include <iostream>
 

diff --git a/src/Session/SalomeApp_Engine_i.hxx b/src/Session/SalomeApp_Engine_i.hxx
index b338785d27b8826761a9b3cbfa5992c53d3cf5ec..4f580bb38cf30f278e2715e610e09a9a39b4f054 100755 (executable)
--- a/src/Session/SalomeApp_Engine_i.hxx
+++ b/src/Session/SalomeApp_Engine_i.hxx
@@ -30,7 +30,7 @@
 
 #include "SALOME_Session.hxx"
 
-#include "SALOME_Component_i.hxx"
+#include <kernel/SALOME_Component_i.hxx>
 
 #include <vector> 
 #include <map> 

diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx
index 37218c1903feb071bb1565c6e069cc52446b2064..df1630369225b79741afb2624023af8e9ed7078f 100644 (file)
--- a/src/Session/Session_ServerCheck.cxx
+++ b/src/Session/Session_ServerCheck.cxx
@@ -31,11 +31,11 @@
 #include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
 #include CORBA_CLIENT_HEADER(SALOME_Component)
 
-#include "Utils_ORB_INIT.hxx"
-#include "Utils_SINGLETON.hxx"
-#include "SALOME_NamingService.hxx"
-#include "Basics_Utils.hxx"
-#include "utilities.h"
+#include <kernel/Utils_ORB_INIT.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/Basics_Utils.hxx>
+#include <kernel/utilities.h>
 
 #include <QApplication> 
 #include <QWaitCondition>

diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx
index 14f952927a618c7d5aebaddb809a558a324d56c9..5f3b315c2bf2e0c312d439f05a33aac577c53d02 100755 (executable)
--- a/src/Session/Session_ServerLauncher.cxx
+++ b/src/Session/Session_ServerLauncher.cxx
@@ -28,8 +28,8 @@
 #include "Session_ServerLauncher.hxx"
 #include "Session_ServerThread.hxx"
 
-#include "Utils_SALOME_Exception.hxx"
-#include "utilities.h"
+#include <kernel/Utils_SALOME_Exception.hxx>
+#include <kernel/utilities.h>
 
 #include <QMutex>
 #include <QWaitCondition>

diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx
index 83f6c2de8314e0a58f64e896c023440e1db5141e..6d0a37f13a3df7d6c681088426264406830d2e13 100755 (executable)
--- a/src/Session/Session_ServerThread.cxx
+++ b/src/Session/Session_ServerThread.cxx
@@ -30,22 +30,22 @@
 //
 #include "Session_ServerThread.hxx"
 
-#include <SALOME_NamingService.hxx>
-#include <SALOME_Container_i.hxx>
-#include <SALOME_Launcher.hxx>
-#include <SALOMEDSClient_ClientFactory.hxx>
-#include <SALOME_ModuleCatalog_impl.hxx>
-#include <RegistryService.hxx>
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/SALOME_Container_i.hxx>
+#include <kernel/SALOME_Launcher.hxx>
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/SALOME_ModuleCatalog_impl.hxx>
+#include <kernel/RegistryService.hxx>
 
 #include "Session_Session_i.hxx"
 #include "SalomeApp_Engine_i.hxx"
 
-#include <Utils_ORB_INIT.hxx>
-#include <Utils_SINGLETON.hxx>
-#include <Utils_SALOME_Exception.hxx>
-#include <Basics_Utils.hxx>
-#include <NamingService_WaitForServerReadiness.hxx>
-#include <utilities.h>
+#include <kernel/Utils_ORB_INIT.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>
+#include <kernel/Basics_Utils.hxx>
+#include <kernel/NamingService_WaitForServerReadiness.hxx>
+#include <kernel/utilities.h>
 
 #include <cstdlib>
 #include <ctime>

diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx
index ec065d692e9d54eba8f75d76af6167fba1133026..c3ebec1822808d5e8388f89a59aedd89c833eca7 100755 (executable)
--- a/src/Session/Session_Session_i.cxx
+++ b/src/Session/Session_Session_i.cxx
@@ -25,18 +25,18 @@
 //  Module : SALOME
 //  $Header$
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "Session_Session_i.hxx"
 
-#include "SALOME_NamingService.hxx"
+#include <kernel/SALOME_NamingService.hxx>
 #include "SALOME_Event.h"
 
 #include "SUIT_Session.h"
 #include "SUIT_Desktop.h"
 #include "SUIT_Study.h"
 
-#include "Basics_Utils.hxx"
+#include <kernel/Basics_Utils.hxx>
 
 #include <QMutex>
 #include <QWaitCondition>

diff --git a/src/Style/Style_PrefDlg.h b/src/Style/Style_PrefDlg.h
index d96a4f0838c0ca74a783c19f98b947fce4d12190..d66c2f2cfc68698f871fbc2fcf17fc448ef360f8 100644 (file)
--- a/src/Style/Style_PrefDlg.h
+++ b/src/Style/Style_PrefDlg.h
@@ -27,7 +27,7 @@
 
 #include "Style.h"
 
-#include <QtxDialog.h>
+#include "QtxDialog.h"
 #include <QFrame>
 #include <QMap>
 

diff --git a/src/Style/Style_ResourceMgr.h b/src/Style/Style_ResourceMgr.h
index ab2aaa2fb24879487210503f7b7ec9c798665c91..3cd6920deeccb570723f9e35c5205ef0395d0561 100644 (file)
--- a/src/Style/Style_ResourceMgr.h
+++ b/src/Style/Style_ResourceMgr.h
@@ -27,7 +27,7 @@
 
 #include "Style.h"
 
-#include <QtxResourceMgr.h>
+#include "QtxResourceMgr.h"
 
 //
 // This class is private for Style package.

diff --git a/src/TOOLSGUI/ToolsGUI.h b/src/TOOLSGUI/ToolsGUI.h
index ec62ef5a197891fb6cb70897bd4d2c81e92e1a18..95f1cbb8c18740ea1401984e2b153364e834b933 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI.h
+++ b/src/TOOLSGUI/ToolsGUI.h
@@ -36,8 +36,8 @@
 #  define TOOLSGUI_EXPORT
 #endif  // WIN32
 
-#include "utilities.h"
-#include "SALOMEDSClient.hxx"
+#include <kernel/utilities.h>
+#include <kernel/SALOMEDSClient.hxx>
 
 class TOOLSGUI_EXPORT ToolsGUI  
 {

diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
index 0326eecd4470fd728dd328be13df55d6d1401caa..5be8687e60b2ed597023749e75ea3316de8028e5 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
@@ -47,7 +47,7 @@
 #include <TCollection_AsciiString.hxx>
 #include <Standard_CString.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
index 038eaafbf86e646054ed46355506a765b537d5b3..6117d4d89dd8c969131d8b806ac8afbac0028821 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
@@ -44,13 +44,13 @@
 # include <QLabel>
 # include <QGroupBox>
 
-# include <SALOME_NamingService.hxx>
-# include <ServiceUnreachable.hxx>
-# include <Utils_SINGLETON.hxx>
-# include <Utils_CommException.hxx>
+# include <kernel/SALOME_NamingService.hxx>
+# include <kernel/ServiceUnreachable.hxx>
+# include <kernel/Utils_SINGLETON.hxx>
+# include <kernel/Utils_CommException.hxx>
 
-# include <utilities.h>
-# include <OpUtil.hxx>
+# include <kernel/utilities.h>
+# include <kernel/OpUtil.hxx>
 
 # include <Qtx.h>
 

diff --git a/src/VTKViewer/VTKViewer_ViewManager.h b/src/VTKViewer/VTKViewer_ViewManager.h
index 213df207a1dbb110a8d0820d1fc06009918d612a..306363b75c662e019d8d9ce0d0e8f2bedd2fef26 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ViewManager.h
+++ b/src/VTKViewer/VTKViewer_ViewManager.h
@@ -24,7 +24,7 @@
 
 #include "VTKViewer.h"
 
-#include <SUIT_ViewManager.h>
+#include "SUIT_ViewManager.h"
 
 class SUIT_Desktop;