X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSalomeApp%2FSalomeApp_Module.cxx;h=f131285ab79ad7adc2c2b44c1e2e79d6138edcfc;hb=e17b1cec9d367f21f2c8f914052b3df3d2f88d35;hp=0b7dbac7864e929095159b652be64646fa21b385;hpb=2e750f9ded92337bc3c44e9d7388180974cc4a43;p=modules%2Fgui.git

diff --git a/src/SalomeApp/SalomeApp_Module.cxx b/src/SalomeApp/SalomeApp_Module.cxx
index 0b7dbac78..f131285ab 100644
--- a/src/SalomeApp/SalomeApp_Module.cxx
+++ b/src/SalomeApp/SalomeApp_Module.cxx
@@ -37,16 +37,19 @@ void SalomeApp_Module::initialize( CAM_Application* app )
     resMgr->raiseTranslators( name() );
 }
 
-void SalomeApp_Module::activateModule( SUIT_Study* study )
+bool SalomeApp_Module::activateModule( SUIT_Study* study )
 {
-  CAM_Module::activateModule( study );
+  bool res = CAM_Module::activateModule( study );
 
-  if ( application() && application()->resourceMgr() )
+  if ( res && application() && application()->resourceMgr() )
     application()->resourceMgr()->raiseTranslators( name() );
+    
+  return res;
 }
 
-void SalomeApp_Module::deactivateModule( SUIT_Study* )
+bool SalomeApp_Module::deactivateModule( SUIT_Study* )
 {
+  return true;
 }
 
 void SalomeApp_Module::selectionChanged()
@@ -65,15 +68,6 @@ void SalomeApp_Module::viewManagers( QStringList& ) const
 {
 }
 
-QString SalomeApp_Module::engineIOR() const
-{
-  // Return an empty string by default, to avoid any "default behavior".
-  // It means that SALOMEDS persistence is not used by a module by default.
-  // Each module can override this method to return either its actual engine's IOR,
-  // or simple the result returned by SalomeApp_Application::defaultEngineIOR()
-  return QString( "" );
-}
-
 SalomeApp_Application* SalomeApp_Module::getApp() const
 {
   return (SalomeApp_Application*)application();
@@ -112,7 +106,7 @@ void SalomeApp_Module::updateObjBrowser( bool updateDataModel, SUIT_DataObject*
   getApp()->objectBrowser()->updateTree( root );
 }
 
-void SalomeApp_Module::contextMenuPopup( const QString& client, QPopupMenu* menu )
+void SalomeApp_Module::contextMenuPopup( const QString& client, QPopupMenu* menu, QString& /*title*/ )
 {
   SalomeApp_Selection* sel = createSelection();
   sel->init( client, getApp()->selectionMgr() );