Changeset 35094 in vbox for trunk/src

Timestamp:

Dec 14, 2010 3:20:30 PM (14 years ago)

Author:

vboxsync

Message:

message parent fix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxProblemReporter.cpp (modified) (7 diffs)
• globals/VBoxProblemReporter.h (modified) (1 diff)
• settings/global/UIGlobalSettingsExtension.cpp (modified) (2 diffs)

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

@@ -2126 +2126 @@
 }
 
-void VBoxProblemReporter::cannotOpenExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent /* = 0 */)
+void VBoxProblemReporter::cannotOpenExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent)
 {
     message (pParent ? pParent : mainWindowShown(),
@@ -2134 +2134 @@
 }
 
-void VBoxProblemReporter::badExtPackFile(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent /* = 0 */)
+void VBoxProblemReporter::badExtPackFile(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent)
 {
     message (pParent ? pParent : mainWindowShown(),
@@ -2142 +2142 @@
 }
 
-void VBoxProblemReporter::cannotInstallExtPack(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent /* = 0 */)
+void VBoxProblemReporter::cannotInstallExtPack(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent)
 {
     message (pParent ? pParent : mainWindowShown(),
@@ -2150 +2150 @@
 }
 
-void VBoxProblemReporter::cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, QWidget *pParent /* = 0 */)
+void VBoxProblemReporter::cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, QWidget *pParent)
 {
     message (pParent ? pParent : mainWindowShown(),
@@ -2159 +2159 @@
 
 bool VBoxProblemReporter::confirmInstallingPackage(const QString &strPackName, const QString &strPackVersion,
-                                                   const QString &strPackDescription, QWidget *pParent /* = 0 */)
+                                                   const QString &strPackDescription, QWidget *pParent)
 {
     return messageOkCancel (pParent ? pParent : mainWindowShown(),
@@ -2179 +2179 @@
 bool VBoxProblemReporter::confirmReplacePackage(const QString &strPackName, const QString &strPackVersionNew,
                                                 const QString &strPackVersionOld, const QString &strPackDescription,
-                                                QWidget *pParent /* = 0 */)
+                                                QWidget *pParent)
 {
     if (!pParent)
@@ -2238 +2238 @@
 }
 
-bool VBoxProblemReporter::confirmRemovingPackage(const QString &strPackName, QWidget *pParent /* = 0 */)
+bool VBoxProblemReporter::confirmRemovingPackage(const QString &strPackName, QWidget *pParent)
 {
     return messageOkCancel (pParent ? pParent : mainWindowShown(),

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

@@ -340 +340 @@
     void cannotUpdateGuestAdditions (const CProgress &aProgress, QWidget *aParent /* = NULL */) const;
 
-    void cannotOpenExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent = 0);
-    void badExtPackFile(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent = 0);
-    void cannotInstallExtPack(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent = 0);
-    void cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, QWidget *pParent = 0);
-    bool confirmInstallingPackage(const QString &strPackName, const QString &strPackVersion, const QString &strPackDescription, QWidget *pParent = 0);
+    void cannotOpenExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent);
+    void badExtPackFile(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent);
+    void cannotInstallExtPack(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent);
+    void cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, QWidget *pParent);
+    bool confirmInstallingPackage(const QString &strPackName, const QString &strPackVersion, const QString &strPackDescription, QWidget *pParent);
     bool confirmReplacePackage(const QString &strPackName, const QString &strPackVersionNew, const QString &strPackVersionOld,
-                               const QString &strPackDescription, QWidget *pParent = 0);
-    bool confirmRemovingPackage(const QString &strPackName, QWidget *pParent = 0);
-    void notifyAboutExtPackInstalled(const QString &strPackName, QWidget *pParent = 0);
+                               const QString &strPackDescription, QWidget *pParent);
+    bool confirmRemovingPackage(const QString &strPackName, QWidget *pParent);
+    void notifyAboutExtPackInstalled(const QString &strPackName, QWidget *pParent);
 
     void warnAboutIncorrectPort(QWidget *pParent) const;

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

@@ -148 +148 @@
     {
         QString strPackVersionCur = QString("%1r%2").arg(extPackCur.GetVersion()).arg(extPackCur.GetRevision());
-        if (!vboxProblem().confirmReplacePackage(strPackName, strPackVersion, strPackVersionCur, strPackDescription))
+        if (!vboxProblem().confirmReplacePackage(strPackName, strPackVersion, strPackVersionCur, strPackDescription, pParent))
             return;
     }
@@ -156 +156 @@
     else
     {
-        if (!vboxProblem().confirmInstallingPackage(strPackName, strPackVersion, strPackDescription))
+        if (!vboxProblem().confirmInstallingPackage(strPackName, strPackVersion, strPackDescription, pParent))
             return;
     }