Merge relevant changes from V8_0_0_BR branch

diff --git a/SalomeJOBMANAGERConfig.cmake.in b/SalomeJOBMANAGERConfig.cmake.in
index 7dc52f3d1b77d922f2057aeac90341eeee953627..e3f5afc451eff660a5762cff448a4795d9bd7d9a 100644 (file)
--- a/SalomeJOBMANAGERConfig.cmake.in
+++ b/SalomeJOBMANAGERConfig.cmake.in
@@ -53,32 +53,34 @@ SET(SALOME_JOBMANAGER_BUILD_DOC   @SALOME_BUILD_DOC@)
 # Level 1 prerequisites:
 SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")
 
-# For all prerequisites, load the corresponding targets if the package was used 
+# For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-IF(NOT _list_len EQUAL 0)
+SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
-  FOREACH(_p RANGE ${_range})  
-    LIST(GET _PREREQ            ${_p} _pkg    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-    IF(NOT _pkg_compo)
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
-          PATHS "${_pkg_dir}" 
-          NO_DEFAULT_PATH)
-    ELSE()
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          COMPONENTS ${_compo_lst} 
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ELSE()
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()

diff --git a/doc/conf.py.in b/doc/conf.py.in
index 9569f9d8658c9bd96da699e350e6fe3156cd856b..d2d19d3feb28362e6088870fdae0345ce4d4948b 100644 (file)
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -95,7 +95,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
+html_theme = '@SPHINX_THEME@'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".

diff --git a/src/genericgui/BL_Buttons.cxx b/src/genericgui/BL_Buttons.cxx
index 39218c3358aa2e9bce944ea735cc7c1a4897b406..bbfdd7fc6f6644fc246e10591e93791911601d02 100644 (file)
--- a/src/genericgui/BL_Buttons.cxx
+++ b/src/genericgui/BL_Buttons.cxx
@@ -19,6 +19,11 @@
 
 #include "BL_Buttons.hxx"
 
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QPushButton>
+
 BL::Buttons::Buttons(QWidget * parent) : QWidget(parent)
 {
   DEBTRACE("Creating BL::Buttons");

diff --git a/src/genericgui/BL_Buttons.hxx b/src/genericgui/BL_Buttons.hxx
index 632942237cf637b8be6f38f0897b7650381e611c..fc33b23b45243be5137693c19f0c9144ceb5cce1 100644 (file)
--- a/src/genericgui/BL_Buttons.hxx
+++ b/src/genericgui/BL_Buttons.hxx
@@ -20,10 +20,12 @@
 #ifndef _BL_BUTTONS_HXX_
 #define _BL_BUTTONS_HXX_
 
-#include <QtGui>
-
 #include "BL_Traces.hxx"
 
+#include <QWidget>
+
+class QPushButton;
+
 namespace BL 
 {
   class Buttons: public QWidget

diff --git a/src/genericgui/BL_CreateJobWizard.cxx b/src/genericgui/BL_CreateJobWizard.cxx
index 03679503c5600a73898b30c23b7265c21470b5d6..3006ceee018e784f37ba237e6f29e33eac479b92 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.cxx
+++ b/src/genericgui/BL_CreateJobWizard.cxx
@@ -19,6 +19,10 @@
 
 #include "BL_CreateJobWizard.hxx"
 #include "BL_JobsManager_QT.hxx"
+
+#include <QFileDialog>
+#include <QMessageBox>
+
 #ifndef WNT
 #include <unistd.h>
 #include <pwd.h>

diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx
index ee6a34afb89df32f43adb49b3b28d1582ae860df..624577318f2f56fd79f86449d86fa70bab49936c 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.hxx
+++ b/src/genericgui/BL_CreateJobWizard.hxx
@@ -20,22 +20,27 @@
 #ifndef _BL_CREATEJOBWIZARD_HXX_
 #define _BL_CREATEJOBWIZARD_HXX_
 
-#include <QtGui>
-
 #include "BL_Traces.hxx"
 #include "BL_SALOMEServices.hxx"
 #include "JM_ResourceCatalog.hxx"
 
+#include <QWizard>
+#include <QWizardPage>
 #include <string>
 #include <list>
 
+class QGridLayout;
+class QLabel;
+class QLineEdit;
+class QListWidget;
+
 namespace Ui {
   class ResourceRequirementsWizardPage;
   class FilesWizardPage;
   class AdvancedParametersWizardPage;
 }
 
-namespace BL{
+namespace BL {
 
   class JobsManager_QT;
   class JobNamePage;

diff --git a/src/genericgui/BL_GenericGui.cxx b/src/genericgui/BL_GenericGui.cxx
index 2f773bee75b8e8e6f7c3e7061056ea94c05d8247..2ddc632eeff0804e3262e60dcb9e7c0496c4123b 100644 (file)
--- a/src/genericgui/BL_GenericGui.cxx
+++ b/src/genericgui/BL_GenericGui.cxx
@@ -19,6 +19,14 @@
 
 #include "BL_GenericGui.hxx"
 
+#include <QAction>
+#include <QMainWindow>
+#include <QMessageBox>
+#include <QScrollArea>
+#include <QSplitter>
+#include <QStandardItemModel>
+#include <QVBoxLayout>
+
 #ifdef WNT
 #undef ERROR
 #endif

diff --git a/src/genericgui/BL_GenericGui.hxx b/src/genericgui/BL_GenericGui.hxx
index 513030234b8a5e15b3a21f97f85e66ee2bf57c4f..e7a9a92457ed808d283f745847886da7252c0947 100644 (file)
--- a/src/genericgui/BL_GenericGui.hxx
+++ b/src/genericgui/BL_GenericGui.hxx
@@ -20,8 +20,6 @@
 #ifndef _BL_GENERICGUI_HXX_
 #define _BL_GENERICGUI_HXX_
 
-#include <QtGui>
-
 #include "BL_GenericGuiDefines.hxx"
 
 #include "BL_Traces.hxx"
@@ -38,6 +36,13 @@
 #include "BL_Summary.hxx"
 #include "JM_ResourceCatalog.hxx"
 
+#include <QObject>
+
+class QAction;
+class QDockWidget;
+class QMainWindow;
+class QModelIndex;
+
 namespace BL 
 {
   class BL_GenericGui_EXPORT GenericGui: public QObject

diff --git a/src/genericgui/BL_JobTab.cxx b/src/genericgui/BL_JobTab.cxx
index c92f5c9a31012d591347a6e27640faa5017b46d1..08f962a13736d018fb7c721c8dbf45b851212555 100644 (file)
--- a/src/genericgui/BL_JobTab.cxx
+++ b/src/genericgui/BL_JobTab.cxx
@@ -20,6 +20,14 @@
 #include "BL_JobTab.hxx"
 #include "BL_Traces.hxx"
 
+#include <QFormLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QListWidget>
+#include <QStandardItemModel>
+#include <QVBoxLayout>
+
 #ifdef WNT
 #undef ERROR
 #endif

diff --git a/src/genericgui/BL_JobTab.hxx b/src/genericgui/BL_JobTab.hxx
index 46e8a810d0a9f0815277db86feb6ddc9654af8f1..f6933f6d43bb21c749f3240c13cdcad3379bf8cb 100644 (file)
--- a/src/genericgui/BL_JobTab.hxx
+++ b/src/genericgui/BL_JobTab.hxx
@@ -20,10 +20,17 @@
 #ifndef _BL_JOBTAB_HXX_
 #define _BL_JOBTAB_HXX_
 
-#include <QtGui>
-
 #include "BL_JobsManager_QT.hxx"
 
+#include <QTabWidget>
+
+class QFormLayout;
+class QLabel;
+class QListWidget;
+class QModelIndex;
+class QStandardItem;
+class QStandardItemModel;
+
 namespace BL
 {
   class JobTab: public QTabWidget

diff --git a/src/genericgui/BL_JobsManager_QT.cxx b/src/genericgui/BL_JobsManager_QT.cxx
index d2f3e01744c20fe218aa0b61b504d4d4e1b1fd63..4b20741775ad4099442d29d50b849a821b1ca4cb 100644 (file)
--- a/src/genericgui/BL_JobsManager_QT.cxx
+++ b/src/genericgui/BL_JobsManager_QT.cxx
@@ -19,6 +19,18 @@
 
 #include "BL_JobsManager_QT.hxx"
 #include "BL_GenericGui.hxx"
+
+#include <QApplication>
+#include <QFileDialog>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QMenu>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QStandardItemModel>
+#include <QTextEdit>
+#include <QTimer>
+#include <QVBoxLayout>
 #include <vector>
 
 using namespace std;
@@ -132,8 +144,8 @@ BL::JobsManager_QT::save_jobs_button()
   filters << "XML files (*.xml)"
           << "Any files (*)";
   dialog.setFileMode(QFileDialog::AnyFile);
-  dialog.setFilters(filters);
-  dialog.selectFilter("(*.xml)");
+  dialog.setNameFilters(filters);
+  dialog.selectNameFilter("(*.xml)");
   dialog.setDefaultSuffix("xml");
   dialog.setConfirmOverwrite(true);
   dialog.setAcceptMode(QFileDialog::AcceptSave);

diff --git a/src/genericgui/BL_JobsManager_QT.hxx b/src/genericgui/BL_JobsManager_QT.hxx
index c2155ca7461a9944ddc38ab80e3b16f8d50337d0..97c45089f4006cbcc4221a1cfd2d11c62cffd221 100644 (file)
--- a/src/genericgui/BL_JobsManager_QT.hxx
+++ b/src/genericgui/BL_JobsManager_QT.hxx
@@ -20,17 +20,22 @@
 #ifndef _BL_JOBSMANAGER_QT_HXX_
 #define _BL_JOBSMANAGER_QT_HXX_
 
-#include <QObject>
-
 #include "BL_Traces.hxx"
 #include "BL_JobsManager.hxx"
 #include "BL_CreateJobWizard.hxx"
 #include "BL_JobsManager.hxx"
 #include "BL_QModelManager.hxx"
 
+#include <QDockWidget>
+#include <QEvent>
 #include <string>
 
-namespace BL{
+class QPushButton;
+class QTextEdit;
+class QTimer;
+
+namespace BL
+{
 
   class JobManagerEvent : public QEvent
   {

diff --git a/src/genericgui/BL_JobsTable.cxx b/src/genericgui/BL_JobsTable.cxx
index 1579a3998ae512ac975f3b1025b2107229941ba1..c5e9b4c82924a91b9b7c1d88083a4a09f56ce535 100644 (file)
--- a/src/genericgui/BL_JobsTable.cxx
+++ b/src/genericgui/BL_JobsTable.cxx
@@ -21,6 +21,9 @@
 #include "BL_Traces.hxx"
 #include "BL_GenericGui.hxx"
 
+#include <QHeaderView>
+#include <QMainWindow>
+
 BL::JobsTable::JobsTable(QWidget *parent) : QTableView(parent)
 {
   DEBTRACE("Creating BL::JobsTable");

diff --git a/src/genericgui/BL_JobsTable.hxx b/src/genericgui/BL_JobsTable.hxx
index 23875e25bf29b5fe405a6c1b1497be73ca162d37..e48f2b769ebbbbdb699c2e912d4230205b1c7257 100644 (file)
--- a/src/genericgui/BL_JobsTable.hxx
+++ b/src/genericgui/BL_JobsTable.hxx
@@ -20,7 +20,10 @@
 #ifndef _BL_JOBSTABLE_HXX_
 #define _BL_JOBSTABLE_HXX_
 
-#include <QtGui>
+#include <QTableView>
+
+class QItemSelection;
+class QModelIndex;
 
 namespace BL
 {

diff --git a/src/genericgui/BL_QModelManager.cxx b/src/genericgui/BL_QModelManager.cxx
index 3eeda356dab10cf5931488aaacaef9bbadbf3cb9..c7b3884933134253dcc19ecbf1ba7135f8f5859f 100644 (file)
--- a/src/genericgui/BL_QModelManager.cxx
+++ b/src/genericgui/BL_QModelManager.cxx
@@ -20,6 +20,8 @@
 #include "BL_QModelManager.hxx"
 #include "BL_JobsManager_QT.hxx"
 
+#include <QStandardItemModel>
+
 #ifdef WNT
 #undef ERROR
 #endif

diff --git a/src/genericgui/BL_QModelManager.hxx b/src/genericgui/BL_QModelManager.hxx
index 7b93e0bf72c1578b6abc58c66eb9dbaeab61ace1..7c6fd61f6ced56dfac23cc8762e5794011680e27 100644 (file)
--- a/src/genericgui/BL_QModelManager.hxx
+++ b/src/genericgui/BL_QModelManager.hxx
@@ -20,11 +20,14 @@
 #ifndef _BL_QMODELMANAGER_HXX_
 #define _BL_QMODELMANAGER_HXX_
 
-#include <QtGui>
-
 #include "BL_Job.hxx"
 
-namespace BL{
+#include <QObject>
+
+class QStandardItemModel;
+
+namespace BL
+{
 
   class JobsManager_QT;
   class QModelManager: public QObject

diff --git a/src/genericgui/BL_Summary.cxx b/src/genericgui/BL_Summary.cxx
index cc87af337c0c1bd56473c6c456a0e8e5c1c7ab50..86776f462871af33f3e919d870486c996af50f3d 100644 (file)
--- a/src/genericgui/BL_Summary.cxx
+++ b/src/genericgui/BL_Summary.cxx
@@ -20,6 +20,10 @@
 #include "BL_Summary.hxx"
 #include "BL_Traces.hxx"
 
+#include <QFormLayout>
+#include <QLabel>
+#include <QStandardItemModel>
+
 BL::Summary::Summary(QWidget *parent, BL::JobsManager_QT * jobs_manager) : QWidget(parent)
 {
   DEBTRACE("Creating BL::Summary");

diff --git a/src/genericgui/BL_Summary.hxx b/src/genericgui/BL_Summary.hxx
index 11285086134c146d2c3b44fb92f87e03d95ae448..90aa04877aa06d1e8aefe766aff9d8fab6a38e02 100644 (file)
--- a/src/genericgui/BL_Summary.hxx
+++ b/src/genericgui/BL_Summary.hxx
@@ -20,9 +20,15 @@
 #ifndef _BL_SUMMARY_HXX_
 #define _BL_SUMMARY_HXX_
 
-#include <QtGui>
 #include "BL_JobsManager_QT.hxx"
 
+#include <QWidget>
+
+class QLabel;
+class QModelIndex;
+class QStandardItem;
+class QStandardItemModel;
+
 namespace BL 
 {
   class Summary: public QWidget

diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx
index edc568ecf48bd64e8fcf378510bd4189b88b4260..bbbbd4d3dbcaae35b56b9e2c82262a55c64c2076 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.cxx
+++ b/src/genericgui/JM_EditSalomeResource.cxx
@@ -20,6 +20,20 @@
 #include "JM_EditSalomeResource.hxx"
 #include "BL_Traces.hxx"
 
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QInputDialog>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QVBoxLayout>
+
 using namespace std;
 
 JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices * salome_services,

diff --git a/src/genericgui/JM_EditSalomeResource.hxx b/src/genericgui/JM_EditSalomeResource.hxx
index f80b51d5b9fb09dcba88bef622c986bcb8462029..9a83a756ec2e58b8d29eace41cfa5ee940c1fa72 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.hxx
+++ b/src/genericgui/JM_EditSalomeResource.hxx
@@ -20,10 +20,18 @@
 #ifndef _JM_EDITSALOMERESOURCE_HXX_
 #define _JM_EDITSALOMERESOURCE_HXX_
 
-#include <string>
-#include <QtGui>
 #include "BL_SALOMEServices.hxx"
 
+#include <QDialog>
+#include <string>
+
+class QCheckBox;
+class QComboBox;
+class QLineEdit;
+class QListWidget;
+class QPushButton;
+class QSpinBox;
+
 namespace JM 
 {
   class EditSalomeResource: public QDialog

diff --git a/src/genericgui/JM_ResourceCatalog.cxx b/src/genericgui/JM_ResourceCatalog.cxx
index 4d2ded906e7ff6bd791845ce929f34234294a391..766e947c61afdaa89ada2569225861cb3cfe1f5d 100644 (file)
--- a/src/genericgui/JM_ResourceCatalog.cxx
+++ b/src/genericgui/JM_ResourceCatalog.cxx
@@ -22,6 +22,11 @@
 #include "JM_SalomeResource.hxx"
 #include "JM_EditSalomeResource.hxx"
 
+#include <QHBoxLayout>
+#include <QListWidget>
+#include <QPushButton>
+#include <QVBoxLayout>
+
 JM::ResourceCatalog::ResourceCatalog(QWidget *parent, BL::SALOMEServices * salome_services, bool batch_only)
 : QWidget(parent),
   _batch_only(batch_only)

diff --git a/src/genericgui/JM_ResourceCatalog.hxx b/src/genericgui/JM_ResourceCatalog.hxx
index 9acce2516d703d60bce64a2166f98d0d30446866..a9bff6d58e87ecfad5f81da6d05f8733f378f066 100644 (file)
--- a/src/genericgui/JM_ResourceCatalog.hxx
+++ b/src/genericgui/JM_ResourceCatalog.hxx
@@ -20,13 +20,16 @@
 #ifndef _JM_RESOURCECATALOG_HXX_
 #define _JM_RESOURCECATALOG_HXX_
 
-#include <QtGui>
-
 #include "BL_SALOMEServices.hxx"
 
+#include <QWidget>
 #include <string>
 #include <list>
 
+class QListWidget;
+class QListWidgetItem;
+class QPushButton;
+
 namespace JM 
 {
   class ResourceCatalog: public QWidget

diff --git a/src/genericgui/JM_SalomeResource.cxx b/src/genericgui/JM_SalomeResource.cxx
index 43398b9272d63e00e214924efafff46fc837af69..84a3531f956c30844cd567908edb2b19a46d005e 100644 (file)
--- a/src/genericgui/JM_SalomeResource.cxx
+++ b/src/genericgui/JM_SalomeResource.cxx
@@ -20,6 +20,14 @@
 #include "JM_SalomeResource.hxx"
 #include "BL_Traces.hxx"
 
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QVBoxLayout>
+
 JM::SalomeResource::SalomeResource(QWidget *parent, BL::SALOMEServices * salome_services, 
                                    const std::string & resource_name) : QDialog(parent)
 {

diff --git a/src/genericgui/JM_SalomeResource.hxx b/src/genericgui/JM_SalomeResource.hxx
index 62f26d3c35136104b15025e508ade398aa3d00d6..de9a633022c636abd5a0f8de194f939ed162b127 100644 (file)
--- a/src/genericgui/JM_SalomeResource.hxx
+++ b/src/genericgui/JM_SalomeResource.hxx
@@ -20,11 +20,15 @@
 #ifndef _JM_SALOMERESOURCE_HXX_
 #define _JM_SALOMERESOURCE_HXX_
 
-#include <QtGui>
 #include "BL_SALOMEServices.hxx"
 
+#include <QDialog>
 #include <string>
 
+class QCheckBox;
+class QLineEdit;
+class QListWidget;
+
 namespace JM 
 {
   class SalomeResource: public QDialog

diff --git a/src/salomegui/BL_SalomeGui.cxx b/src/salomegui/BL_SalomeGui.cxx
index 91e26090ccd5dce6d410eb0ba8b55585f1418620..5cd5d3d9247e7a17bc8d3b16bb90ca3c24037d60 100644 (file)
--- a/src/salomegui/BL_SalomeGui.cxx
+++ b/src/salomegui/BL_SalomeGui.cxx
@@ -20,6 +20,9 @@
 #include "BL_SalomeGui.hxx"
 #include "JOBMANAGER_version.h"
 
+#include <SUIT_Desktop.h>
+#include <SUIT_ViewWindow.h>
+
 BL::SalomeGui::SalomeGui() : MainWindows_SALOME("JobManager")
 {
   DEBTRACE("Creating BL::SalomeGui");

diff --git a/src/standalone/main.cxx b/src/standalone/main.cxx
index 94960f5e2b7b9fce585d8dbb85f4398c3bbb70d1..0e7d0899bf4870faf682072eedcf100ff885df0e 100644 (file)
--- a/src/standalone/main.cxx
+++ b/src/standalone/main.cxx
@@ -17,10 +17,12 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QtGui>
 #include "BL_GenericGui.hxx"
 #include "BL_MainWindows_Qt.hxx"
 
+#include <QApplication>
+#include <QMainWindow>
+
 int main(int argc, char *argv[])
 {
   QApplication app(argc, argv);

diff --git a/src/wrappers/BL_MainWindows_Qt.cxx b/src/wrappers/BL_MainWindows_Qt.cxx
index 86a0403c9bcd7960e884947647090b353f06246e..0fdcca9c1b4dcc43b01f5b289aa4d2735bebd94f 100644 (file)
--- a/src/wrappers/BL_MainWindows_Qt.cxx
+++ b/src/wrappers/BL_MainWindows_Qt.cxx
@@ -19,6 +19,11 @@
 
 #include "BL_MainWindows_Qt.hxx"
 
+#include <QAction>
+#include <QMainWindow>
+#include <QMenu>
+#include <QMenuBar>
+
 BL::MainWindows_Qt::MainWindows_Qt(QMainWindow * main_window)
 {
   DEBTRACE("Creating BL::MainWindows_Qt");

diff --git a/src/wrappers/BL_MainWindows_Qt.hxx b/src/wrappers/BL_MainWindows_Qt.hxx
index 4604a9c22b1e0db48595fbb0d9e3b26a6f6508de..c85e635937b493928de572026ab8f46ca1db3860 100644 (file)
--- a/src/wrappers/BL_MainWindows_Qt.hxx
+++ b/src/wrappers/BL_MainWindows_Qt.hxx
@@ -32,8 +32,12 @@
 #endif
 
 #include "BL_MainWindows_Wrap.hxx"
+
+#include <QObject>
 #include <map>
 
+class QMenu;
+
 namespace BL
 {
   class BL_Wrappers_Qt_EXPORT MainWindows_Qt : public MainWindows_Wrap, public QObject

diff --git a/src/wrappers/BL_MainWindows_SALOME.cxx b/src/wrappers/BL_MainWindows_SALOME.cxx
index 2486601223ae07d3d4f979d212625506db8ebf39..ae46ceaf6740084f69ca902c82cefedbb155dfe0 100644 (file)
--- a/src/wrappers/BL_MainWindows_SALOME.cxx
+++ b/src/wrappers/BL_MainWindows_SALOME.cxx
@@ -18,7 +18,14 @@
 //
 
 #include "BL_MainWindows_SALOME.hxx"
+
+#include <SalomeApp_Application.h>
 #include <SalomeApp_Engine_i.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ViewManager.h>
+#include <SUIT_ViewWindow.h>
+
+#include <QTextEdit>
 
 BL::MainWindows_SALOME::MainWindows_SALOME(const QString & module_name) :
   SalomeApp_Module(module_name)

diff --git a/src/wrappers/BL_MainWindows_SALOME.hxx b/src/wrappers/BL_MainWindows_SALOME.hxx
index 22cc0c205ae8481009a141124d6bac557e6dd601..39b15bfc11b3c0f00fc9cb5b34fa4b735ae2a8b4 100644 (file)
--- a/src/wrappers/BL_MainWindows_SALOME.hxx
+++ b/src/wrappers/BL_MainWindows_SALOME.hxx
@@ -33,13 +33,11 @@
 
 #include "BL_MainWindows_Wrap.hxx"
 
-#include <SalomeApp_Application.h>
 #include <SalomeApp_Module.h>
 
-#include <SUIT_ViewManager.h>
-#include <SUIT_ViewModel.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_Desktop.h>
+class SalomeApp_Application;
+class SUIT_ViewManager;
+class SUIT_ViewWindow;
 
 namespace BL
 {

diff --git a/src/wrappers/BL_MainWindows_Wrap.hxx b/src/wrappers/BL_MainWindows_Wrap.hxx
index f00efd2a94f9fa9d70b4de824105d9209f4c6767..d70d2f798f979da76240ee22bd3b9b3d4e91a6e9 100644 (file)
--- a/src/wrappers/BL_MainWindows_Wrap.hxx
+++ b/src/wrappers/BL_MainWindows_Wrap.hxx
@@ -21,9 +21,15 @@
 #ifndef _BL_MAINWINDOWS_WRAP_HXX_
 #define _BL_MAINWINDOWS_WRAP_HXX_
 
-#include <QtGui>
 #include "BL_Traces.hxx"
 
+#include <QString>
+
+class QAction;
+class QIcon;
+class QMainWindow;
+class QObject;
+
 namespace BL
 {
   class MainWindows_Wrap