Changeset 45162 in vbox

Timestamp:

Mar 25, 2013 11:35:01 AM (12 years ago)

Author:

vboxsync

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

84485

Message:

FE/Qt: QIDialog cleanup (part 1).

Location:

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

Files:

• QIDialog.cpp (modified) (6 diffs)
• QIDialog.h (modified) (3 diffs)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18 +18 @@
  */
 
-/* VBox includes */
+/* GUI includes: */
 #include "QIDialog.h"
 #include "VBoxGlobal.h"
@@ -25 +25 @@
 #endif /* Q_WS_MAC */
 
-QIDialog::QIDialog (QWidget *aParent /* = 0 */, Qt::WindowFlags aFlags /* = 0 */)
-    : QDialog (aParent, aFlags)
-    , mPolished (false)
+QIDialog::QIDialog(QWidget *pParent /* = 0 */, Qt::WindowFlags flags /* = 0 */)
+    : QDialog(pParent, flags)
+    , m_fPolished(false)
 {
 }
 
-void QIDialog::showEvent (QShowEvent * /* aEvent */)
+QIDialog::~QIDialog()
+{
+}
+
+void QIDialog::showEvent(QShowEvent * /* pEvent */)
 {
     /* Two thinks to do for fixed size dialogs on MacOS X:
@@ -42 +46 @@
     {
         adjustSize();
-        setFixedSize (size());
+        setFixedSize(size());
 #ifdef Q_WS_MAC
         ::darwinSetShowsResizeIndicator (this, false);
@@ -48 +52 @@
     }
 
-    /* Polishing border */
-    if (mPolished)
+    /* Polishing: */
+    if (m_fPolished)
         return;
-    mPolished = true;
+    m_fPolished = true;
 
-    /* Explicit widget centering relatively to it's parent
-     * if any or desktop if parent is missed. */
-    VBoxGlobal::centerWidget (this, parentWidget(), false);
+    /* Explicit centering according to our parent: */
+    VBoxGlobal::centerWidget(this, parentWidget(), false);
 }
 
-int QIDialog::exec (bool aShow /* = true */)
+int QIDialog::exec(bool fShow /* = true */)
 {
-    /* Reset the result code */
-    setResult (QDialog::Rejected);
+    /* Reset the result-code: */
+    setResult(QDialog::Rejected);
 
-    bool wasDeleteOnClose = testAttribute (Qt::WA_DeleteOnClose);
-    setAttribute (Qt::WA_DeleteOnClose, false);
+    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
@@ -72 +75 @@
      * the modal mode window, but be application modal in any case. */
     Qt::WindowModality winModality = windowModality();
-    bool wasSetWinModality = testAttribute (Qt::WA_SetWindowModality);
+    bool wasSetWinModality = testAttribute(Qt::WA_SetWindowModality);
     if ((windowFlags() & Qt::Sheet) == Qt::Sheet)
     {
-        setWindowModality (Qt::WindowModal);
-        setAttribute (Qt::WA_SetWindowModality, false);
+        setWindowModality(Qt::WindowModal);
+        setAttribute(Qt::WA_SetWindowModality, false);
     }
 #endif /* defined(Q_WS_MAC) && QT_VERSION >= 0x040500 */
-    /* The dialog has to modal in any case. Save the current modality to
-     * restore it later. */
-    bool wasShowModal = testAttribute (Qt::WA_ShowModal);
-    setAttribute (Qt::WA_ShowModal, true);
+    /* The dialog has to modal in any case.
+     * Save the current modality to restore it later. */
+    bool wasShowModal = testAttribute(Qt::WA_ShowModal);
+    setAttribute(Qt::WA_ShowModal, true);
 
-    /* Create a local event loop */
+    /* Create a local event-loop: */
     QEventLoop eventLoop;
-    mEventLoop = &eventLoop;
-    /* Show the window if requested */
-    if (aShow)
+    m_pEventLoop = &eventLoop;
+
+    /* Show ourself if requested: */
+    if (fShow)
         show();
-    /* A guard to ourself for the case we destroy ourself. */
+
+    /* Guard ourself for the case
+     * we destroyed ourself in our event-loop: */
     QPointer<QIDialog> guard = this;
-    /* Start the event loop. This blocks. */
+
+    /* Start the blocking event-loop: */
     eventLoop.exec();
-    /* Are we valid anymore? */
+
+    /* Are we still valid? */
     if (guard.isNull())
         return QDialog::Rejected;
-    mEventLoop = 0;
-    /* Save the result code in case we delete ourself */
-    QDialog::DialogCode res = (QDialog::DialogCode)result();
+
+    m_pEventLoop = 0;
+
+    /* Save the result-code early (we can delete ourself on close): */
+    QDialog::DialogCode resultCode = (QDialog::DialogCode)result();
+
 #if defined(Q_WS_MAC) && QT_VERSION >= 0x040500
-    /* Restore old modality mode */
+    /* Restore old modality mode: */
     if ((windowFlags() & Qt::Sheet) == Qt::Sheet)
     {
-        setWindowModality (winModality);
-        setAttribute (Qt::WA_SetWindowModality, wasSetWinModality);
+        setWindowModality(winModality);
+        setAttribute(Qt::WA_SetWindowModality, wasSetWinModality);
     }
 #endif /* defined(Q_WS_MAC) && QT_VERSION >= 0x040500 */
+
     /* Set the old show modal attribute */
     setAttribute (Qt::WA_ShowModal, wasShowModal);
-    /* Delete us in the case we should do so on close */
-    if (wasDeleteOnClose)
+    /* Delete ourself if we should do that on close: */
+    if (fWasDeleteOnClose)
         delete this;
-    /* Return the final result */
-    return res;
+
+    /* Return the result-code: */
+    return resultCode;
 }
 
-void QIDialog::setVisible (bool aVisible)
+void QIDialog::setVisible(bool fVisible)
 {
-    QDialog::setVisible (aVisible);
-    /* Exit from the event loop if there is any and we are changing our state
-     * from visible to invisible. */
-    if (mEventLoop && !aVisible)
-        mEventLoop->exit();
+    /* Call to base-class: */
+    QDialog::setVisible(fVisible);
+
+    /* Exit from the event-loop if
+     * 1. there is any and
+     * 2. we are changing our state from visible to invisible: */
+    if (m_pEventLoop && !fVisible)
+        m_pEventLoop->exit();
 }
 

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

@@ -2 +2 @@
  *
  * VBox frontends: Qt GUI ("VirtualBox"):
- * VirtualBox Qt extensions: QIDialog class implementation
+ * VirtualBox Qt extensions: QIDialog class declaration
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #define __QIDialog_h__
 
-/* Qt includes */
+/* Qt includes: */
 #include <QDialog>
 #include <QPointer>
 
-/* Qt forwards declarations */
+/* Forward declarations: */
 class QEventLoop;
 
+/* Qt dialog extension: */
 class QIDialog: public QDialog
 {
@@ -32 +33 @@
 
 public:
-    QIDialog (QWidget *aParent = 0, Qt::WindowFlags aFlags = 0);
-    void setVisible (bool aVisible);
+
+    /* Constructor/destructor: */
+    QIDialog(QWidget *pParent = 0, Qt::WindowFlags flags = 0);
+    ~QIDialog();
+
+    /* API: Visibility stuff: */
+    void setVisible(bool fVisible);
 
 public slots:
-    int exec (bool aShow = true);
+
+    /* API: Exec stuff: */
+    int exec(bool fShow = true);
 
 protected:
-    void showEvent (QShowEvent *aEvent);
+
+    /* Handler: Show-event stuff: */
+    void showEvent(QShowEvent *pEvent);
 
 private:
-    /* Private member vars */
-    bool mPolished;
-    QPointer<QEventLoop> mEventLoop;
+
+    /* Variables: */
+    bool m_fPolished;
+    QPointer<QEventLoop> m_pEventLoop;
 };