From 1522183c174bd920a364044e82cf50daf2a150c3 Mon Sep 17 00:00:00 2001 From: vsr Date: Sat, 20 Feb 2016 11:00:26 +0300 Subject: [PATCH] Update from V7_dev branch --- src/genericgui/BL_Buttons.cxx | 5 +++++ src/genericgui/BL_Buttons.hxx | 10 ++++------ src/genericgui/BL_CreateJobWizard.cxx | 4 ++++ src/genericgui/BL_CreateJobWizard.hxx | 15 ++++++++------- src/genericgui/BL_GenericGui.cxx | 8 ++++++++ src/genericgui/BL_GenericGui.hxx | 13 +++++++------ src/genericgui/BL_JobTab.cxx | 8 ++++++++ src/genericgui/BL_JobTab.hxx | 15 +++++++++------ src/genericgui/BL_JobsManager_QT.cxx | 12 ++++++++++++ src/genericgui/BL_JobsManager_QT.hxx | 15 ++++++++------- src/genericgui/BL_JobsTable.cxx | 3 +++ src/genericgui/BL_JobsTable.hxx | 9 ++++----- src/genericgui/BL_QModelManager.cxx | 2 ++ src/genericgui/BL_QModelManager.hxx | 9 ++++++--- src/genericgui/BL_Summary.cxx | 4 ++++ src/genericgui/BL_Summary.hxx | 13 +++++++------ src/genericgui/JM_EditSalomeResource.cxx | 14 ++++++++++++++ src/genericgui/JM_EditSalomeResource.hxx | 14 ++++++++------ src/genericgui/JM_ResourceCatalog.cxx | 5 +++++ src/genericgui/JM_ResourceCatalog.hxx | 11 +++++------ src/genericgui/JM_SalomeResource.cxx | 8 ++++++++ src/genericgui/JM_SalomeResource.hxx | 11 +++++------ src/salomegui/BL_SalomeGui.cxx | 3 +++ src/standalone/main.cxx | 9 +++------ src/wrappers/BL_MainWindows_Qt.cxx | 5 +++++ src/wrappers/BL_MainWindows_Qt.hxx | 4 ++++ src/wrappers/BL_MainWindows_SALOME.cxx | 7 +++++++ src/wrappers/BL_MainWindows_SALOME.hxx | 8 +++----- src/wrappers/BL_MainWindows_Wrap.hxx | 13 +++++++------ 29 files changed, 176 insertions(+), 81 deletions(-) diff --git a/src/genericgui/BL_Buttons.cxx b/src/genericgui/BL_Buttons.cxx index 39218c3..bbfdd7f 100644 --- a/src/genericgui/BL_Buttons.cxx +++ b/src/genericgui/BL_Buttons.cxx @@ -19,6 +19,11 @@ #include "BL_Buttons.hxx" +#include +#include +#include +#include + 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 815214f..fc33b23 100644 --- a/src/genericgui/BL_Buttons.hxx +++ b/src/genericgui/BL_Buttons.hxx @@ -20,14 +20,12 @@ #ifndef _BL_BUTTONS_HXX_ #define _BL_BUTTONS_HXX_ -#include -#include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#include -#endif - #include "BL_Traces.hxx" +#include + +class QPushButton; + namespace BL { class Buttons: public QWidget diff --git a/src/genericgui/BL_CreateJobWizard.cxx b/src/genericgui/BL_CreateJobWizard.cxx index 0367950..3006cee 100644 --- 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 +#include + #ifndef WNT #include #include diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx index 39d2ea0..6245773 100644 --- a/src/genericgui/BL_CreateJobWizard.hxx +++ b/src/genericgui/BL_CreateJobWizard.hxx @@ -20,26 +20,27 @@ #ifndef _BL_CREATEJOBWIZARD_HXX_ #define _BL_CREATEJOBWIZARD_HXX_ -#include -#include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#include -#endif - #include "BL_Traces.hxx" #include "BL_SALOMEServices.hxx" #include "JM_ResourceCatalog.hxx" +#include +#include #include #include +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 2f773be..2ddc632 100644 --- a/src/genericgui/BL_GenericGui.cxx +++ b/src/genericgui/BL_GenericGui.cxx @@ -19,6 +19,14 @@ #include "BL_GenericGui.hxx" +#include +#include +#include +#include +#include +#include +#include + #ifdef WNT #undef ERROR #endif diff --git a/src/genericgui/BL_GenericGui.hxx b/src/genericgui/BL_GenericGui.hxx index 2e78812..e7a9a92 100644 --- a/src/genericgui/BL_GenericGui.hxx +++ b/src/genericgui/BL_GenericGui.hxx @@ -20,12 +20,6 @@ #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" #include "BL_Traces.hxx" @@ -42,6 +36,13 @@ #include "BL_Summary.hxx" #include "JM_ResourceCatalog.hxx" +#include + +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 c92f5c9..08f962a 100644 --- 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 +#include +#include +#include +#include +#include +#include + #ifdef WNT #undef ERROR #endif diff --git a/src/genericgui/BL_JobTab.hxx b/src/genericgui/BL_JobTab.hxx index 89e86cb..f6933f6 100644 --- a/src/genericgui/BL_JobTab.hxx +++ b/src/genericgui/BL_JobTab.hxx @@ -20,14 +20,17 @@ #ifndef _BL_JOBTAB_HXX_ #define _BL_JOBTAB_HXX_ -#include -#include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#include -#endif - #include "BL_JobsManager_QT.hxx" +#include + +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 cb8d7dd..4b20741 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include using namespace std; diff --git a/src/genericgui/BL_JobsManager_QT.hxx b/src/genericgui/BL_JobsManager_QT.hxx index 88fb54f..97c4508 100644 --- a/src/genericgui/BL_JobsManager_QT.hxx +++ b/src/genericgui/BL_JobsManager_QT.hxx @@ -20,21 +20,22 @@ #ifndef _BL_JOBSMANAGER_QT_HXX_ #define _BL_JOBSMANAGER_QT_HXX_ -#include -#include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#include -#endif - #include "BL_Traces.hxx" #include "BL_JobsManager.hxx" #include "BL_CreateJobWizard.hxx" #include "BL_JobsManager.hxx" #include "BL_QModelManager.hxx" +#include +#include #include -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 e8f4391..d208e50 100644 --- 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 +#include + 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 a30c202..e48f2b7 100644 --- a/src/genericgui/BL_JobsTable.hxx +++ b/src/genericgui/BL_JobsTable.hxx @@ -20,11 +20,10 @@ #ifndef _BL_JOBSTABLE_HXX_ #define _BL_JOBSTABLE_HXX_ -#include -#include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#include -#endif +#include + +class QItemSelection; +class QModelIndex; namespace BL { diff --git a/src/genericgui/BL_QModelManager.cxx b/src/genericgui/BL_QModelManager.cxx index 3eeda35..c7b3884 100644 --- 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 + #ifdef WNT #undef ERROR #endif diff --git a/src/genericgui/BL_QModelManager.hxx b/src/genericgui/BL_QModelManager.hxx index 7b93e0b..7c6fd61 100644 --- 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 - #include "BL_Job.hxx" -namespace BL{ +#include + +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 cc87af3..86776f4 100644 --- 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 +#include +#include + 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 f16bc74..90aa048 100644 --- a/src/genericgui/BL_Summary.hxx +++ b/src/genericgui/BL_Summary.hxx @@ -20,14 +20,15 @@ #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" +#include + +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 edc568e..bbbbd4d 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + 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 b95afe5..9a83a75 100644 --- a/src/genericgui/JM_EditSalomeResource.hxx +++ b/src/genericgui/JM_EditSalomeResource.hxx @@ -20,15 +20,17 @@ #ifndef _JM_EDITSALOMERESOURCE_HXX_ #define _JM_EDITSALOMERESOURCE_HXX_ -#include -#include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#include -#endif +#include "BL_SALOMEServices.hxx" +#include #include -#include "BL_SALOMEServices.hxx" +class QCheckBox; +class QComboBox; +class QLineEdit; +class QListWidget; +class QPushButton; +class QSpinBox; namespace JM { diff --git a/src/genericgui/JM_ResourceCatalog.cxx b/src/genericgui/JM_ResourceCatalog.cxx index 4d2ded9..766e947 100644 --- 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 +#include +#include +#include + 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 078afbb..a9bff6d 100644 --- a/src/genericgui/JM_ResourceCatalog.hxx +++ b/src/genericgui/JM_ResourceCatalog.hxx @@ -20,17 +20,16 @@ #ifndef _JM_RESOURCECATALOG_HXX_ #define _JM_RESOURCECATALOG_HXX_ -#include -#include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#include -#endif - #include "BL_SALOMEServices.hxx" +#include #include #include +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 43398b9..84a3531 100644 --- 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 +#include +#include +#include +#include +#include +#include + 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 fbd95f9..de9a633 100644 --- a/src/genericgui/JM_SalomeResource.hxx +++ b/src/genericgui/JM_SalomeResource.hxx @@ -20,16 +20,15 @@ #ifndef _JM_SALOMERESOURCE_HXX_ #define _JM_SALOMERESOURCE_HXX_ -#include -#include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#include -#endif - #include "BL_SALOMEServices.hxx" +#include #include +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 91e2609..5cd5d3d 100644 --- 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 +#include + BL::SalomeGui::SalomeGui() : MainWindows_SALOME("JobManager") { DEBTRACE("Creating BL::SalomeGui"); diff --git a/src/standalone/main.cxx b/src/standalone/main.cxx index cef72e3..0e7d089 100644 --- a/src/standalone/main.cxx +++ b/src/standalone/main.cxx @@ -17,15 +17,12 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include -#include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#include -#endif - #include "BL_GenericGui.hxx" #include "BL_MainWindows_Qt.hxx" +#include +#include + 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 86a0403..0fdcca9 100644 --- a/src/wrappers/BL_MainWindows_Qt.cxx +++ b/src/wrappers/BL_MainWindows_Qt.cxx @@ -19,6 +19,11 @@ #include "BL_MainWindows_Qt.hxx" +#include +#include +#include +#include + 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 4604a9c..c85e635 100644 --- 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 #include +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 2486601..ae46cea 100644 --- a/src/wrappers/BL_MainWindows_SALOME.cxx +++ b/src/wrappers/BL_MainWindows_SALOME.cxx @@ -18,7 +18,14 @@ // #include "BL_MainWindows_SALOME.hxx" + +#include #include +#include +#include +#include + +#include 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 22cc0c2..39b15bf 100644 --- a/src/wrappers/BL_MainWindows_SALOME.hxx +++ b/src/wrappers/BL_MainWindows_SALOME.hxx @@ -33,13 +33,11 @@ #include "BL_MainWindows_Wrap.hxx" -#include #include -#include -#include -#include -#include +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 74ce42a..d70d2f7 100644 --- a/src/wrappers/BL_MainWindows_Wrap.hxx +++ b/src/wrappers/BL_MainWindows_Wrap.hxx @@ -21,14 +21,15 @@ #ifndef _BL_MAINWINDOWS_WRAP_HXX_ #define _BL_MAINWINDOWS_WRAP_HXX_ -#include -#include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#include -#endif - #include "BL_Traces.hxx" +#include + +class QAction; +class QIcon; +class QMainWindow; +class QObject; + namespace BL { class MainWindows_Wrap -- 2.39.2