Changeset 38568 in vbox

Timestamp:

Aug 30, 2011 12:20:45 PM (14 years ago)

Author:

vboxsync

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

73744

Message:

FE/Qt4: missed two cases

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• net/UIDownloaderExtensionPack.cpp (modified) (1 diff)
• net/UIUpdateManager.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)

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

@@ -2897 +2897 @@
         /* Configure User Manual downloader: */
         CVirtualBox vbox = vboxGlobal().virtualBox();
-        pDl->addSource(QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove(VBOX_BUILD_PUBLISHER)) + strShortFileName);
+        pDl->addSource(QString("http://download.virtualbox.org/virtualbox/%1/").arg(vboxGlobal().vboxVersionStringNormalized()) + strShortFileName);
         pDl->addSource(QString("http://download.virtualbox.org/virtualbox/") + strShortFileName);
         pDl->setTarget(strUserManualFileName2);

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

@@ -374 +374 @@
            (ct_ver_str.section ('.', 1, 1).toInt() << 8) +
            ct_ver_str.section ('.', 2, 2).toInt();
+}
+
+QString VBoxGlobal::vboxVersionString() const
+{
+    return mVBox.GetVersion();
+}
+
+QString VBoxGlobal::vboxVersionStringNormalized() const
+{
+    return vboxVersionString().remove(VBOX_BUILD_PUBLISHER);
 }
 

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

@@ -128 +128 @@
     static uint qtCTVersion();
 
+    QString vboxVersionString() const;
+    QString vboxVersionStringNormalized() const;
+
     QString versionString() const { return mVerString; }
     bool isBeta() const;

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp

@@ -70 +70 @@
     QString strTemplateSourcePath("http://download.virtualbox.org/virtualbox/%1/");
     QString strTemplateSourceName("Oracle_VM_VirtualBox_Extension_Pack-%1.vbox-extpack");
-    QString strSourcePath(strTemplateSourcePath.arg(vboxGlobal().virtualBox().GetVersion().remove("_OSE")));
-    QString strSourceName(strTemplateSourceName.arg(vboxGlobal().virtualBox().GetVersion().remove("_OSE")));
+    QString strSourcePath(strTemplateSourcePath.arg(vboxGlobal().vboxVersionStringNormalized()));
+    QString strSourceName(strTemplateSourceName.arg(vboxGlobal().vboxVersionStringNormalized()));
     QString strSource(strSourcePath + strSourceName);
     QString strTargetPath(vboxGlobal().virtualBox().GetHomeFolder());

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -24 +24 @@
 #include <QDir>
 
+#include <VBox/version.h>
+
 /* Local includes: */
 #include "UIUpdateManager.h"
@@ -131 +133 @@
 
     /* Get VirtualBox version: */
-    VBoxVersion vboxVersion(vboxGlobal().virtualBox().GetVersion().remove("_OSE"));
+    VBoxVersion vboxVersion(vboxGlobal().vboxVersionStringNormalized());
     /* Get extension pack version: */
-    VBoxVersion expackVersion(extPack.GetVersion().remove("_OSE"));
+    VBoxVersion expackVersion(extPack.GetVersion().remove(VBOX_BUILD_PUBLISHER));
     /* Check if extension pack version less than required: */
     if ((vboxVersion.z() % 2 != 0) /* Skip unstable VBox version */ ||

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -46 +46 @@
 /* Global includes */
 #include <iprt/path.h>
-#include <VBox/version.h>
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -1487 +1486 @@
     /* Check for the already registered image */
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    const QString &name = QString("VBoxGuestAdditions_%1.iso").arg(vbox.GetVersion().remove(VBOX_BUILD_PUBLISHER));
+    const QString &name = QString("VBoxGuestAdditions_%1.iso").arg(vboxGlobal().vboxVersionStringNormalized());
 
     CMediumVector vec = vbox.GetDVDImages();
@@ -1503 +1502 @@
     if (result == QIMessageBox::Yes)
     {
-        const QString &source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove(VBOX_BUILD_PUBLISHER)) + name;
+        const QString &source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vboxGlobal().vboxVersionStringNormalized()) + name;
         const QString &target = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(name);