Changeset 61241 in vbox for trunk

Timestamp:

May 27, 2016 12:56:05 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixing GUI warnings: Some stuff became virtual in Qt5.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIDialog.cpp (modified) (1 diff)
• extensions/QIDialog.h (modified) (1 diff)
• widgets/UIProgressDialog.cpp (modified) (1 diff)

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

@@ -51 +51 @@
 }
 
-int QIDialog::exec(bool fShow /* = true */, bool fApplicationModal /* = false */)
+int QIDialog::execute(bool fShow /* = true */, bool fApplicationModal /* = false */)
 {
     /* Check for the recursive run: */

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

@@ -42 +42 @@
 public slots:
 
-    /* API: Exec stuff: */
-    int exec(bool fShow = true, bool fApplicationModal = false);
+    /** Shows the dialog as a modal dialog, blocking until the user closes it.
+      * @param  fShow              detemines whether the dialog should be shown instantly.
+      * @param  fApplicationModal  determine whether the dialog should be application-modal. */
+    virtual int execute(bool fShow = true, bool fApplicationModal = false);
+
+    /** Shows the dialog as a modal dialog, blocking until the user closes it.
+      * @note  Provided for compatibility with various Qt versions. */
+    virtual int exec() /* overload for Qt4, override for Qt5 */ { return execute(); }
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp

@@ -173 +173 @@
 
             /* Holds the modal loop, but don't show the window immediately: */
-            exec(false);
+            execute(false);
 
             /* Are we still valid? */