From 6549e83eea9b2b497d64363aa6fef88bf04a81a6 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Tue, 20 Mar 2018 12:06:30 +0100
Subject: [PATCH] REFAC: QtWidgetView doesn't have to provide direct access to
the Application
---
Modules/Visualization/Monteverdi/src/mvdMainWindow.cxx | 4 ++--
.../MonteverdiGui/src/mvdApplicationLauncher.cxx | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Modules/Visualization/Monteverdi/src/mvdMainWindow.cxx b/Modules/Visualization/Monteverdi/src/mvdMainWindow.cxx
index 6b1d92cf58..9420452e32 100644
--- a/Modules/Visualization/Monteverdi/src/mvdMainWindow.cxx
+++ b/Modules/Visualization/Monteverdi/src/mvdMainWindow.cxx
@@ -1431,11 +1431,11 @@ MainWindow
if( !( *it )->IsClosable() )
{
- assert( !( *it )->GetApplication().IsNull() );
+ assert( ( *it )->GetModel()->GetApplication() );
// qDebug() << "OTB-application:" << ( *it )->GetApplication()->GetDocName();
- names.push_back( ( *it )->GetApplication()->GetDocName() );
+ names.push_back( ( *it )->GetModel()->GetApplication()->GetDocName() );
}
}
diff --git a/Modules/Visualization/MonteverdiGui/src/mvdApplicationLauncher.cxx b/Modules/Visualization/MonteverdiGui/src/mvdApplicationLauncher.cxx
index 7d571ff73b..b3a28a432f 100644
--- a/Modules/Visualization/MonteverdiGui/src/mvdApplicationLauncher.cxx
+++ b/Modules/Visualization/MonteverdiGui/src/mvdApplicationLauncher.cxx
@@ -217,13 +217,13 @@ ApplicationLauncher
ApplicationLauncher::NewOtbApplicationWidget( appName, isStandalone );
assert( appWidget!=NULL );
- assert( appWidget->GetApplication() );
+ assert( appWidget->GetModel()->GetApplication() );
QMainWindow * mainWindow = new QMainWindow( p, flags );
mainWindow->setWindowTitle(
QString( "%1 (OTB-" OTB_VERSION_STRING ")" )
- .arg( appWidget->GetApplication()->GetDocName() )
+ .arg( appWidget->GetModel()->GetApplication()->GetDocName() )
);
mainWindow->setWindowIcon( QIcon( ":/otb_small.png" ) );
@@ -251,11 +251,11 @@ ApplicationLauncher
);
assert( appWidget!=NULL );
- assert( appWidget->GetApplication() );
+ assert( appWidget->GetModel()->GetApplication() );
appWidget->setWindowTitle(
QString( "%1 (OTB-" OTB_VERSION_STRING ")" )
- .arg( appWidget->GetApplication()->GetDocName() )
+ .arg( appWidget->GetModel()->GetApplication()->GetDocName() )
);
appWidget->setWindowIcon( QIcon( ":/icons/process" ) );
--
GitLab