From f8ab164744df203a8a19f55696ce27b81c2ade89 Mon Sep 17 00:00:00 2001 From: adv Date: Wed, 17 Feb 2010 10:34:38 +0000 Subject: [PATCH] Improve build system: install each module's header files to the sub-directory of ${prefix}/include/salome/${module_name} --- adm_local/unix/config_files/check_GUI.m4 | 2 +- adm_local/unix/make_common_starter.am | 3 ++- idl/Makefile.am | 2 +- src/CAF/CAF_Tools.h | 2 +- src/CAM/CAM_Application.h | 2 +- src/CAM/CAM_DataObject.h | 2 +- src/CAM/CAM_Study.h | 2 +- src/GLViewer/GLViewer_ToolTip.h | 2 +- src/GLViewer/GLViewer_ViewFrame.h | 2 +- src/GLViewer/GLViewer_Viewer.h | 2 +- src/LightApp/LightApp_AboutDlg.h | 2 +- src/LightApp/LightApp_Application.cxx | 2 +- src/LightApp/LightApp_Application.h | 2 +- src/LightApp/LightApp_DataObject.h | 2 +- src/LightApp/LightApp_Dialog.h | 2 +- src/LightApp/LightApp_Displayer.h | 2 +- src/LightApp/LightApp_GLSelector.h | 4 ++-- src/LightApp/LightApp_HDFDriver.cxx | 2 +- src/LightApp/LightApp_Module.h | 2 +- src/LightApp/LightApp_ModuleAction.h | 2 +- src/LightApp/LightApp_OBSelector.h | 4 ++-- src/LightApp/LightApp_OCCSelector.h | 6 ++--- src/LightApp/LightApp_Operation.h | 2 +- src/LightApp/LightApp_Plot2dSelector.h | 6 ++--- src/LightApp/LightApp_Preferences.h | 2 +- src/LightApp/LightApp_PreferencesDlg.h | 2 +- src/LightApp/LightApp_Selection.h | 2 +- src/LightApp/LightApp_SelectionMgr.h | 4 ++-- src/LightApp/LightApp_Study.h | 2 +- src/LogWindow/LogWindow.h | 2 +- src/OBJECT/SALOME_AISObject.hxx | 2 +- src/OBJECT/SALOME_AISShape.hxx | 2 +- src/OBJECT/SALOME_TypeFilter.hxx | 2 +- .../OCCViewer_CreateRestoreViewDlg.h | 4 ++-- src/OCCViewer/OCCViewer_ToolTip.h | 2 +- src/Plot2d/Plot2d_ToolTip.h | 2 +- src/Plot2d/Plot2d_ViewWindow.h | 2 +- src/PyConsole/PyConsole_Console.h | 2 +- src/QDS/QDS_ComboBox.h | 2 +- src/QDS/QDS_Datum.h | 2 +- src/QDS/QDS_RadioBox.h | 2 +- src/QDS/QDS_Table.h | 2 +- .../SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx | 4 ++-- .../SALOME_PYQT_DataModelLight.cxx | 2 +- .../SALOME_PYQT_DataModelLight.h | 4 ++-- .../SALOME_PYQT_DataObjectLight.cxx | 2 +- .../SALOME_PYQT_DataObjectLight.h | 4 ++-- .../SALOME_PYQT_ModuleLight.cxx | 4 ++-- .../SALOME_PYQT_ModuleLight.h | 2 +- .../SALOME_PYQT_PyInterp.cxx | 4 ++-- src/SALOME_PYQT/SalomePyQt/SalomePyQt.h | 4 ++-- src/SOCC/SOCC_Prs.h | 2 +- src/SPlot2d/SPlot2d_Curve.h | 2 +- src/STD/STD_Application.h | 2 +- src/STD/STD_MDIDesktop.h | 2 +- src/STD/STD_SDIDesktop.h | 2 +- src/STD/STD_TabDesktop.h | 2 +- src/SUIT/SUIT_DataBrowser.h | 2 +- src/SUIT/SUIT_Desktop.h | 2 +- src/SUIT/SUIT_ResourceMgr.h | 2 +- src/SUIT/SUIT_Tools.h | 2 +- src/SUIT/SUIT_TreeModel.h | 2 +- src/SUPERVGraph/SUPERVGraph_ViewFrame.h | 2 +- src/SVTK/SVTK_Functor.h | 2 +- src/SalomeApp/SalomeApp_Application.cxx | 10 ++++---- src/SalomeApp/SalomeApp_Application.h | 6 ++--- src/SalomeApp/SalomeApp_CheckFileDlg.h | 2 +- src/SalomeApp/SalomeApp_DataModel.h | 2 +- src/SalomeApp/SalomeApp_DataObject.cxx | 4 ++-- src/SalomeApp/SalomeApp_DataObject.h | 4 ++-- src/SalomeApp/SalomeApp_DoubleSpinBox.cxx | 2 +- src/SalomeApp/SalomeApp_DoubleSpinBox.h | 2 +- src/SalomeApp/SalomeApp_ExceptionHandler.h | 2 +- src/SalomeApp/SalomeApp_ImportOperation.h | 2 +- src/SalomeApp/SalomeApp_IntSpinBox.cxx | 2 +- src/SalomeApp/SalomeApp_IntSpinBox.h | 2 +- src/SalomeApp/SalomeApp_ListView.h | 2 +- src/SalomeApp/SalomeApp_Module.h | 2 +- src/SalomeApp/SalomeApp_NoteBookDlg.cxx | 2 +- src/SalomeApp/SalomeApp_NoteBookDlg.h | 2 +- src/SalomeApp/SalomeApp_PyInterp.cxx | 4 ++-- src/SalomeApp/SalomeApp_Study.cxx | 6 ++--- src/SalomeApp/SalomeApp_Study.h | 4 ++-- src/SalomeApp/SalomeApp_StudyPropertiesDlg.h | 2 +- src/SalomeApp/SalomeApp_Tools.cxx | 2 +- src/SalomeApp/SalomeApp_Tools.h | 2 +- src/SalomeApp/SalomeApp_VisualState.cxx | 4 ++-- src/SalomeApp/Test/TestSalomeApp.cxx | 2 +- src/Session/SALOME_Session_Server.cxx | 24 +++++++++---------- src/Session/SalomeApp_Engine_i.cxx | 2 +- src/Session/SalomeApp_Engine_i.hxx | 2 +- src/Session/Session_ServerCheck.cxx | 10 ++++---- src/Session/Session_ServerLauncher.cxx | 4 ++-- src/Session/Session_ServerThread.cxx | 24 +++++++++---------- src/Session/Session_Session_i.cxx | 6 ++--- src/Style/Style_PrefDlg.h | 2 +- src/Style/Style_ResourceMgr.h | 2 +- src/TOOLSGUI/ToolsGUI.h | 4 ++-- src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx | 2 +- src/TOOLSGUI/ToolsGUI_RegWidget.cxx | 12 +++++----- src/VTKViewer/VTKViewer_ViewManager.h | 2 +- 101 files changed, 164 insertions(+), 163 deletions(-) diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4 index 931449768..86876d4ab 100755 --- 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 1911a0339..fe23431bc 100644 --- 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 c234fd06e..0505b25a3 100644 --- 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 2674afeb5..66b3ac6d4 100755 --- a/src/CAF/CAF_Tools.h +++ b/src/CAF/CAF_Tools.h @@ -27,7 +27,7 @@ #include "CAF.h" -#include +#include "SUIT_Tools.h" #include diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h index 14dc92813..e4e90481e 100755 --- a/src/CAM/CAM_Application.h +++ b/src/CAM/CAM_Application.h @@ -24,7 +24,7 @@ #include "CAM.h" -#include +#include "STD_Application.h" #include class QMenu; diff --git a/src/CAM/CAM_DataObject.h b/src/CAM/CAM_DataObject.h index a2f9aae40..6e49edf1e 100755 --- a/src/CAM/CAM_DataObject.h +++ b/src/CAM/CAM_DataObject.h @@ -24,7 +24,7 @@ #include "CAM.h" -#include +#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 a90d0e5c5..eeecc2793 100755 --- a/src/CAM/CAM_Study.h +++ b/src/CAM/CAM_Study.h @@ -24,7 +24,7 @@ #include "CAM.h" -#include +#include "SUIT_Study.h" #include class CAM_DataModel; diff --git a/src/GLViewer/GLViewer_ToolTip.h b/src/GLViewer/GLViewer_ToolTip.h index fc81dfe27..b40603a4c 100644 --- a/src/GLViewer/GLViewer_ToolTip.h +++ b/src/GLViewer/GLViewer_ToolTip.h @@ -29,7 +29,7 @@ #include "GLViewer.h" //#include -//#include +//#include "QtxToolTip.h" #include #include diff --git a/src/GLViewer/GLViewer_ViewFrame.h b/src/GLViewer/GLViewer_ViewFrame.h index 86cb9ccf7..5fe060adb 100644 --- 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 +#include "QtxAction.h" #ifdef WIN32 #pragma warning( disable:4251 ) diff --git a/src/GLViewer/GLViewer_Viewer.h b/src/GLViewer/GLViewer_Viewer.h index c6626f622..306368528 100644 --- a/src/GLViewer/GLViewer_Viewer.h +++ b/src/GLViewer/GLViewer_Viewer.h @@ -28,7 +28,7 @@ #include "GLViewer.h" #include "GLViewer_Defs.h" -#include +#include "SUIT_ViewModel.h" #include #include diff --git a/src/LightApp/LightApp_AboutDlg.h b/src/LightApp/LightApp_AboutDlg.h index 71216a37e..18a52997c 100644 --- a/src/LightApp/LightApp_AboutDlg.h +++ b/src/LightApp/LightApp_AboutDlg.h @@ -28,7 +28,7 @@ #include "LightApp.h" -#include +#include "QtxDialog.h" class QLabel; diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index 02a85782a..8a9da8c42 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -161,7 +161,7 @@ #include #include -#include +#include #define FIRST_HELP_ID 1000000 diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h index 27d0852af..6d9fae10c 100644 --- a/src/LightApp/LightApp_Application.h +++ b/src/LightApp/LightApp_Application.h @@ -31,7 +31,7 @@ #endif // _MSC_VER > 1000 #include "LightApp.h" -#include +#include "CAM_Application.h" #include diff --git a/src/LightApp/LightApp_DataObject.h b/src/LightApp/LightApp_DataObject.h index 94b4b838b..9d693589d 100644 --- a/src/LightApp/LightApp_DataObject.h +++ b/src/LightApp/LightApp_DataObject.h @@ -26,7 +26,7 @@ #define LIGHTAPP_DATAOBJECT_H #include "LightApp.h" -#include +#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 e7bd0db0d..d2ab47ef4 100644 --- a/src/LightApp/LightApp_Dialog.h +++ b/src/LightApp/LightApp_Dialog.h @@ -26,7 +26,7 @@ #define LIGHTAPP_DIALOG_H #include "LightApp.h" -#include +#include "QtxDialog.h" #include #include diff --git a/src/LightApp/LightApp_Displayer.h b/src/LightApp/LightApp_Displayer.h index 4e3544f2a..1e29b89ce 100644 --- a/src/LightApp/LightApp_Displayer.h +++ b/src/LightApp/LightApp_Displayer.h @@ -24,7 +24,7 @@ #include "LightApp.h" -#include +#include "SALOME_Prs.h" class QString; diff --git a/src/LightApp/LightApp_GLSelector.h b/src/LightApp/LightApp_GLSelector.h index 45260e314..27e2dcd6d 100644 --- a/src/LightApp/LightApp_GLSelector.h +++ b/src/LightApp/LightApp_GLSelector.h @@ -24,9 +24,9 @@ #include "LightApp.h" -#include +#include "SUIT_Selector.h" -#include +#include "GLViewer_Viewer2d.h" #include diff --git a/src/LightApp/LightApp_HDFDriver.cxx b/src/LightApp/LightApp_HDFDriver.cxx index 168f18013..8fdf8bc58 100644 --- 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 diff --git a/src/LightApp/LightApp_Module.h b/src/LightApp/LightApp_Module.h index c608497e5..5a81044fb 100644 --- a/src/LightApp/LightApp_Module.h +++ b/src/LightApp/LightApp_Module.h @@ -28,7 +28,7 @@ #include "LightApp.h" #include "LightApp_Preferences.h" -#include +#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 4be268dec..7a3859292 100755 --- a/src/LightApp/LightApp_ModuleAction.h +++ b/src/LightApp/LightApp_ModuleAction.h @@ -27,7 +27,7 @@ #include "LightApp.h" -#include +#include "QtxAction.h" #ifdef WIN32 #pragma warning ( disable:4251 ) diff --git a/src/LightApp/LightApp_OBSelector.h b/src/LightApp/LightApp_OBSelector.h index 742633565..73a2d0955 100644 --- a/src/LightApp/LightApp_OBSelector.h +++ b/src/LightApp/LightApp_OBSelector.h @@ -27,8 +27,8 @@ #include "LightApp.h" -#include -#include +#include "SUIT_Selector.h" +#include "SUIT_DataOwner.h" #include diff --git a/src/LightApp/LightApp_OCCSelector.h b/src/LightApp/LightApp_OCCSelector.h index d266c7f50..8dc11a39c 100644 --- a/src/LightApp/LightApp_OCCSelector.h +++ b/src/LightApp/LightApp_OCCSelector.h @@ -24,13 +24,13 @@ #include "LightApp.h" -#include -#include +#include "SUIT_Selector.h" +#include "SUIT_DataOwner.h" #include #ifndef DISABLE_OCCVIEWER -#include +#include "OCCViewer_ViewModel.h" class Handle_AIS_InteractiveObject; #endif diff --git a/src/LightApp/LightApp_Operation.h b/src/LightApp/LightApp_Operation.h index c48787502..ccc5d3f70 100755 --- a/src/LightApp/LightApp_Operation.h +++ b/src/LightApp/LightApp_Operation.h @@ -27,7 +27,7 @@ #define LightApp_Operation_H #include "LightApp.h" -#include +#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 b9ba299a3..676c45dae 100755 --- a/src/LightApp/LightApp_Plot2dSelector.h +++ b/src/LightApp/LightApp_Plot2dSelector.h @@ -24,9 +24,9 @@ #include "LightApp.h" -#include -#include -#include +#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 8ab8fbd82..ed71cb235 100644 --- a/src/LightApp/LightApp_Preferences.h +++ b/src/LightApp/LightApp_Preferences.h @@ -26,7 +26,7 @@ #define LIGHTAPP_PREFERENCES_H #include "LightApp.h" -#include +#include "SUIT_PreferenceMgr.h" #include diff --git a/src/LightApp/LightApp_PreferencesDlg.h b/src/LightApp/LightApp_PreferencesDlg.h index 64299c972..7a257a7c2 100644 --- a/src/LightApp/LightApp_PreferencesDlg.h +++ b/src/LightApp/LightApp_PreferencesDlg.h @@ -27,7 +27,7 @@ #include "LightApp.h" -#include +#include "QtxDialog.h" class LightApp_Preferences; diff --git a/src/LightApp/LightApp_Selection.h b/src/LightApp/LightApp_Selection.h index 5e2e17a19..25fddc635 100644 --- a/src/LightApp/LightApp_Selection.h +++ b/src/LightApp/LightApp_Selection.h @@ -29,7 +29,7 @@ #define LIGHTAPP_SELECTION_HeaderFile #include "LightApp.h" -#include +#include "QtxPopupMgr.h" class LightApp_SelectionMgr; class LightApp_DataOwner; diff --git a/src/LightApp/LightApp_SelectionMgr.h b/src/LightApp/LightApp_SelectionMgr.h index 9a6b11804..d68089cfe 100644 --- a/src/LightApp/LightApp_SelectionMgr.h +++ b/src/LightApp/LightApp_SelectionMgr.h @@ -24,10 +24,10 @@ #include "LightApp.h" -#include +#include "SUIT_SelectionMgr.h" #ifndef DISABLE_SALOMEOBJECT - #include + #include "SALOME_InteractiveObject.hxx" #include #include diff --git a/src/LightApp/LightApp_Study.h b/src/LightApp/LightApp_Study.h index d47e7c054..5081f8f19 100644 --- a/src/LightApp/LightApp_Study.h +++ b/src/LightApp/LightApp_Study.h @@ -25,7 +25,7 @@ #include "LightApp.h" #include "LightApp_Driver.h" -#include +#include "CAM_Study.h" #include "string" #include "vector" diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h index f552a4229..40d2e817a 100755 --- a/src/LogWindow/LogWindow.h +++ b/src/LogWindow/LogWindow.h @@ -36,7 +36,7 @@ # define LOGWINDOW_EXPORT #endif -#include +#include "SUIT_PopupClient.h" #include #include diff --git a/src/OBJECT/SALOME_AISObject.hxx b/src/OBJECT/SALOME_AISObject.hxx index b94df74c8..ac5cb380f 100755 --- a/src/OBJECT/SALOME_AISObject.hxx +++ b/src/OBJECT/SALOME_AISObject.hxx @@ -37,7 +37,7 @@ #include #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#include "Handle_SALOME_InteractiveObject.hxx" #endif #ifndef _Standard_Boolean_HeaderFile #include diff --git a/src/OBJECT/SALOME_AISShape.hxx b/src/OBJECT/SALOME_AISShape.hxx index 9d5cc5a24..6dd577210 100755 --- a/src/OBJECT/SALOME_AISShape.hxx +++ b/src/OBJECT/SALOME_AISShape.hxx @@ -37,7 +37,7 @@ #include #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#include "Handle_SALOME_InteractiveObject.hxx" #endif #ifndef _AIS_Shape_HeaderFile #include diff --git a/src/OBJECT/SALOME_TypeFilter.hxx b/src/OBJECT/SALOME_TypeFilter.hxx index b4304ce89..4d7e26e36 100644 --- a/src/OBJECT/SALOME_TypeFilter.hxx +++ b/src/OBJECT/SALOME_TypeFilter.hxx @@ -43,7 +43,7 @@ #include #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#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 bc67b5468..c5431d76b 100755 --- 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 -#include +#include "QtxDialog.h" +#include "SUIT_Application.h" #include #include diff --git a/src/OCCViewer/OCCViewer_ToolTip.h b/src/OCCViewer/OCCViewer_ToolTip.h index 5ff60c81c..731c98d93 100644 --- a/src/OCCViewer/OCCViewer_ToolTip.h +++ b/src/OCCViewer/OCCViewer_ToolTip.h @@ -23,7 +23,7 @@ #define OCCVIEWER_TOOLTIP_H #include "OCCViewer.h" -#include +#include "QtxToolTip.h" #include class OCCViewer_ViewWindow; diff --git a/src/Plot2d/Plot2d_ToolTip.h b/src/Plot2d/Plot2d_ToolTip.h index 95afdf432..10ebd71f8 100644 --- a/src/Plot2d/Plot2d_ToolTip.h +++ b/src/Plot2d/Plot2d_ToolTip.h @@ -26,7 +26,7 @@ #define PLOT2D_TOOLTIP_H #include "Plot2d.h" -#include +#include "QtxToolTip.h" class Plot2d_ViewFrame; class Plot2d_Plot2d; diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h index bd3c15dcb..3dbc0d0df 100755 --- a/src/Plot2d/Plot2d_ViewWindow.h +++ b/src/Plot2d/Plot2d_ViewWindow.h @@ -26,7 +26,7 @@ #define PLOT2D_VIEWWINDOW_H #include "Plot2d.h" -#include +#include "SUIT_ViewWindow.h" #include diff --git a/src/PyConsole/PyConsole_Console.h b/src/PyConsole/PyConsole_Console.h index 790450c61..5460282d8 100644 --- a/src/PyConsole/PyConsole_Console.h +++ b/src/PyConsole/PyConsole_Console.h @@ -27,7 +27,7 @@ #include "PyConsole.h" -#include +#include "SUIT_PopupClient.h" #include #include diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h index 8bc0f1c58..aabaa2dc7 100644 --- a/src/QDS/QDS_ComboBox.h +++ b/src/QDS/QDS_ComboBox.h @@ -28,7 +28,7 @@ #include #include -#include +#include "Qtx.h" class QtxComboBox; diff --git a/src/QDS/QDS_Datum.h b/src/QDS/QDS_Datum.h index e438a4e17..ecfcd428b 100644 --- a/src/QDS/QDS_Datum.h +++ b/src/QDS/QDS_Datum.h @@ -32,7 +32,7 @@ class QVBoxLayout; class QGridLayout; class QValidator; -#include +#include "DDS_DicItem.h" class QWidget; diff --git a/src/QDS/QDS_RadioBox.h b/src/QDS/QDS_RadioBox.h index 0d667d45c..1f64dcaaf 100644 --- a/src/QDS/QDS_RadioBox.h +++ b/src/QDS/QDS_RadioBox.h @@ -24,7 +24,7 @@ #include "QDS_Datum.h" -#include +#include "Qtx.h" #include #include diff --git a/src/QDS/QDS_Table.h b/src/QDS/QDS_Table.h index 9384371aa..137f827bb 100644 --- a/src/QDS/QDS_Table.h +++ b/src/QDS/QDS_Table.h @@ -24,7 +24,7 @@ #include "QDS_Datum.h" -#include +#include "QtxTable.h" #include #include 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 10d777ce2..7ae9e597b 100644 --- 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 -#include +#include +#include #include 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 614dfba64..8690b287b 100644 --- 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 +#include #include #include 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 275c084d4..a48632abc 100644 --- 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 +#include "LightApp_DataModel.h" -#include +#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 9e0ef56d6..121e9a25e 100644 --- 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 #include -#include +#include #include 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 a99e0212a..979efe5f4 100644 --- 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 -#include +#include "LightApp_DataObject.h" +#include "LightApp_Study.h" #include 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 b9e9bed8d..5a85c726e 100644 --- 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 +#include #endif #include @@ -71,7 +71,7 @@ #include "sipQtGuiQMenu.h" #endif -#include +#include /*! \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 6326e1df8..5339b4738 100644 --- 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 +#include "CAM_Module.h" #include #include 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 eac78e7ea..25a2d9099 100644 --- 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 #include -#include +#include #ifndef GUI_DISABLE_CORBA -#include +#include #endif diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h index 0818fe7cf..6a1d5c33d 100644 --- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h @@ -29,8 +29,8 @@ #include #include -#include -#include +#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 007a68f90..9fdd118ec 100644 --- a/src/SOCC/SOCC_Prs.h +++ b/src/SOCC/SOCC_Prs.h @@ -30,7 +30,7 @@ #include "SOCC.h" -#include +#include "SALOME_Prs.h" #include diff --git a/src/SPlot2d/SPlot2d_Curve.h b/src/SPlot2d/SPlot2d_Curve.h index 444fddda7..0dc4a734d 100644 --- 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 +#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 6f8fc68fb..15be521fe 100755 --- a/src/STD/STD_Application.h +++ b/src/STD/STD_Application.h @@ -24,7 +24,7 @@ #include "STD.h" -#include +#include "SUIT_Application.h" #include diff --git a/src/STD/STD_MDIDesktop.h b/src/STD/STD_MDIDesktop.h index a229ab713..c03e91f32 100755 --- a/src/STD/STD_MDIDesktop.h +++ b/src/STD/STD_MDIDesktop.h @@ -24,7 +24,7 @@ #include "STD.h" -#include +#include "SUIT_Desktop.h" class QtxWorkspace; class QtxWorkspaceAction; diff --git a/src/STD/STD_SDIDesktop.h b/src/STD/STD_SDIDesktop.h index d5e17e891..e6883f2f1 100755 --- a/src/STD/STD_SDIDesktop.h +++ b/src/STD/STD_SDIDesktop.h @@ -24,7 +24,7 @@ #include "STD.h" -#include +#include "SUIT_Desktop.h" class QFrame; diff --git a/src/STD/STD_TabDesktop.h b/src/STD/STD_TabDesktop.h index 57d5195ad..5673f8bdd 100644 --- a/src/STD/STD_TabDesktop.h +++ b/src/STD/STD_TabDesktop.h @@ -24,7 +24,7 @@ #include "STD.h" -#include +#include "SUIT_Desktop.h" class QtxWorkstack; class QtxWorkstackAction; diff --git a/src/SUIT/SUIT_DataBrowser.h b/src/SUIT/SUIT_DataBrowser.h index f619e4ff3..16b32f454 100644 --- 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 +#include "OB_Browser.h" class QShortcut; diff --git a/src/SUIT/SUIT_Desktop.h b/src/SUIT/SUIT_Desktop.h index ad49bd55e..44f877562 100755 --- a/src/SUIT/SUIT_Desktop.h +++ b/src/SUIT/SUIT_Desktop.h @@ -27,7 +27,7 @@ #include #include -#include +#include "QtxMainWindow.h" class QMovie; diff --git a/src/SUIT/SUIT_ResourceMgr.h b/src/SUIT/SUIT_ResourceMgr.h index e0ff7ce17..b2159089b 100755 --- a/src/SUIT/SUIT_ResourceMgr.h +++ b/src/SUIT/SUIT_ResourceMgr.h @@ -24,7 +24,7 @@ #include "SUIT.h" -#include +#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 ec2527826..e34c6bc16 100755 --- a/src/SUIT/SUIT_Tools.h +++ b/src/SUIT/SUIT_Tools.h @@ -24,7 +24,7 @@ #include "SUIT.h" -#include +#include "Qtx.h" #include #include diff --git a/src/SUIT/SUIT_TreeModel.h b/src/SUIT/SUIT_TreeModel.h index 59828481e..ec8a25000 100755 --- a/src/SUIT/SUIT_TreeModel.h +++ b/src/SUIT/SUIT_TreeModel.h @@ -27,7 +27,7 @@ #include "SUIT.h" -#include +#include "Qtx.h" #include #include diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h index 2bbf9d8d7..72faad8f6 100755 --- 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 +#include "QtxAction.h" #ifdef WIN32 #pragma warning ( disable:4251 ) diff --git a/src/SVTK/SVTK_Functor.h b/src/SVTK/SVTK_Functor.h index 2cf0f02ce..612098555 100644 --- a/src/SVTK/SVTK_Functor.h +++ b/src/SVTK/SVTK_Functor.h @@ -26,7 +26,7 @@ #include -#include +#include "VTKViewer_Functor.h" #include "SALOME_InteractiveObject.hxx" diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx index 41896b0b8..9f605a8aa 100644 --- a/src/SalomeApp/SalomeApp_Application.cxx +++ b/src/SalomeApp/SalomeApp_Application.cxx @@ -70,9 +70,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include @@ -84,8 +84,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h index 57c3f87f7..d85f14de9 100644 --- a/src/SalomeApp/SalomeApp_Application.h +++ b/src/SalomeApp/SalomeApp_Application.h @@ -31,15 +31,15 @@ #endif // _MSC_VER > 1000 #include "SalomeApp.h" -#include +#include "LightApp_Application.h" #include //#include //#include CORBA_CLIENT_HEADER(SALOMEDS) -#include +#include -#include "SALOMEDSClient.hxx" +#include class LightApp_Preferences; class SalomeApp_Study; diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.h b/src/SalomeApp/SalomeApp_CheckFileDlg.h index 74e857b6b..af73e5e36 100644 --- a/src/SalomeApp/SalomeApp_CheckFileDlg.h +++ b/src/SalomeApp/SalomeApp_CheckFileDlg.h @@ -24,7 +24,7 @@ #include "SalomeApp.h" -#include +#include "SUIT_FileDlg.h" class QCheckBox; diff --git a/src/SalomeApp/SalomeApp_DataModel.h b/src/SalomeApp/SalomeApp_DataModel.h index 53b2f701c..89870dc01 100644 --- 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 class SalomeApp_Module; class SalomeApp_Study; diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx index dbc07fe66..95f09b4bf 100644 --- a/src/SalomeApp/SalomeApp_DataObject.cxx +++ b/src/SalomeApp/SalomeApp_DataObject.cxx @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/SalomeApp/SalomeApp_DataObject.h b/src/SalomeApp/SalomeApp_DataObject.h index b8f4b39a1..dff9b5fa5 100644 --- a/src/SalomeApp/SalomeApp_DataObject.h +++ b/src/SalomeApp/SalomeApp_DataObject.h @@ -26,8 +26,8 @@ #define SALOMEAPP_DATAOBJECT_H #include "SalomeApp.h" -#include -#include +#include "LightApp_DataObject.h" +#include class SalomeApp_Study; diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx index f83897839..390cfbe1c 100644 --- a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx +++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx @@ -28,7 +28,7 @@ #include -#include "SALOMEDSClient_ClientFactory.hxx" +#include #include CORBA_SERVER_HEADER(SALOMEDS) #include diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.h b/src/SalomeApp/SalomeApp_DoubleSpinBox.h index c5b6539ca..f185ab725 100644 --- a/src/SalomeApp/SalomeApp_DoubleSpinBox.h +++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.h @@ -24,7 +24,7 @@ #include "SalomeApp.h" -#include +#include "QtxDoubleSpinBox.h" #include diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.h b/src/SalomeApp/SalomeApp_ExceptionHandler.h index 64a26afbe..1f705135b 100644 --- a/src/SalomeApp/SalomeApp_ExceptionHandler.h +++ b/src/SalomeApp/SalomeApp_ExceptionHandler.h @@ -24,7 +24,7 @@ #include "SalomeApp.h" -#include +#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 337aa9a83..dea5e7ec3 100644 --- a/src/SalomeApp/SalomeApp_ImportOperation.h +++ b/src/SalomeApp/SalomeApp_ImportOperation.h @@ -32,7 +32,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include "SUIT_Operation.h" class SUIT_Application; diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.cxx b/src/SalomeApp/SalomeApp_IntSpinBox.cxx index 76625adc9..fafa466c3 100644 --- a/src/SalomeApp/SalomeApp_IntSpinBox.cxx +++ b/src/SalomeApp/SalomeApp_IntSpinBox.cxx @@ -28,7 +28,7 @@ #include -#include "SALOMEDSClient_ClientFactory.hxx" +#include #include CORBA_SERVER_HEADER(SALOMEDS) #include diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.h b/src/SalomeApp/SalomeApp_IntSpinBox.h index d15fe99c1..928a1fcfc 100644 --- a/src/SalomeApp/SalomeApp_IntSpinBox.h +++ b/src/SalomeApp/SalomeApp_IntSpinBox.h @@ -24,7 +24,7 @@ #include "SalomeApp.h" -#include +#include "QtxIntSpinBox.h" #include diff --git a/src/SalomeApp/SalomeApp_ListView.h b/src/SalomeApp/SalomeApp_ListView.h index ea418cad6..100eea1ff 100644 --- a/src/SalomeApp/SalomeApp_ListView.h +++ b/src/SalomeApp/SalomeApp_ListView.h @@ -27,7 +27,7 @@ //#include -#include +#include "SUIT_PopupClient.h" #include #include diff --git a/src/SalomeApp/SalomeApp_Module.h b/src/SalomeApp/SalomeApp_Module.h index b248966db..b3fbf2f01 100644 --- a/src/SalomeApp/SalomeApp_Module.h +++ b/src/SalomeApp/SalomeApp_Module.h @@ -28,7 +28,7 @@ #include "SalomeApp.h" -#include +#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 e4e4934b9..65cb60f4c 100644 --- a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx +++ b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.h b/src/SalomeApp/SalomeApp_NoteBookDlg.h index 93709477c..afc3cb6d3 100644 --- a/src/SalomeApp/SalomeApp_NoteBookDlg.h +++ b/src/SalomeApp/SalomeApp_NoteBookDlg.h @@ -25,7 +25,7 @@ #include "SalomeApp.h" -#include "SALOMEDSClient_ClientFactory.hxx" +#include #include CORBA_SERVER_HEADER(SALOMEDS) #include diff --git a/src/SalomeApp/SalomeApp_PyInterp.cxx b/src/SalomeApp/SalomeApp_PyInterp.cxx index 51868318c..5ec530862 100755 --- a/src/SalomeApp/SalomeApp_PyInterp.cxx +++ b/src/SalomeApp/SalomeApp_PyInterp.cxx @@ -27,8 +27,8 @@ // #include "SalomeApp_PyInterp.h" -#include -#include +#include +#include #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 4b18f8a6c..17bf0cf91 100644 --- a/src/SalomeApp/SalomeApp_Study.cxx +++ b/src/SalomeApp/SalomeApp_Study.cxx @@ -33,11 +33,11 @@ #include -#include "utilities.h" +#include -#include "SALOMEDS_Tool.hxx" +#include -#include "SALOMEDSClient_ClientFactory.hxx" +#include #include #include CORBA_SERVER_HEADER(SALOME_Exception) diff --git a/src/SalomeApp/SalomeApp_Study.h b/src/SalomeApp/SalomeApp_Study.h index 217423d1a..6e791fdeb 100644 --- a/src/SalomeApp/SalomeApp_Study.h +++ b/src/SalomeApp/SalomeApp_Study.h @@ -24,13 +24,13 @@ #include "SalomeApp.h" -#include +#include "LightApp_Study.h" #ifdef WIN32 #pragma warning( disable:4251 ) #endif -#include "SALOMEDSClient.hxx" +#include class SALOMEAPP_EXPORT SalomeApp_Study : public LightApp_Study { diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h index ce56f996e..05e3395c4 100644 --- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h +++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h @@ -33,7 +33,7 @@ #include #include CORBA_SERVER_HEADER(SALOMEDS) -#include +#include class SalomeApp_ListView; class QPushButton; diff --git a/src/SalomeApp/SalomeApp_Tools.cxx b/src/SalomeApp/SalomeApp_Tools.cxx index 80f6a9639..6e1a5f701 100644 --- a/src/SalomeApp/SalomeApp_Tools.cxx +++ b/src/SalomeApp/SalomeApp_Tools.cxx @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/src/SalomeApp/SalomeApp_Tools.h b/src/SalomeApp/SalomeApp_Tools.h index f341a2824..87df8a2fe 100644 --- a/src/SalomeApp/SalomeApp_Tools.h +++ b/src/SalomeApp/SalomeApp_Tools.h @@ -24,7 +24,7 @@ #include "SalomeApp.h" -#include +#include "SUIT_Tools.h" class QColor; class QString; diff --git a/src/SalomeApp/SalomeApp_VisualState.cxx b/src/SalomeApp/SalomeApp_VisualState.cxx index a642bd2df..7b86aa0e5 100644 --- a/src/SalomeApp/SalomeApp_VisualState.cxx +++ b/src/SalomeApp/SalomeApp_VisualState.cxx @@ -36,8 +36,8 @@ #include #include -#include //? -#include //? +#include //? +#include //? #include //? #include //? diff --git a/src/SalomeApp/Test/TestSalomeApp.cxx b/src/SalomeApp/Test/TestSalomeApp.cxx index bc917025c..32587cbd8 100644 --- 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 b9fdb1525..1c338a3bb 100755 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef ENABLE_TESTRECORDER #include @@ -46,15 +46,15 @@ #include #include -#include -#include +#include +#include #include #include #include CORBA_SERVER_HEADER(SALOME_Session) #include CORBA_SERVER_HEADER(SALOMEDS) -#include +#include #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 e861236f7..8355e8e9b 100644 --- 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 #include diff --git a/src/Session/SalomeApp_Engine_i.hxx b/src/Session/SalomeApp_Engine_i.hxx index b338785d2..4f580bb38 100755 --- 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 #include #include diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx index 37218c190..df1630369 100644 --- 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 +#include +#include +#include +#include #include #include diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx index 14f952927..5f3b315c2 100755 --- 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 +#include #include #include diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx index 83f6c2de8..6d0a37f13 100755 --- a/src/Session/Session_ServerThread.cxx +++ b/src/Session/Session_ServerThread.cxx @@ -30,22 +30,22 @@ // #include "Session_ServerThread.hxx" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "Session_Session_i.hxx" #include "SalomeApp_Engine_i.hxx" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx index ec065d692..c3ebec182 100755 --- 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 #include "Session_Session_i.hxx" -#include "SALOME_NamingService.hxx" +#include #include "SALOME_Event.h" #include "SUIT_Session.h" #include "SUIT_Desktop.h" #include "SUIT_Study.h" -#include "Basics_Utils.hxx" +#include #include #include diff --git a/src/Style/Style_PrefDlg.h b/src/Style/Style_PrefDlg.h index d96a4f083..d66c2f2cf 100644 --- a/src/Style/Style_PrefDlg.h +++ b/src/Style/Style_PrefDlg.h @@ -27,7 +27,7 @@ #include "Style.h" -#include +#include "QtxDialog.h" #include #include diff --git a/src/Style/Style_ResourceMgr.h b/src/Style/Style_ResourceMgr.h index ab2aaa2fb..3cd6920de 100644 --- a/src/Style/Style_ResourceMgr.h +++ b/src/Style/Style_ResourceMgr.h @@ -27,7 +27,7 @@ #include "Style.h" -#include +#include "QtxResourceMgr.h" // // This class is private for Style package. diff --git a/src/TOOLSGUI/ToolsGUI.h b/src/TOOLSGUI/ToolsGUI.h index ec62ef5a1..95f1cbb8c 100755 --- 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 +#include class TOOLSGUI_EXPORT ToolsGUI { diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx index 0326eecd4..5be8687e6 100755 --- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx +++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx @@ -47,7 +47,7 @@ #include #include -#include "utilities.h" +#include using namespace std; diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx index 038eaafbf..6117d4d89 100755 --- a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx +++ b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx @@ -44,13 +44,13 @@ # include # include -# include -# include -# include -# include +# include +# include +# include +# include -# include -# include +# include +# include # include diff --git a/src/VTKViewer/VTKViewer_ViewManager.h b/src/VTKViewer/VTKViewer_ViewManager.h index 213df207a..306363b75 100755 --- a/src/VTKViewer/VTKViewer_ViewManager.h +++ b/src/VTKViewer/VTKViewer_ViewManager.h @@ -24,7 +24,7 @@ #include "VTKViewer.h" -#include +#include "SUIT_ViewManager.h" class SUIT_Desktop; -- 2.39.2