From 5f2ae0d6f58918f6400e56e5b4de4c6c5e74648f Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 7 Dec 2015 17:27:43 +0300 Subject: [PATCH] Minor changes --- CMakeLists.txt | 1 - src/genericgui/BL_Buttons.cxx | 4 ---- src/genericgui/BL_Buttons.hxx | 6 ++++-- src/genericgui/BL_CreateJobWizard.cxx | 3 --- src/genericgui/BL_CreateJobWizard.hxx | 7 ++++--- src/genericgui/BL_GenericGui.cxx | 5 ----- src/genericgui/BL_GenericGui.hxx | 4 ++++ src/genericgui/BL_JobTab.cxx | 2 -- src/genericgui/BL_JobTab.hxx | 5 ++++- src/genericgui/BL_JobsManager_QT.cxx | 6 ------ src/genericgui/BL_JobsManager_QT.hxx | 8 +++++--- src/genericgui/BL_JobsTable.cxx | 2 -- src/genericgui/BL_JobsTable.hxx | 5 ++++- src/genericgui/BL_Summary.cxx | 2 -- src/genericgui/BL_Summary.hxx | 5 +++++ src/genericgui/JM_EditSalomeResource.cxx | 8 -------- src/genericgui/JM_EditSalomeResource.hxx | 15 ++++++--------- src/genericgui/JM_ResourceCatalog.cxx | 3 --- src/genericgui/JM_ResourceCatalog.hxx | 6 ++++-- src/genericgui/JM_SalomeResource.cxx | 5 ----- src/genericgui/JM_SalomeResource.hxx | 8 ++++---- src/standalone/main.cxx | 5 ++++- src/wrappers/BL_MainWindows_Qt.cxx | 4 ---- src/wrappers/BL_MainWindows_SALOME.cxx | 2 -- src/wrappers/BL_MainWindows_Wrap.hxx | 6 +++++- 25 files changed, 53 insertions(+), 74 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 89d8ead..d340b4c 100755 --- 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 9a58144..39218c3 100644 --- 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 -#include -#include - #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 83cf453..815214f 100644 --- 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 #include -#include -#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif #include "BL_Traces.hxx" diff --git a/src/genericgui/BL_CreateJobWizard.cxx b/src/genericgui/BL_CreateJobWizard.cxx index 6c7ddd6..0367950 100644 --- 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 -#include - #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 8e31953..39d2ea0 100644 --- 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 #include -#include -#include -#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif #include "BL_Traces.hxx" #include "BL_SALOMEServices.hxx" diff --git a/src/genericgui/BL_GenericGui.cxx b/src/genericgui/BL_GenericGui.cxx index a0bc816..2f773be 100644 --- 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 -#include -#include -#include - #include "BL_GenericGui.hxx" #ifdef WNT diff --git a/src/genericgui/BL_GenericGui.hxx b/src/genericgui/BL_GenericGui.hxx index 5130302..2e78812 100644 --- 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 #include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif #include "BL_GenericGuiDefines.hxx" diff --git a/src/genericgui/BL_JobTab.cxx b/src/genericgui/BL_JobTab.cxx index 981d99b..c92f5c9 100644 --- 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 - #include "BL_JobTab.hxx" #include "BL_Traces.hxx" diff --git a/src/genericgui/BL_JobTab.hxx b/src/genericgui/BL_JobTab.hxx index 2ed75a9..89e86cb 100644 --- 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 #include -#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif #include "BL_JobsManager_QT.hxx" diff --git a/src/genericgui/BL_JobsManager_QT.cxx b/src/genericgui/BL_JobsManager_QT.cxx index 888c6aa..cb8d7dd 100644 --- 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 -#include -#include -#include -#include - #include "BL_JobsManager_QT.hxx" #include "BL_GenericGui.hxx" #include diff --git a/src/genericgui/BL_JobsManager_QT.hxx b/src/genericgui/BL_JobsManager_QT.hxx index 956815c..88fb54f 100644 --- 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 -#include -#include +#include +#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif #include "BL_Traces.hxx" #include "BL_JobsManager.hxx" diff --git a/src/genericgui/BL_JobsTable.cxx b/src/genericgui/BL_JobsTable.cxx index 303f512..e8f4391 100644 --- 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 - #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 7e6cad7..a30c202 100644 --- 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 #include -#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif namespace BL { diff --git a/src/genericgui/BL_Summary.cxx b/src/genericgui/BL_Summary.cxx index 6c7dfea..cc87af3 100644 --- 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 - #include "BL_Summary.hxx" #include "BL_Traces.hxx" diff --git a/src/genericgui/BL_Summary.hxx b/src/genericgui/BL_Summary.hxx index 1128508..f16bc74 100644 --- 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 #include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif + #include "BL_JobsManager_QT.hxx" namespace BL diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx index 2c912d2..edc568e 100644 --- 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 -#include -#include -#include -#include -#include -#include - #include "JM_EditSalomeResource.hxx" #include "BL_Traces.hxx" diff --git a/src/genericgui/JM_EditSalomeResource.hxx b/src/genericgui/JM_EditSalomeResource.hxx index 4256ce8..b95afe5 100644 --- 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 +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif + +#include #include "BL_SALOMEServices.hxx" diff --git a/src/genericgui/JM_ResourceCatalog.cxx b/src/genericgui/JM_ResourceCatalog.cxx index 8190744..4d2ded9 100644 --- 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 -#include - #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 d32c37d..078afbb 100644 --- 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 #include -#include -#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif #include "BL_SALOMEServices.hxx" diff --git a/src/genericgui/JM_SalomeResource.cxx b/src/genericgui/JM_SalomeResource.cxx index 1e5a59b..43398b9 100644 --- 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 -#include -#include -#include - #include "JM_SalomeResource.hxx" #include "BL_Traces.hxx" diff --git a/src/genericgui/JM_SalomeResource.hxx b/src/genericgui/JM_SalomeResource.hxx index df53fa4..fbd95f9 100644 --- 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 #include -#include -#include -#include -#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif #include "BL_SALOMEServices.hxx" diff --git a/src/standalone/main.cxx b/src/standalone/main.cxx index 3d9ed56..cef72e3 100644 --- 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 #include -#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#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 9c41b3a..86a0403 100644 --- 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 -#include -#include - #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 06f1c77..2486601 100644 --- 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 - #include "BL_MainWindows_SALOME.hxx" #include diff --git a/src/wrappers/BL_MainWindows_Wrap.hxx b/src/wrappers/BL_MainWindows_Wrap.hxx index 7cdfe1f..74ce42a 100644 --- 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 #include -#include +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif + #include "BL_Traces.hxx" namespace BL -- 2.39.2