Merge from V6_main 11/02/2013

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.cxx b/src/salomegui/BL_SalomeGui.cxx
index b71fd64e220a7a570ddb5223f5e7f21daab3a3df..6a5eec69442a825168df8ecc286706df4bab3e3d 100644 (file)
--- a/src/salomegui/BL_SalomeGui.cxx
+++ b/src/salomegui/BL_SalomeGui.cxx
@@ -20,9 +20,7 @@
 #include "BL_SalomeGui.hxx"
 #include "JOBMANAGER_version.h"
 
-BL::SalomeGui::SalomeGui() : MainWindows_SALOME("JobManager"), 
-                            SalomeApp_Module("JobManager"), 
-                            LightApp_Module("JobManager")
+BL::SalomeGui::SalomeGui() : MainWindows_SALOME("JobManager")
 {
   DEBTRACE("Creating BL::SalomeGui");
   _gengui = NULL;

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
     

diff --git a/src/wrappers/BL_MainWindows_SALOME.cxx b/src/wrappers/BL_MainWindows_SALOME.cxx
index fe0e9d26b364fe4da5e24c06ccf84d7ca1006d5c..e6ce913924184da6b94584948340d778490f7291 100644 (file)
--- a/src/wrappers/BL_MainWindows_SALOME.cxx
+++ b/src/wrappers/BL_MainWindows_SALOME.cxx
@@ -21,8 +21,7 @@
 #include <SalomeApp_Engine_i.h>
 
 BL::MainWindows_SALOME::MainWindows_SALOME(const QString & module_name) :
-  SalomeApp_Module(module_name),
-  LightApp_Module(module_name)
+  SalomeApp_Module(module_name)
 {
   DEBTRACE("Creating BL::MainWindows_SALOME");
   _actionId = 190;

diff --git a/src/wrappers/BL_MainWindows_SALOME.hxx b/src/wrappers/BL_MainWindows_SALOME.hxx
index 11a939c7134246a138605e2978cf7597b442d3b9..bf66ee314cec4ce80cc295581a7e0d06d680030e 100644 (file)
--- a/src/wrappers/BL_MainWindows_SALOME.hxx
+++ b/src/wrappers/BL_MainWindows_SALOME.hxx
@@ -44,7 +44,7 @@
 namespace BL
 {
   class BL_Wrappers_SALOME_EXPORT MainWindows_SALOME : virtual public MainWindows_Wrap, 
-                             virtual public SalomeApp_Module
+                             public SalomeApp_Module
   {
     public:
       MainWindows_SALOME(const QString & module_name);