Changeset 77179 in vbox for trunk/src/VBox

Timestamp:

Feb 6, 2019 3:35:57 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9340: Rework QIMainDialog to use int instead of QDialog::DialogCode because of lack of enum values, we need more (that's native Qt approach).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QIMainDialog.cpp (modified) (5 diffs)
• QIMainDialog.h (modified) (3 diffs)

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

@@ -42 +42 @@
     , m_fIsAutoCentering(fIsAutoCentering)
     , m_fPolished(false)
-    , m_enmResult(QDialog::Rejected)
+    , m_iResult(QDialog::Rejected)
 {
     /* Install event-filter: */
@@ -48 +48 @@
 }
 
-QDialog::DialogCode QIMainDialog::exec(bool fApplicationModal /* = true */)
+int QIMainDialog::exec(bool fApplicationModal /* = true */)
 {
     /* Check for the recursive run: */
@@ -89 +89 @@
 
     /* Save the result code early (we can delete ourself on close): */
-    const QDialog::DialogCode enmResultCode = result();
+    const int iResultCode = result();
 
     /* Return old modality: */
@@ -101 +101 @@
 
     /* Return the result code: */
-    return enmResultCode;
+    return iResultCode;
 }
 
@@ -325 +325 @@
 }
 
-void QIMainDialog::done(QDialog::DialogCode enmResult)
+void QIMainDialog::done(int iResult)
 {
     /* Set the final result: */
-    setResult(enmResult);
+    setResult(iResult);
     /* Hide: */
     hide();

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

@@ -49 +49 @@
 
     /** Returns the dialog's result code. */
-    QDialog::DialogCode result() const { return m_enmResult; }
+    int result() const { return m_iResult; }
 
     /** Executes the dialog, launching local event-loop.
       * @param fApplicationModal defines whether this dialog should be modal to application or window. */
-    QDialog::DialogCode exec(bool fApplicationModal = true);
+    int exec(bool fApplicationModal = true);
 
     /** Returns dialog's default button. */
@@ -93 +93 @@
 protected slots:
 
-    /** Sets the modal dialog's result code to @a enmResult. */
-    void setResult(QDialog::DialogCode enmResult) { m_enmResult = enmResult; }
+    /** Sets the modal dialog's result code to @a iResult. */
+    void setResult(int iResult) { m_iResult = iResult; }
 
-    /** Closes the modal dialog and sets its result code to @a enmResult.
+    /** Closes the modal dialog and sets its result code to @a iResult.
       * If this dialog is shown with exec(), done() causes the local
-      * event-loop to finish, and exec() to return @a enmResult. */
-    virtual void done(QDialog::DialogCode enmResult);
+      * event-loop to finish, and exec() to return @a iResult. */
+    virtual void done(int iResult);
     /** Hides the modal dialog and sets the result code to Accepted. */
     virtual void accept() { done(QDialog::Accepted); }
@@ -113 +113 @@
 
     /** Holds modal dialog's result code. */
-    QDialog::DialogCode   m_enmResult;
+    int                   m_iResult;
     /** Holds modal dialog's event-loop. */
     QPointer<QEventLoop>  m_pEventLoop;