From 434fcb7e9212d8c8553c5e2c68c95d47c34d41d2 Mon Sep 17 00:00:00 2001 From: Stephane Albert <stephane.albert@c-s.fr> Date: Tue, 16 Jul 2013 10:23:07 +0200 Subject: [PATCH] COMP: Fixed missing #if OTB_WRAP_QT. --- Code/Application/Monteverdi2/mvdMainWindow.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Code/Application/Monteverdi2/mvdMainWindow.cxx b/Code/Application/Monteverdi2/mvdMainWindow.cxx index 7fb39aaa33..cab89d1a48 100644 --- a/Code/Application/Monteverdi2/mvdMainWindow.cxx +++ b/Code/Application/Monteverdi2/mvdMainWindow.cxx @@ -1368,7 +1368,8 @@ MainWindow /*****************************************************************************/ void MainWindow -::OnApplicationToLaunchSelected(const QString & appName, const QString & docName) +::OnApplicationToLaunchSelected( const QString& appName, + const QString& docName) { #ifdef OTB_WRAP_QT @@ -1433,6 +1434,8 @@ MainWindow QWidget* appWidget = m_CentralTabWidget->widget( index ); assert( appWidget!=NULL ); +#ifdef OTB_WRAP_QT + assert( appWidget==qobject_cast< Wrapper::QtWidgetView* >( appWidget ) ); Wrapper::QtWidgetView* appWidgetView = qobject_cast< Wrapper::QtWidgetView* >( appWidget ); @@ -1449,10 +1452,12 @@ MainWindow return; } +#endif + m_CentralTabWidget->removeTab( index ); - delete appWidgetView; - appWidgetView = NULL; + delete appWidget; + appWidget = NULL; } /*****************************************************************************/ -- GitLab