]> SALOME platform Git repositories - modules/jobmanager.git/commitdiff
Salome HOME
Update from V7_dev branch V8_0_0_BR V8_0_0 V8_0_0rc2
authorvsr <vsr@opencascade.com>
Sat, 20 Feb 2016 08:00:26 +0000 (11:00 +0300)
committervsr <vsr@opencascade.com>
Sat, 20 Feb 2016 08:02:31 +0000 (11:02 +0300)
29 files changed:
src/genericgui/BL_Buttons.cxx
src/genericgui/BL_Buttons.hxx
src/genericgui/BL_CreateJobWizard.cxx
src/genericgui/BL_CreateJobWizard.hxx
src/genericgui/BL_GenericGui.cxx
src/genericgui/BL_GenericGui.hxx
src/genericgui/BL_JobTab.cxx
src/genericgui/BL_JobTab.hxx
src/genericgui/BL_JobsManager_QT.cxx
src/genericgui/BL_JobsManager_QT.hxx
src/genericgui/BL_JobsTable.cxx
src/genericgui/BL_JobsTable.hxx
src/genericgui/BL_QModelManager.cxx
src/genericgui/BL_QModelManager.hxx
src/genericgui/BL_Summary.cxx
src/genericgui/BL_Summary.hxx
src/genericgui/JM_EditSalomeResource.cxx
src/genericgui/JM_EditSalomeResource.hxx
src/genericgui/JM_ResourceCatalog.cxx
src/genericgui/JM_ResourceCatalog.hxx
src/genericgui/JM_SalomeResource.cxx
src/genericgui/JM_SalomeResource.hxx
src/salomegui/BL_SalomeGui.cxx
src/standalone/main.cxx
src/wrappers/BL_MainWindows_Qt.cxx
src/wrappers/BL_MainWindows_Qt.hxx
src/wrappers/BL_MainWindows_SALOME.cxx
src/wrappers/BL_MainWindows_SALOME.hxx
src/wrappers/BL_MainWindows_Wrap.hxx

index 39218c3358aa2e9bce944ea735cc7c1a4897b406..bbfdd7fc6f6644fc246e10591e93791911601d02 100644 (file)
 
 #include "BL_Buttons.hxx"
 
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QPushButton>
+
 BL::Buttons::Buttons(QWidget * parent) : QWidget(parent)
 {
   DEBTRACE("Creating BL::Buttons");
index 815214f9503777ed2e654bedcd2983fc91ed7d9f..fc33b23b45243be5137693c19f0c9144ceb5cce1 100644 (file)
 #ifndef _BL_BUTTONS_HXX_
 #define _BL_BUTTONS_HXX_
 
-#include <QtGlobal>
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
-
 #include "BL_Traces.hxx"
 
+#include <QWidget>
+
+class QPushButton;
+
 namespace BL 
 {
   class Buttons: public QWidget
index 03679503c5600a73898b30c23b7265c21470b5d6..3006ceee018e784f37ba237e6f29e33eac479b92 100644 (file)
 
 #include "BL_CreateJobWizard.hxx"
 #include "BL_JobsManager_QT.hxx"
+
+#include <QFileDialog>
+#include <QMessageBox>
+
 #ifndef WNT
 #include <unistd.h>
 #include <pwd.h>
index 39d2ea0e0809ed0ce3c3eb3051421e42f6b79e65..624577318f2f56fd79f86449d86fa70bab49936c 100644 (file)
 #ifndef _BL_CREATEJOBWIZARD_HXX_
 #define _BL_CREATEJOBWIZARD_HXX_
 
-#include <QtGlobal>
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
-
 #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;
index 2f773bee75b8e8e6f7c3e7061056ea94c05d8247..2ddc632eeff0804e3262e60dcb9e7c0496c4123b 100644 (file)
 
 #include "BL_GenericGui.hxx"
 
+#include <QAction>
+#include <QMainWindow>
+#include <QMessageBox>
+#include <QScrollArea>
+#include <QSplitter>
+#include <QStandardItemModel>
+#include <QVBoxLayout>
+
 #ifdef WNT
 #undef ERROR
 #endif
index 2e78812c72ee99bdb0618457e4c08e0a912eddda..e7a9a92457ed808d283f745847886da7252c0947 100644 (file)
 #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"
 
 #include "BL_Traces.hxx"
 #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
index c92f5c9a31012d591347a6e27640faa5017b46d1..08f962a13736d018fb7c721c8dbf45b851212555 100644 (file)
 #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
index 89e86cbdc0d46423282ad2478a96e7812e851ee1..f6933f6d43bb21c749f3240c13cdcad3379bf8cb 100644 (file)
 #ifndef _BL_JOBTAB_HXX_
 #define _BL_JOBTAB_HXX_
 
-#include <QtGlobal>
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
-
 #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
index cb8d7ddd8f887259b8d02adf4b287099602ae0df..4b20741775ad4099442d29d50b849a821b1ca4cb 100644 (file)
 
 #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;
index 88fb54f2d598b53bd5e1d3c7a696346f20cd14f4..97c45089f4006cbcc4221a1cfd2d11c62cffd221 100644 (file)
 #ifndef _BL_JOBSMANAGER_QT_HXX_
 #define _BL_JOBSMANAGER_QT_HXX_
 
-#include <QtGlobal>
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
-
 #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
   {
index e8f439171a8cd7fd091d6b1dd105a6152e3a40a0..d208e503e966abe5d41fbe1da0c48850369290e1 100644 (file)
@@ -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");
index a30c202ecf4714d3982cc3666ffc368d3e741ecb..e48f2b769ebbbbdb699c2e912d4230205b1c7257 100644 (file)
 #ifndef _BL_JOBSTABLE_HXX_
 #define _BL_JOBSTABLE_HXX_
 
-#include <QtGlobal>
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
+#include <QTableView>
+
+class QItemSelection;
+class QModelIndex;
 
 namespace BL
 {
index 3eeda356dab10cf5931488aaacaef9bbadbf3cb9..c7b3884933134253dcc19ecbf1ba7135f8f5859f 100644 (file)
@@ -20,6 +20,8 @@
 #include "BL_QModelManager.hxx"
 #include "BL_JobsManager_QT.hxx"
 
+#include <QStandardItemModel>
+
 #ifdef WNT
 #undef ERROR
 #endif
index 7b93e0bf72c1578b6abc58c66eb9dbaeab61ace1..7c6fd61f6ced56dfac23cc8762e5794011680e27 100644 (file)
 #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
index cc87af337c0c1bd56473c6c456a0e8e5c1c7ab50..86776f462871af33f3e919d870486c996af50f3d 100644 (file)
 #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");
index f16bc746abb1faa2af2954e5d75d4747e616a731..90aa04877aa06d1e8aefe766aff9d8fab6a38e02 100644 (file)
 #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"
 
+#include <QWidget>
+
+class QLabel;
+class QModelIndex;
+class QStandardItem;
+class QStandardItemModel;
+
 namespace BL 
 {
   class Summary: public QWidget
index edc568ecf48bd64e8fcf378510bd4189b88b4260..bbbbd4d3dbcaae35b56b9e2c82262a55c64c2076 100644 (file)
 #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,
index b95afe521ac50f4611771ad66dcfb37aa59abac0..9a83a756ec2e58b8d29eace41cfa5ee940c1fa72 100644 (file)
 #ifndef _JM_EDITSALOMERESOURCE_HXX_
 #define _JM_EDITSALOMERESOURCE_HXX_
 
-#include <QtGlobal>
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
+#include "BL_SALOMEServices.hxx"
 
+#include <QDialog>
 #include <string>
 
-#include "BL_SALOMEServices.hxx"
+class QCheckBox;
+class QComboBox;
+class QLineEdit;
+class QListWidget;
+class QPushButton;
+class QSpinBox;
 
 namespace JM 
 {
index 4d2ded906e7ff6bd791845ce929f34234294a391..766e947c61afdaa89ada2569225861cb3cfe1f5d 100644 (file)
 #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)
index 078afbbf4e5f79143b573ed0619c00275904e6de..a9bff6d58e87ecfad5f81da6d05f8733f378f066 100644 (file)
 #ifndef _JM_RESOURCECATALOG_HXX_
 #define _JM_RESOURCECATALOG_HXX_
 
-#include <QtGlobal>
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
-
 #include "BL_SALOMEServices.hxx"
 
+#include <QWidget>
 #include <string>
 #include <list>
 
+class QListWidget;
+class QListWidgetItem;
+class QPushButton;
+
 namespace JM 
 {
   class ResourceCatalog: public QWidget
index 43398b9272d63e00e214924efafff46fc837af69..84a3531f956c30844cd567908edb2b19a46d005e 100644 (file)
 #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)
 {
index fbd95f9b2c14f62fee2ae2319e1897fec2d7ed2c..de9a633022c636abd5a0f8de194f939ed162b127 100644 (file)
 #ifndef _JM_SALOMERESOURCE_HXX_
 #define _JM_SALOMERESOURCE_HXX_
 
-#include <QtGlobal>
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
-
 #include "BL_SALOMEServices.hxx"
 
+#include <QDialog>
 #include <string>
 
+class QCheckBox;
+class QLineEdit;
+class QListWidget;
+
 namespace JM 
 {
   class SalomeResource: public QDialog
index 91e26090ccd5dce6d410eb0ba8b55585f1418620..5cd5d3d9247e7a17bc8d3b16bb90ca3c24037d60 100644 (file)
@@ -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");
index cef72e30533bfe969dfc00e7eb0255f511ee5bab..0e7d0899bf4870faf682072eedcf100ff885df0e 100644 (file)
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QtGlobal>
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
-
 #include "BL_GenericGui.hxx"
 #include "BL_MainWindows_Qt.hxx"
 
+#include <QApplication>
+#include <QMainWindow>
+
 int main(int argc, char *argv[])
 {
   QApplication app(argc, argv);
index 86a0403c9bcd7960e884947647090b353f06246e..0fdcca9c1b4dcc43b01f5b289aa4d2735bebd94f 100644 (file)
 
 #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");
index 4604a9c22b1e0db48595fbb0d9e3b26a6f6508de..c85e635937b493928de572026ab8f46ca1db3860 100644 (file)
 #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
index 2486601223ae07d3d4f979d212625506db8ebf39..ae46ceaf6740084f69ca902c82cefedbb155dfe0 100644 (file)
 //
 
 #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)
index 22cc0c205ae8481009a141124d6bac557e6dd601..39b15bfc11b3c0f00fc9cb5b34fa4b735ae2a8b4 100644 (file)
 
 #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
 {
index 74ce42a6c9f644b2c48eb54eb6631ac5750a1b3c..d70d2f798f979da76240ee22bd3b9b3d4e91a6e9 100644 (file)
 #ifndef _BL_MAINWINDOWS_WRAP_HXX_
 #define _BL_MAINWINDOWS_WRAP_HXX_
 
-#include <QtGlobal>
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
-
 #include "BL_Traces.hxx"
 
+#include <QString>
+
+class QAction;
+class QIcon;
+class QMainWindow;
+class QObject;
+
 namespace BL
 {
   class MainWindows_Wrap