Merge from BR_Qt48_porting (compatibility with Qt4.8) 14/12/2012

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/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);