From: vsr <vsr@opencascade.com>
Date: Tue, 12 Feb 2013 12:40:50 +0000 (+0000)
Subject: Merge from V6_main 11/02/2013
X-Git-Tag: V7_1_0b1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FV7_siman;p=samples%2Fhello.git

Merge from V6_main 11/02/2013
---

diff --git a/src/HELLOGUI/HELLOGUI.cxx b/src/HELLOGUI/HELLOGUI.cxx
index 8d88e49..f602fe7 100644
--- a/src/HELLOGUI/HELLOGUI.cxx
+++ b/src/HELLOGUI/HELLOGUI.cxx
@@ -51,15 +51,9 @@ HELLO_ORB::HELLO_Gen_var HELLOGUI::myEngine;
   
   Creates an instance of the HELLO GUI module.
   Initializes (loads if necessary) HELLO module engine.
-
-  \note Since SalomeApp_Module uses virtual inheritance 
-  from LightApp_Module class, it's necessary to call both
-  base classes constructors, even though HELLOGUI class
-  inherits directly only SalomeApp_Module.
 */
 HELLOGUI::HELLOGUI() :
-  SalomeApp_Module( "HELLO" ), // module name
-  LightApp_Module( "HELLO" )   // module name
+  SalomeApp_Module( "HELLO" ) // module name
 {
   init(); // internal initialization
 }