From: vsr <vsr@opencascade.com>
Date: Thu, 29 Mar 2012 08:02:07 +0000 (+0000)
Subject: Remove compilation warnings
X-Git-Tag: V6_5_0a1~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=43f2244f925e8b22e3d99d58b284582c536c0e9e;p=modules%2Fgui.git

Remove compilation warnings
---

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 ) {