Fix compilation with QT 4.8

diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx
index b66491436886177bd8418330c7b0d8eb6418ddf3..71d2ec78c7b051c7ff429a63dbdc9d580b3b9199 100644 (file)
--- 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 d26d689769856acc48f5d40d8b38b04ea61ddd5e..7875786b078ba0f6ae73fd54b2462983be614060 100644 (file)
--- 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 d5dfee513778a1dc70327d36221db1ceaa31c699..28f14f078c81f1eb6edd61efd6eadbeb1f8d3446 100644 (file)
--- 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 a1f24af02c791681913d1b92586db5efbf190777..ed0c17e94f7d2d79a9c78b5f7f21482a61c00094 100644 (file)
--- 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