Changeset 45364 in vbox for trunk

Timestamp:

Apr 5, 2013 10:34:20 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Message-center: Moving some stuff in corresponding place.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIMessageCenter.cpp (modified) (1 diff)
• UIMessageCenter.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -114 +114 @@
                           strButtonText1, strButtonText2, strButtonText3,
                           QString(pcszAutoConfirmId));
+}
+
+int UIMessageCenter::message(QWidget *pParent, MessageType type,
+                              const QString &strMessage,
+                              const char *pcszAutoConfirmId,
+                              int iButton1 /*= 0*/,
+                              int iButton2 /*= 0*/,
+                              int iButton3 /*= 0*/,
+                              const QString &strButtonText1 /*= QString()*/,
+                              const QString &strButtonText2 /*= QString()*/,
+                              const QString &strButtonText3 /*= QString()*/) const
+{
+    return message(pParent, type, strMessage, QString(), pcszAutoConfirmId,
+                   iButton1, iButton2, iButton3, strButtonText1, strButtonText2, strButtonText3);
+}
+
+bool UIMessageCenter::messageOkCancel(QWidget *pParent, MessageType type,
+                                      const QString &strMessage,
+                                      const QString &strDetails /*= QString()*/,
+                                      const char *pcszAutoConfirmId /*= 0*/,
+                                      const QString &strOkButtonText /*= QString()*/,
+                                      const QString &strCancelButtonText /*= QString()*/,
+                                      bool fOkByDefault /*= true*/) const
+{
+    /* Which button will be the default one? Ok or Cancel? */
+    int iOkButton = fOkByDefault ? AlertButton_Ok | AlertButtonOption_Default :
+                                   AlertButton_Ok;
+    int iCancelButton = fOkByDefault ? AlertButton_Cancel | AlertButtonOption_Escape :
+                                       AlertButton_Cancel | AlertButtonOption_Escape | AlertButtonOption_Default;
+    /* Show the message wrapping main function: */
+    return (message(pParent, type, strMessage, strDetails, pcszAutoConfirmId,
+                    iOkButton, iCancelButton, 0, strOkButtonText, strCancelButtonText, QString()) &
+            AlertButtonMask) == AlertButton_Ok;
+}
+
+bool UIMessageCenter::messageOkCancel(QWidget *pParent, MessageType type,
+                                      const QString &strMessage,
+                                      const char *pcszAutoConfirmId,
+                                      const QString &strOkButtonText /*= QString()*/,
+                                      const QString &strCancelButtonText /*= QString()*/,
+                                      bool fOkByDefault /*= true*/) const
+{
+    return messageOkCancel(pParent, type, strMessage, QString(), pcszAutoConfirmId,
+                           strOkButtonText, strCancelButtonText, fOkByDefault);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -97 +97 @@
                 const QString &strButtonText1 = QString(),
                 const QString &strButtonText2 = QString(),
-                const QString &strButtonText3 = QString()) const
-    {
-        return message(pParent, type, strMessage, QString(), pcszAutoConfirmId,
-                       iButton1, iButton2, iButton3, strButtonText1, strButtonText2, strButtonText3);
-    }
+                const QString &strButtonText3 = QString()) const;
 
     /* API: Alert providing stuff: Wrapper to the main function,
@@ -111 +107 @@
                          const QString &strOkButtonText = QString(),
                          const QString &strCancelButtonText = QString(),
-                         bool fOkByDefault = true) const
-    {
-        int iOkButton = fOkByDefault ? AlertButton_Ok | AlertButtonOption_Default :
-                                       AlertButton_Ok;
-        int iCancelButton = fOkByDefault ? AlertButton_Cancel | AlertButtonOption_Escape :
-                                           AlertButton_Cancel | AlertButtonOption_Escape | AlertButtonOption_Default;
-        return (message(pParent, type, strMessage, strDetails, pcszAutoConfirmId,
-                        iOkButton, iCancelButton, 0, strOkButtonText, strCancelButtonText, QString()) &
-                AlertButtonMask) == AlertButton_Ok;
-    }
+                         bool fOkByDefault = true) const;
 
     /* API: Alert providing stuff: Wrapper to the function above,
-     * Omits details. Takes button type(s) as "Ok / Cancel": */
+     * Takes button type(s) as "Ok / Cancel",
+     * Omits details. */
     bool messageOkCancel(QWidget *pParent, MessageType type,
                          const QString &strMessage,
@@ -129 +117 @@
                          const QString &strOkButtonText = QString(),
                          const QString &strCancelButtonText = QString(),
-                         bool fOkByDefault = true) const
-    {
-        return messageOkCancel(pParent, type, strMessage, QString(), pcszAutoConfirmId,
-                               strOkButtonText, strCancelButtonText, fOkByDefault);
-    }
+                         bool fOkByDefault = true) const;
 
     /* API: Alert providing stuff: One more main function: */