Changeset 45166 in vbox

Timestamp:

Mar 25, 2013 12:31:19 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84489

Message:

FE/Qt: QIDialog cleanup (part 4).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp

@@ -52 +52 @@
     setResult(QDialog::Rejected);
 
+    /* Should we delete ourself on close in theory? */
     bool fWasDeleteOnClose = testAttribute(Qt::WA_DeleteOnClose);
     setAttribute(Qt::WA_DeleteOnClose, false);
+
 #if defined(Q_WS_MAC) && QT_VERSION >= 0x040500
     /* After 4.5 Qt changed the behavior of Sheets for the window/application
@@ -73 +75 @@
     setAttribute(Qt::WA_ShowModal, true);
 
-    /* Create a local event-loop: */
-    QEventLoop eventLoop;
-    m_pEventLoop = &eventLoop;
-
     /* Show ourself if requested: */
     if (fShow)
         show();
 
-    /* Guard ourself for the case
-     * we destroyed ourself in our event-loop: */
-    QPointer<QIDialog> guard = this;
+    /* Create a local event-loop: */
+    {
+        QEventLoop eventLoop;
+        m_pEventLoop = &eventLoop;
 
-    /* Start the blocking event-loop: */
-    eventLoop.exec();
+        /* Guard ourself for the case
+         * we destroyed ourself in our event-loop: */
+        QPointer<QIDialog> guard = this;
 
-    /* Are we still valid? */
-    if (guard.isNull())
-        return QDialog::Rejected;
+        /* Start the blocking event-loop: */
+        eventLoop.exec();
 
-    m_pEventLoop = 0;
+        /* Are we still valid? */
+        if (guard.isNull())
+            return QDialog::Rejected;
+
+        m_pEventLoop = 0;
+    }
 
     /* Save the result-code early (we can delete ourself on close): */
@@ -105 +109 @@
     }
 #endif /* defined(Q_WS_MAC) && QT_VERSION >= 0x040500 */
+    /* Set the old show modal attribute: */
+    setAttribute (Qt::WA_ShowModal, wasShowModal);
 
-    /* Set the old show modal attribute */
-    setAttribute (Qt::WA_ShowModal, wasShowModal);
     /* Delete ourself if we should do that on close: */
     if (fWasDeleteOnClose)