Minor changes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89d8eadc244093f70dcb43412ec646ec3d2dc674..d340b4cd3b7435fb6484599a07fa6b248bef1a54 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,6 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 # Qt
 IF(NOT SALOME_GUI_BUILD_WITH_QT5)
   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
-  INCLUDE(${QT_USE_FILE})
 ELSE()
   FIND_PACKAGE(SalomeQt5 REQUIRED)
 ENDIF()

diff --git a/src/genericgui/BL_Buttons.cxx b/src/genericgui/BL_Buttons.cxx
index 9a581444bbe858c1ca48519c0adaae0a13f0b5c8..39218c3358aa2e9bce944ea735cc7c1a4897b406 100644 (file)
--- a/src/genericgui/BL_Buttons.cxx
+++ b/src/genericgui/BL_Buttons.cxx
@@ -17,10 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QGridLayout>
-
 #include "BL_Buttons.hxx"
 
 BL::Buttons::Buttons(QWidget * parent) : QWidget(parent)

diff --git a/src/genericgui/BL_Buttons.hxx b/src/genericgui/BL_Buttons.hxx
index 83cf45316394c1c073c1eb22fcf547d679866fae..815214f9503777ed2e654bedcd2983fc91ed7d9f 100644 (file)
--- a/src/genericgui/BL_Buttons.hxx
+++ b/src/genericgui/BL_Buttons.hxx
@@ -20,9 +20,11 @@
 #ifndef _BL_BUTTONS_HXX_
 #define _BL_BUTTONS_HXX_
 
+#include <QtGlobal>
 #include <QtGui>
-#include <QWidget>
-#include <QPushButton>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
 
 #include "BL_Traces.hxx"
 

diff --git a/src/genericgui/BL_CreateJobWizard.cxx b/src/genericgui/BL_CreateJobWizard.cxx
index 6c7ddd6523ab0d7df252fadec5f91fdcd302be9b..03679503c5600a73898b30c23b7265c21470b5d6 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.cxx
+++ b/src/genericgui/BL_CreateJobWizard.cxx
@@ -17,9 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QFileDialog>
-#include <QMessageBox>
-
 #include "BL_CreateJobWizard.hxx"
 #include "BL_JobsManager_QT.hxx"
 #ifndef WNT

diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx
index 8e319530da420ca5ac1abc4d846a055732328477..39d2ea0e0809ed0ce3c3eb3051421e42f6b79e65 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.hxx
+++ b/src/genericgui/BL_CreateJobWizard.hxx
@@ -20,10 +20,11 @@
 #ifndef _BL_CREATEJOBWIZARD_HXX_
 #define _BL_CREATEJOBWIZARD_HXX_
 
+#include <QtGlobal>
 #include <QtGui>
-#include <QWizard>
-#include <QLabel>
-#include <QGridLayout>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
 
 #include "BL_Traces.hxx"
 #include "BL_SALOMEServices.hxx"

diff --git a/src/genericgui/BL_GenericGui.cxx b/src/genericgui/BL_GenericGui.cxx
index a0bc816152c2aa2cf8a86953807bebcfd11722a6..2f773bee75b8e8e6f7c3e7061056ea94c05d8247 100644 (file)
--- a/src/genericgui/BL_GenericGui.cxx
+++ b/src/genericgui/BL_GenericGui.cxx
@@ -17,11 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QAction>
-#include <QMessageBox>
-#include <QScrollArea>
-#include <QSplitter>
-
 #include "BL_GenericGui.hxx"
 
 #ifdef WNT

diff --git a/src/genericgui/BL_GenericGui.hxx b/src/genericgui/BL_GenericGui.hxx
index 513030234b8a5e15b3a21f97f85e66ee2bf57c4f..2e78812c72ee99bdb0618457e4c08e0a912eddda 100644 (file)
--- a/src/genericgui/BL_GenericGui.hxx
+++ b/src/genericgui/BL_GenericGui.hxx
@@ -20,7 +20,11 @@
 #ifndef _BL_GENERICGUI_HXX_
 #define _BL_GENERICGUI_HXX_
 
+#include <QtGlobal>
 #include <QtGui>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
 
 #include "BL_GenericGuiDefines.hxx"
 

diff --git a/src/genericgui/BL_JobTab.cxx b/src/genericgui/BL_JobTab.cxx
index 981d99be534d57fc743e6cd9a05f5ec803f23d32..c92f5c9a31012d591347a6e27640faa5017b46d1 100644 (file)
--- a/src/genericgui/BL_JobTab.cxx
+++ b/src/genericgui/BL_JobTab.cxx
@@ -17,8 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QGroupBox>
-
 #include "BL_JobTab.hxx"
 #include "BL_Traces.hxx"
 

diff --git a/src/genericgui/BL_JobTab.hxx b/src/genericgui/BL_JobTab.hxx
index 2ed75a9dac8f20ddc2763ba28b43d289bdf09414..89e86cbdc0d46423282ad2478a96e7812e851ee1 100644 (file)
--- a/src/genericgui/BL_JobTab.hxx
+++ b/src/genericgui/BL_JobTab.hxx
@@ -20,8 +20,11 @@
 #ifndef _BL_JOBTAB_HXX_
 #define _BL_JOBTAB_HXX_
 
+#include <QtGlobal>
 #include <QtGui>
-#include <QFormLayout>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
 
 #include "BL_JobsManager_QT.hxx"
 

diff --git a/src/genericgui/BL_JobsManager_QT.cxx b/src/genericgui/BL_JobsManager_QT.cxx
index 888c6aa0055cc23dfb02cdc9281ba763a2f6df98..cb8d7ddd8f887259b8d02adf4b287099602ae0df 100644 (file)
--- a/src/genericgui/BL_JobsManager_QT.cxx
+++ b/src/genericgui/BL_JobsManager_QT.cxx
@@ -17,12 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QApplication>
-#include <QFileDialog>
-#include <QGroupBox>
-#include <QMenu>
-#include <QScrollArea>
-
 #include "BL_JobsManager_QT.hxx"
 #include "BL_GenericGui.hxx"
 #include <vector>

diff --git a/src/genericgui/BL_JobsManager_QT.hxx b/src/genericgui/BL_JobsManager_QT.hxx
index 956815c8ffef7cb692395e87806699b85cabfc4a..88fb54f2d598b53bd5e1d3c7a696346f20cd14f4 100644 (file)
--- a/src/genericgui/BL_JobsManager_QT.hxx
+++ b/src/genericgui/BL_JobsManager_QT.hxx
@@ -20,9 +20,11 @@
 #ifndef _BL_JOBSMANAGER_QT_HXX_
 #define _BL_JOBSMANAGER_QT_HXX_
 
-#include <QObject>
-#include <QDockWidget>
-#include <QTextEdit>
+#include <QtGlobal>
+#include <QtGui>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
 
 #include "BL_Traces.hxx"
 #include "BL_JobsManager.hxx"

diff --git a/src/genericgui/BL_JobsTable.cxx b/src/genericgui/BL_JobsTable.cxx
index 303f512b6557d9802ca5e8582d0b0c3674ce3891..e8f439171a8cd7fd091d6b1dd105a6152e3a40a0 100644 (file)
--- a/src/genericgui/BL_JobsTable.cxx
+++ b/src/genericgui/BL_JobsTable.cxx
@@ -17,8 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QHeaderView>
-
 #include "BL_JobsTable.hxx"
 #include "BL_Traces.hxx"
 #include "BL_GenericGui.hxx"

diff --git a/src/genericgui/BL_JobsTable.hxx b/src/genericgui/BL_JobsTable.hxx
index 7e6cad7c938dd048c5d3756686bc673cebdd3e62..a30c202ecf4714d3982cc3666ffc368d3e741ecb 100644 (file)
--- a/src/genericgui/BL_JobsTable.hxx
+++ b/src/genericgui/BL_JobsTable.hxx
@@ -20,8 +20,11 @@
 #ifndef _BL_JOBSTABLE_HXX_
 #define _BL_JOBSTABLE_HXX_
 
+#include <QtGlobal>
 #include <QtGui>
-#include <QTableView>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
 
 namespace BL
 {

diff --git a/src/genericgui/BL_Summary.cxx b/src/genericgui/BL_Summary.cxx
index 6c7dfea61ce75a749ffb0dd8c2feeeb988c2ccd0..cc87af337c0c1bd56473c6c456a0e8e5c1c7ab50 100644 (file)
--- a/src/genericgui/BL_Summary.cxx
+++ b/src/genericgui/BL_Summary.cxx
@@ -17,8 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QFormLayout>
-
 #include "BL_Summary.hxx"
 #include "BL_Traces.hxx"
 

diff --git a/src/genericgui/BL_Summary.hxx b/src/genericgui/BL_Summary.hxx
index 11285086134c146d2c3b44fb92f87e03d95ae448..f16bc746abb1faa2af2954e5d75d4747e616a731 100644 (file)
--- a/src/genericgui/BL_Summary.hxx
+++ b/src/genericgui/BL_Summary.hxx
@@ -20,7 +20,12 @@
 #ifndef _BL_SUMMARY_HXX_
 #define _BL_SUMMARY_HXX_
 
+#include <QtGlobal>
 #include <QtGui>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
+
 #include "BL_JobsManager_QT.hxx"
 
 namespace BL 

diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx
index 2c912d20503cbeb95942d68ac283f9982fed3a7f..edc568ecf48bd64e8fcf378510bd4189b88b4260 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.cxx
+++ b/src/genericgui/JM_EditSalomeResource.cxx
@@ -17,14 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QDialogButtonBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QInputDialog>
-#include <QMessageBox>
-#include <QLabel>
-#include <QVBoxLayout>
-
 #include "JM_EditSalomeResource.hxx"
 #include "BL_Traces.hxx"
 

diff --git a/src/genericgui/JM_EditSalomeResource.hxx b/src/genericgui/JM_EditSalomeResource.hxx
index 4256ce8abb97a9cbeb4512aa83f25b54602f8012..b95afe521ac50f4611771ad66dcfb37aa59abac0 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.hxx
+++ b/src/genericgui/JM_EditSalomeResource.hxx
@@ -20,16 +20,13 @@
 #ifndef _JM_EDITSALOMERESOURCE_HXX_
 #define _JM_EDITSALOMERESOURCE_HXX_
 
-#include <string>
+#include <QtGlobal>
 #include <QtGui>
-#include <QDialog>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QLineEdit>
-#include <QListWidget>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QWidget>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
+
+#include <string>
 
 #include "BL_SALOMEServices.hxx"
 

diff --git a/src/genericgui/JM_ResourceCatalog.cxx b/src/genericgui/JM_ResourceCatalog.cxx
index 8190744a3cbbb998893af893521e93e5af279d56..4d2ded906e7ff6bd791845ce929f34234294a391 100644 (file)
--- a/src/genericgui/JM_ResourceCatalog.cxx
+++ b/src/genericgui/JM_ResourceCatalog.cxx
@@ -17,9 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-
 #include "JM_ResourceCatalog.hxx"
 #include "BL_Traces.hxx"
 #include "JM_SalomeResource.hxx"

diff --git a/src/genericgui/JM_ResourceCatalog.hxx b/src/genericgui/JM_ResourceCatalog.hxx
index d32c37d531abb78033560b7f517ab80d959a010b..078afbbf4e5f79143b573ed0619c00275904e6de 100644 (file)
--- a/src/genericgui/JM_ResourceCatalog.hxx
+++ b/src/genericgui/JM_ResourceCatalog.hxx
@@ -20,9 +20,11 @@
 #ifndef _JM_RESOURCECATALOG_HXX_
 #define _JM_RESOURCECATALOG_HXX_
 
+#include <QtGlobal>
 #include <QtGui>
-#include <QListWidget>
-#include <QPushButton>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
 
 #include "BL_SALOMEServices.hxx"
 

diff --git a/src/genericgui/JM_SalomeResource.cxx b/src/genericgui/JM_SalomeResource.cxx
index 1e5a59b42da006a90adca9a7080e23edd58bfaab..43398b9272d63e00e214924efafff46fc837af69 100644 (file)
--- a/src/genericgui/JM_SalomeResource.cxx
+++ b/src/genericgui/JM_SalomeResource.cxx
@@ -17,11 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QVBoxLayout>
-
 #include "JM_SalomeResource.hxx"
 #include "BL_Traces.hxx"
 

diff --git a/src/genericgui/JM_SalomeResource.hxx b/src/genericgui/JM_SalomeResource.hxx
index df53fa41c0717cc26fb4c0f4ff893cf5f4d7dd5c..fbd95f9b2c14f62fee2ae2319e1897fec2d7ed2c 100644 (file)
--- a/src/genericgui/JM_SalomeResource.hxx
+++ b/src/genericgui/JM_SalomeResource.hxx
@@ -20,11 +20,11 @@
 #ifndef _JM_SALOMERESOURCE_HXX_
 #define _JM_SALOMERESOURCE_HXX_
 
+#include <QtGlobal>
 #include <QtGui>
-#include <QDialog>
-#include <QCheckBox>
-#include <QLineEdit>
-#include <QListWidget>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
 
 #include "BL_SALOMEServices.hxx"
 

diff --git a/src/standalone/main.cxx b/src/standalone/main.cxx
index 3d9ed5689836d6bd08e48ba6ec14b6eb45ed7705..cef72e30533bfe969dfc00e7eb0255f511ee5bab 100644 (file)
--- a/src/standalone/main.cxx
+++ b/src/standalone/main.cxx
@@ -17,8 +17,11 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+#include <QtGlobal>
 #include <QtGui>
-#include <QApplication>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
 
 #include "BL_GenericGui.hxx"
 #include "BL_MainWindows_Qt.hxx"

diff --git a/src/wrappers/BL_MainWindows_Qt.cxx b/src/wrappers/BL_MainWindows_Qt.cxx
index 9c41b3a81ec8389756d83130dc09b0ca4c525e35..86a0403c9bcd7960e884947647090b353f06246e 100644 (file)
--- a/src/wrappers/BL_MainWindows_Qt.cxx
+++ b/src/wrappers/BL_MainWindows_Qt.cxx
@@ -17,10 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QAction>
-#include <QMenu>
-#include <QMenuBar>
-
 #include "BL_MainWindows_Qt.hxx"
 
 BL::MainWindows_Qt::MainWindows_Qt(QMainWindow * main_window)

diff --git a/src/wrappers/BL_MainWindows_SALOME.cxx b/src/wrappers/BL_MainWindows_SALOME.cxx
index 06f1c77c1603b400ae8bece92303234296520ba0..2486601223ae07d3d4f979d212625506db8ebf39 100644 (file)
--- a/src/wrappers/BL_MainWindows_SALOME.cxx
+++ b/src/wrappers/BL_MainWindows_SALOME.cxx
@@ -17,8 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QTextEdit>
-
 #include "BL_MainWindows_SALOME.hxx"
 #include <SalomeApp_Engine_i.h>
 

diff --git a/src/wrappers/BL_MainWindows_Wrap.hxx b/src/wrappers/BL_MainWindows_Wrap.hxx
index 7cdfe1fe44defdd4b99f3c8fec169411cf37e069..74ce42a6c9f644b2c48eb54eb6631ac5750a1b3c 100644 (file)
--- a/src/wrappers/BL_MainWindows_Wrap.hxx
+++ b/src/wrappers/BL_MainWindows_Wrap.hxx
@@ -21,8 +21,12 @@
 #ifndef _BL_MAINWINDOWS_WRAP_HXX_
 #define _BL_MAINWINDOWS_WRAP_HXX_
 
+#include <QtGlobal>
 #include <QtGui>
-#include <QMainWindow>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets>
+#endif
+
 #include "BL_Traces.hxx"
 
 namespace BL