Commit 76779f20 authored by Stéphane Albert's avatar Stéphane Albert

COMP: Fixed missing renaming of mvd::MaplaApplication.

parent 24d1201f
......@@ -65,10 +65,10 @@ class OTBApplicationsModel;
/*****************************************************************************/
/* CLASS DEFINITION SECTION */
/** \class Application
/** \class MaplaApplication
*
*/
class Monteverdi_EXPORT Application
class Monteverdi_EXPORT MaplaApplication
: public I18nApplication
{
......@@ -91,27 +91,27 @@ public:
*
* \param qtApp The parent Qt application (\see I18nApplication).
*/
Application( QApplication* qtApp );
MaplaApplication( QApplication* qtApp );
/** \brief Destructor. */
virtual ~Application();
virtual ~MaplaApplication();
//
// STATIC METHODS.
/**
* \brief Access the const instance of application singleton.
* \return The const instance to the singleton Application.
* \return The const instance to the singleton MaplaApplication.
*/
inline
static const Application* ConstInstance();
static const MaplaApplication* ConstInstance();
/**
* \brief Access the non-const instance of application singleton.
* \return The non-const instance to the singleton Application.
* \return The non-const instance to the singleton MaplaApplication.
*/
inline
static Application* Instance();
static MaplaApplication* Instance();
/**
*/
......@@ -166,20 +166,20 @@ namespace mvd
/*****************************************************************************/
inline
const Application*
Application
const MaplaApplication*
MaplaApplication
::ConstInstance()
{
return I18nCoreApplication::ConstInstance< Application >();
return I18nCoreApplication::ConstInstance< MaplaApplication >();
}
/*****************************************************************************/
inline
Application*
Application
MaplaApplication*
MaplaApplication
::Instance()
{
return I18nCoreApplication::Instance< Application >();
return I18nCoreApplication::Instance< MaplaApplication >();
}
} // end namespace 'mvd'
......
......@@ -82,11 +82,11 @@ main( int argc, char* argv[] )
//
// Coverity-14835
// {
mvd::Application * application = NULL;
mvd::MaplaApplication * application = NULL;
try
{
application = new mvd::Application( &qtApp );
application = new mvd::MaplaApplication( &qtApp );
assert( application!=NULL );
application->Initialize();
......@@ -119,7 +119,7 @@ main( int argc, char* argv[] )
//
// 2. Initialize main-window (UI).
mvd::MainWindow mainWindow;
mvd::MaplaMainWindow mainWindow;
mainWindow.Initialize();
application->Foo();
......
......@@ -64,26 +64,26 @@ namespace mvd
/* CLASS IMPLEMENTATION SECTION */
/*******************************************************************************/
Application
::Application( QApplication* qtApp ) :
MaplaApplication
::MaplaApplication( QApplication* qtApp ) :
I18nApplication( qtApp )
{
}
/*******************************************************************************/
Application
::~Application()
MaplaApplication
::~MaplaApplication()
{
}
/*******************************************************************************/
void
Application
MaplaApplication
::virtual_InitializeCore()
{
I18nApplication::virtual_InitializeCore();
setObjectName( "Application" );
setObjectName( "MaplaApplication" );
InitializeCore(
"Monteverdi Application Launcher", Monteverdi_VERSION_STRING,
......@@ -93,7 +93,7 @@ Application
/*******************************************************************************/
void
Application
MaplaApplication
::Foo()
{
SetModel( new OTBApplicationsModel( this ) );
......
......@@ -117,7 +117,7 @@ MaplaMainWindow
this
);
assert( Application::Instance() );
assert( MaplaApplication::Instance() );
setCentralWidget( m_ApplicationsToolBoxController->GetWidget() );
......@@ -163,10 +163,10 @@ void
MaplaMainWindow
::closeEvent( QCloseEvent* event )
{
assert( Application::Instance() );
assert( MaplaApplication::Instance() );
assert(
Application::Instance()->GetModel()==
Application::Instance()->GetModel< OTBApplicationsModel >()
MaplaApplication::Instance()->GetModel()==
MaplaApplication::Instance()->GetModel< OTBApplicationsModel >()
);
SaveLayout( Monteverdi_UI_VERSION );
......@@ -216,20 +216,20 @@ MaplaMainWindow
{
#ifdef OTB_USE_QT4
assert( Application::ConstInstance()!=NULL );
assert( Application::ConstInstance()->GetModel()!=NULL );
assert( MaplaApplication::ConstInstance()!=NULL );
assert( MaplaApplication::ConstInstance()->GetModel()!=NULL );
assert(
Application::ConstInstance()->GetModel()==
Application::ConstInstance()->GetModel< OTBApplicationsModel >()
MaplaApplication::ConstInstance()->GetModel()==
MaplaApplication::ConstInstance()->GetModel< OTBApplicationsModel >()
);
assert(
Application::ConstInstance()
MaplaApplication::ConstInstance()
->GetModel< OTBApplicationsModel >()
->GetLauncher()!=NULL
);
QWidget * appWindow =
Application::ConstInstance()
MaplaApplication::ConstInstance()
->GetModel< OTBApplicationsModel >()
->GetLauncher()
->NewOtbApplicationWindow( appName, true, this );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment