]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Remove compilation warnings
authorvsr <vsr@opencascade.com>
Thu, 29 Mar 2012 08:02:07 +0000 (08:02 +0000)
committervsr <vsr@opencascade.com>
Thu, 29 Mar 2012 08:02:07 +0000 (08:02 +0000)
src/STD/STD_Application.cxx
src/SalomeApp/SalomeApp_Application.cxx

index 5ca89b64f707822f81bc56fb61c3c6ead667469c..0f2adae71c2e39f4b43d218154a4aa076ad35c6f 100755 (executable)
@@ -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 );
+  }
 }
 
 /*!
index df0bf8452c158c8d211dcdca5d8f1814ed144325..0b0e4d104f93a13acac883bc34f9318f4c7a73e4 100644 (file)
@@ -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 ) {