From 43f2244f925e8b22e3d99d58b284582c536c0e9e Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 29 Mar 2012 08:02:07 +0000 Subject: [PATCH] Remove compilation warnings --- src/STD/STD_Application.cxx | 7 +++---- src/SalomeApp/SalomeApp_Application.cxx | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx index 5ca89b64f..0f2adae71 100755 --- a/src/STD/STD_Application.cxx +++ b/src/STD/STD_Application.cxx @@ -931,13 +931,12 @@ QString STD_Application::getDirectory( const QString& initial, const QString& ca */ void STD_Application::setDesktop( SUIT_Desktop* desk ) { - SUIT_Desktop* prev = desktop(); - SUIT_Application::setDesktop( desk ); - if ( prev != desk && desk ) + if ( desk ) { connect( desk, SIGNAL( closing( SUIT_Desktop*, QCloseEvent* ) ), - this, SLOT( onDesktopClosing( SUIT_Desktop*, QCloseEvent* ) ) ); + this, SLOT( onDesktopClosing( SUIT_Desktop*, QCloseEvent* ) ), Qt::UniqueConnection ); + } } /*! diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx index df0bf8452..0b0e4d104 100644 --- a/src/SalomeApp/SalomeApp_Application.cxx +++ b/src/SalomeApp/SalomeApp_Application.cxx @@ -351,8 +351,6 @@ void SalomeApp_Application::createActions() /*!Set desktop:*/ void SalomeApp_Application::setDesktop( SUIT_Desktop* desk ) { - SUIT_Desktop* prev = desktop(); - LightApp_Application::setDesktop( desk ); if ( desk ) { -- 2.39.2