From: barate <barate>
Date: Thu, 20 Dec 2012 12:06:19 +0000 (+0000)
Subject: Fix compilation with QT 4.8
X-Git-Tag: V6_main_FINAL~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c7fb8706add963d94d73bf4cf7cc5598e0c7433b;p=modules%2Fjobmanager.git

Fix compilation with QT 4.8
---

diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx
index b664914..71d2ec7 100644
--- a/src/genericgui/BL_CreateJobWizard.hxx
+++ b/src/genericgui/BL_CreateJobWizard.hxx
@@ -33,7 +33,7 @@ namespace BL{
 
   class JobsManager_QT;
   class JobNamePage;
-  class CreateJobWizard: virtual public QWizard
+  class CreateJobWizard: public QWizard
   {
     Q_OBJECT
 
@@ -95,7 +95,7 @@ namespace BL{
             Page_Conclusion};
   };
 
-  class JobNamePage: virtual public QWizardPage
+  class JobNamePage: public QWizardPage
   {
     Q_OBJECT
 
@@ -123,7 +123,7 @@ namespace BL{
       bool _check_name;
   };
 
-  class ConclusionPage: virtual public QWizardPage
+  class ConclusionPage: public QWizardPage
   {
     public:
       ConclusionPage(QWidget * parent);
@@ -134,7 +134,7 @@ namespace BL{
       virtual void cleanupPage() {}
   };
 
-  class BatchParametersPage: virtual public QWizardPage
+  class BatchParametersPage: public QWizardPage
   {
     Q_OBJECT
 
@@ -152,7 +152,7 @@ namespace BL{
       QString resource_choosed;
   };
 
-  class FilesPage: virtual public QWizardPage
+  class FilesPage: public QWizardPage
   {
     Q_OBJECT
 
@@ -185,7 +185,7 @@ namespace BL{
       QListWidget * _output_files_list;
   };
 
-  class ResourcePage: virtual public QWizardPage
+  class ResourcePage: public QWizardPage
   {
     Q_OBJECT
 
@@ -211,7 +211,7 @@ namespace BL{
       QGridLayout * _main_layout;
   };
 
-  class YACSSchemaPage: virtual public QWizardPage
+  class YACSSchemaPage: public QWizardPage
   {
     Q_OBJECT
 
@@ -232,7 +232,7 @@ namespace BL{
       QLineEdit * _line_env_file;
   };
 
-  class CommandMainPage: virtual public QWizardPage
+  class CommandMainPage: public QWizardPage
   {
     Q_OBJECT
 
@@ -253,7 +253,7 @@ namespace BL{
       QLineEdit * _line_env_file;
   };
 
-  class PythonSalomeMainPage: virtual public QWizardPage
+  class PythonSalomeMainPage: public QWizardPage
   {
     Q_OBJECT
 
diff --git a/src/genericgui/BL_JobsManager_QT.hxx b/src/genericgui/BL_JobsManager_QT.hxx
index d26d689..7875786 100644
--- a/src/genericgui/BL_JobsManager_QT.hxx
+++ b/src/genericgui/BL_JobsManager_QT.hxx
@@ -49,9 +49,9 @@ namespace BL{
   };
 
   class GenericGui;
-  class JobsManager_QT: virtual public QDockWidget,
-                        virtual public BL::JobsManager,
-                        virtual public BL::Observer
+  class JobsManager_QT: public QDockWidget,
+                        public BL::JobsManager,
+                        public BL::Observer
   {
     Q_OBJECT
 
diff --git a/src/genericgui/BL_QModelManager.hxx b/src/genericgui/BL_QModelManager.hxx
index d5dfee5..28f14f0 100644
--- a/src/genericgui/BL_QModelManager.hxx
+++ b/src/genericgui/BL_QModelManager.hxx
@@ -27,7 +27,7 @@
 namespace BL{
 
   class JobsManager_QT;
-  class QModelManager: virtual public QObject
+  class QModelManager: public QObject
   {
     Q_OBJECT
 
diff --git a/src/salomegui/BL_SalomeGui.hxx b/src/salomegui/BL_SalomeGui.hxx
index a1f24af..ed0c17e 100644
--- a/src/salomegui/BL_SalomeGui.hxx
+++ b/src/salomegui/BL_SalomeGui.hxx
@@ -41,7 +41,7 @@
 
 namespace BL
 {
-  class SalomeGui: virtual public MainWindows_SALOME
+  class SalomeGui: public MainWindows_SALOME
   {
     Q_OBJECT