From 021ef447e5eda9ad068e79beb89608866f485aba Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Thu, 5 Aug 2021 14:00:11 +0200 Subject: [PATCH] Use LightApp_Module for cppgui2 example. --- Examples/cppgui2/cppcomposGUI.cxx | 14 ++++---------- Examples/cppgui2/cppcomposGUI.h | 5 ++--- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Examples/cppgui2/cppcomposGUI.cxx b/Examples/cppgui2/cppcomposGUI.cxx index ba6a593..e76270d 100644 --- a/Examples/cppgui2/cppcomposGUI.cxx +++ b/Examples/cppgui2/cppcomposGUI.cxx @@ -43,7 +43,7 @@ extern "C" { // Constructor cppcomposGUI::cppcomposGUI() : - SalomeApp_Module( "cppcompos" ) // default name + LightApp_Module( "cppcompos" ) // default name { } @@ -53,7 +53,7 @@ cppcomposGUI::cppcomposGUI() : void cppcomposGUI::initialize( CAM_Application* app ) { - SalomeApp_Module::initialize( app ); + LightApp_Module::initialize( app ); QWidget* aParent = application()->desktop(); SUIT_ResourceMgr* aResourceMgr = app->resourceMgr(); @@ -90,16 +90,10 @@ void cppcomposGUI::windows( QMap& theMap ) const // theMap.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea ); } -// Module's engine IOR -QString cppcomposGUI::engineIOR() const -{ - return "Fake"; -} - // Module's activation bool cppcomposGUI::activateModule( SUIT_Study* theStudy ) { - bool bOk = SalomeApp_Module::activateModule( theStudy ); + bool bOk = LightApp_Module::activateModule( theStudy ); if(bOk) { @@ -120,7 +114,7 @@ bool cppcomposGUI::deactivateModule( SUIT_Study* theStudy ) _myWidget->setVisible(false); _myViewManager->setShown(false); - return SalomeApp_Module::deactivateModule( theStudy ); + return LightApp_Module::deactivateModule( theStudy ); } void cppcomposGUI::onWindowActivated( SUIT_ViewWindow* svw) diff --git a/Examples/cppgui2/cppcomposGUI.h b/Examples/cppgui2/cppcomposGUI.h index b4f26c0..0a99843 100644 --- a/Examples/cppgui2/cppcomposGUI.h +++ b/Examples/cppgui2/cppcomposGUI.h @@ -20,20 +20,19 @@ #ifndef _cppcomposGUI_H_ #define _cppcomposGUI_H_ -#include +#include #include "ui_demo.h" class SUIT_ViewManager; class SUIT_ViewWindow; -class cppcomposGUI: public SalomeApp_Module +class cppcomposGUI: public LightApp_Module { Q_OBJECT public: cppcomposGUI(); void initialize( CAM_Application* ); - QString engineIOR() const; virtual void windows( QMap& theMap ) const; public slots: -- 2.39.2