Merge Qt5 porting.

[modules/jobmanager.git] / src / genericgui / BL_CreateJobWizard.hxx

diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx
index 757f2193fd0a9a6045833fc58a68620d348a7245..39d2ea0e0809ed0ce3c3eb3051421e42f6b79e65 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.hxx
+++ b/src/genericgui/BL_CreateJobWizard.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2015  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,11 @@
 #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"
@@ -67,6 +71,7 @@ namespace BL{
     public:
       // Results
       std::string job_name;
+      enum {YACS, COMMAND, PYTHON_SALOME} job_type;
 
       std::string yacs_file;
       std::string command;
@@ -96,6 +101,7 @@ namespace BL{
       std::string resource_choosed;
       std::string batch_queue;
       std::string wckey;
+      std::string extra_params;
 
       bool start_job;
       int dump_yacs_state;
@@ -136,9 +142,6 @@ namespace BL{
       QLabel * _explanation;
 
     public:
-      QRadioButton * _yacs_schema_button;
-      QRadioButton * _command_button;
-      QRadioButton * _python_salome_button;
       bool _check_name;
   };