From 9e2489c99befb919418172afe01d14921ea53138 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Fri, 14 Dec 2012 10:26:28 +0000
Subject: [PATCH] Merge from BR_Qt48_porting (compatibility with Qt4.8)
 14/12/2012

---
 src/salomegui/BL_SalomeGui.cxx         | 4 +---
 src/wrappers/BL_MainWindows_SALOME.cxx | 3 +--
 src/wrappers/BL_MainWindows_SALOME.hxx | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/salomegui/BL_SalomeGui.cxx b/src/salomegui/BL_SalomeGui.cxx
index b71fd64..6a5eec6 100644
--- 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 fe0e9d2..e6ce913 100644
--- 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 11a939c..bf66ee3 100644
--- 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);
-- 
2.39.2