Changeset 10888 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Jul 25, 2008 12:31:53 PM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Remove porting garbage from VBoxConsoleWnd.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -3405 +3405 @@
 void VBoxConsoleWnd::tryClose()
 {
-//#warning "port me"
     /* First close any open modal & popup widgets. Use a single shot with
      * timeout 0 to allow the widgets to cleany close and test then again. If
      * all open widgets are closed destroy ourself. */
-    QWidget *widget = QApplication::activeModalWidget();
+
+    /// #warning "port me":
+    /// @todo (r=dsen) we have to test this on windows
+
+    QWidget *widget = QApplication::activeModalWidget() ?
+                      QApplication::activeModalWidget() :
+                      QApplication::activePopupWidget() ?
+                      QApplication::activePopupWidget() : 0;
     if (widget)
     {
@@ -3416 +3422 @@
     }
     else
-    {
-        widget = QApplication::activePopupWidget();
-        if (widget)
-        {
-            widget->close();
-            QTimer::singleShot (0, this, SLOT (tryClose()));
-        }
-        else
-            close();
-    }
-
-    /* We have this to test on Windows or maybe I forgot something, so we keep
-     * this as a reference: */
-//    LogFlowFunc (("eventLoopLevel=%d\n", qApp->eventLoop()->loopLevel()));
-//
-//    if (qApp->eventLoop()->loopLevel() > 1)
-//    {
-//        if (QApplication::activeModalWidget())
-//            QApplication::activeModalWidget()->close();
-//        else if (QApplication::activePopupWidget())
-//            QApplication::activePopupWidget()->close();
-//        else
-//        {
-            /// @todo (r=dmik) in general, the following is not that correct
-            //  because some custom modal event loop may not expect to be
-            //  exited externally (e.g., it might want to set some internal
-            //  flags before calling exitLoop()). The alternative is to do
-            //  nothing but wait keeping to post singleShot timers.
-//            qApp->eventLoop()->exitLoop();
-//        }
-//
-//        QTimer::singleShot (0, this, SLOT (tryClose()));
-//    }
-//    else
-//     close();
+        close();
 }