Changeset 70830 in vbox for trunk/src/VBox

Timestamp:

Jan 31, 2018 1:22:39 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9104: Move a bit of copy-pasted code from downloaders to UIVersion class to be reused.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIVersion.h (modified) (1 diff)
• net/UIDownloaderAdditions.cpp (modified) (2 diffs)
• net/UIDownloaderExtensionPack.cpp (modified) (2 diffs)
• net/UIDownloaderUserManual.cpp (modified) (2 diffs)

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

@@ -86 +86 @@
     int z() const { return m_z; }
 
+    /** Defines the object X value. */
+    void setX(int x) { m_x = x; }
+    /** Defines the object Y value. */
+    void setY(int y) { m_y = y; }
+    /** Defines the object Z value. */
+    void setZ(int z) { m_z = z; }
+
+    /** Returns effective released version guessed or hardcoded for this one version.
+      * This can be even the version itself. */
+    UIVersion effectiveRelasedVersion() const
+    {
+        /* First, we just copy the current one: */
+        UIVersion version = *this;
+
+        /* If this version being developed: */
+        if (version.z() % 2 == 1)
+        {
+            /* If this version being developed on release branch (we guess the right one): */
+            if (version.z() < 97)
+                version.setZ(version.z() - 1);
+            /* If this version being developed on trunk (we use hardcoded one for now): */
+            else
+                version.setZ(6); /* Current .z for 5.2.z */
+        }
+
+        /* Finally, we just return that we have:  */
+        return version;
+    }
+
 private:
 

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

@@ -31 +31 @@
 # include "UIMessageCenter.h"
 # include "UIModalWindowManager.h"
+# include "UIVersion.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -61 +62 @@
         m_spInstance = this;
 
-    /* Get version number and adjust it for test and trunk builds,
-     * both have odd build numbers. The server only has official releases. */
-    QString strVersion = vboxGlobal().vboxVersionStringNormalized();
-    const QChar qchLastDigit = strVersion[strVersion.length() - 1];
-    if (   qchLastDigit == '1'
-        || qchLastDigit == '3'
-        || qchLastDigit == '5'
-        || qchLastDigit == '7'
-        || qchLastDigit == '9')
-    {
-        if (   !strVersion.endsWith(".51")
-            && !strVersion.endsWith(".53")
-            && !strVersion.endsWith(".97")
-            && !strVersion.endsWith(".99"))
-            strVersion[strVersion.length() - 1] = qchLastDigit.toLatin1() - 1;
-        else
-        {
-            strVersion.chop(2);
-            strVersion += "6"; /* Current for 5.2.x */
-        }
-    }
+    /* Get version number and adjust it for test and trunk builds. The server only has official releases. */
+    const QString strVersion = UIVersion(vboxGlobal().vboxVersionStringNormalized()).effectiveRelasedVersion().toString();
 
     /* Prepare source/target: */

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

@@ -31 +31 @@
 # include "UIMessageCenter.h"
 # include "UIModalWindowManager.h"
+# include "UIVersion.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -61 +62 @@
         m_spInstance = this;
 
-    /* Get version number and adjust it for test and trunk builds,
-     * both have odd build numbers. The server only has official releases. */
-    QString strVersion = vboxGlobal().vboxVersionStringNormalized();
-    const QChar qchLastDigit = strVersion[strVersion.length() - 1];
-    if (   qchLastDigit == '1'
-        || qchLastDigit == '3'
-        || qchLastDigit == '5'
-        || qchLastDigit == '7'
-        || qchLastDigit == '9')
-    {
-        if (   !strVersion.endsWith(".51")
-            && !strVersion.endsWith(".53")
-            && !strVersion.endsWith(".97")
-            && !strVersion.endsWith(".99"))
-            strVersion[strVersion.length() - 1] = qchLastDigit.toLatin1() - 1;
-        else
-        {
-            strVersion.chop(2);
-            strVersion += "6"; /* Current for 5.2.x */
-        }
-    }
+    /* Get version number and adjust it for test and trunk builds. The server only has official releases. */
+    const QString strVersion = UIVersion(vboxGlobal().vboxVersionStringNormalized()).effectiveRelasedVersion().toString();
 
     /* Prepare source/target: */

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

@@ -31 +31 @@
 # include "UIMessageCenter.h"
 # include "UIModalWindowManager.h"
+# include "UIVersion.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -58 +59 @@
         m_spInstance = this;
 
-    /* Get version number and adjust it for test and trunk builds,
-     * both have odd build numbers. The server only has official releases. */
-    QString strVersion = vboxGlobal().vboxVersionStringNormalized();
-    const QChar qchLastDigit = strVersion[strVersion.length() - 1];
-    if (   qchLastDigit == '1'
-        || qchLastDigit == '3'
-        || qchLastDigit == '5'
-        || qchLastDigit == '7'
-        || qchLastDigit == '9')
-    {
-        if (   !strVersion.endsWith(".51")
-            && !strVersion.endsWith(".53")
-            && !strVersion.endsWith(".97")
-            && !strVersion.endsWith(".99"))
-            strVersion[strVersion.length() - 1] = qchLastDigit.toLatin1() - 1;
-        else
-        {
-            strVersion.chop(2);
-            strVersion += "6"; /* Current for 5.2.x */
-        }
-    }
+    /* Get version number and adjust it for test and trunk builds. The server only has official releases. */
+    const QString strVersion = UIVersion(vboxGlobal().vboxVersionStringNormalized()).effectiveRelasedVersion().toString();
 
     /* Compose User Manual filename: */