Suppress warnings.

[modules/visu.git] / src / VISUGUI / VisuGUI_DialogRunner.cxx

diff --git a/src/VISUGUI/VisuGUI_DialogRunner.cxx b/src/VISUGUI/VisuGUI_DialogRunner.cxx
index 872fd6871d906c1553d70d4671d1a842c8b16056..d4015c9be4d1a8e37d875ac03aaa0c45f2b977d0 100644 (file)
--- a/src/VISUGUI/VisuGUI_DialogRunner.cxx
+++ b/src/VISUGUI/VisuGUI_DialogRunner.cxx
@@ -1,41 +1,45 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
+// License as published by the Free Software Foundation; either
 // version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:       VisuGUI_DialogRunner.cxx
-// Created:    Thu Oct  6 10:17:39 2005
-// Author:     Alexander SOLOVYOV
-//             <asl@multiplex.nnov.opencascade.com>
 
+// File:        VisuGUI_DialogRunner.cxx
+// Created:     Thu Oct  6 10:17:39 2005
+// Author:      Alexander SOLOVYOV
+//              <asl@multiplex.nnov.opencascade.com>
+//
 #include "VisuGUI_DialogRunner.h"
 
-#include <qdialog.h>
-#include <qapplication.h>
+#include <QDialog>
+#include <QEventLoop>
+#include <QEvent>
 
 VisuGUI_DialogRunner::VisuGUI_DialogRunner( QDialog* dlg )
 : QObject(),
-  myDlg( dlg ),
-  myInLoop( false )
+  myDlg( dlg )
 {
   if( myDlg )
   {
     connect( myDlg, SIGNAL( destroyed() ), this, SLOT( onDialogDelete() ) );
     myDlg->installEventFilter( this );
+    myEventLoop = new QEventLoop( this );
   }
 }
 
@@ -45,36 +49,31 @@ VisuGUI_DialogRunner::~VisuGUI_DialogRunner()
 
 int VisuGUI_DialogRunner::run( const bool modal )
 {
-  if( myInLoop || !myDlg )
+  if( myEventLoop->isRunning() || !myDlg )
     return -1;
 
   if( modal )
     return myDlg->exec();
 
-  myInLoop = true;
   myDlg->show();
-  qApp->enter_loop();
+  myEventLoop->exec();
   return myDlg->result();
 }
 
 void VisuGUI_DialogRunner::onDialogDelete()
 {
-  if( myInLoop )
-    qApp->exit_loop();
+  if( myEventLoop->isRunning() )
+    myEventLoop->quit();
 
   myDlg = 0;
-  myInLoop = false;
 }
 
 bool VisuGUI_DialogRunner::eventFilter( QObject* o, QEvent* e )
 {
   if( o==myDlg && e && ( e->type()==QEvent::Close || e->type()==QEvent::Hide ) )
   {
-    if( myInLoop && !myDlg->isMinimized() )
-    {
-      myInLoop = false;
-      qApp->exit_loop();
-    }
+    if( myEventLoop->isRunning() && !myDlg->isMinimized() )
+      myEventLoop->quit();
     return false;
   }
   else