Changeset 57951 in vbox

Timestamp:

Sep 29, 2015 7:21:31 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Extend release detection to distinguish old and new unknown releases.

Location:

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

Files:

• UIDefs.h (modified) (1 diff)
• VBoxGlobal.cpp (modified) (2 diffs)
• VBoxGlobal.h (modified) (1 diff)

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

@@ -96 +96 @@
 enum MacOSXRelease
 {
-    MacOSXRelease_Unknown,
+    MacOSXRelease_Old,
     MacOSXRelease_SnowLeopard,
     MacOSXRelease_Lion,
     MacOSXRelease_MountainLion,
     MacOSXRelease_Mavericks,
-    MacOSXRelease_Yosemite
+    MacOSXRelease_Yosemite,
+    MacOSXRelease_New,
 };
 #endif /* Q_WS_MAC */

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

@@ -314 +314 @@
 
 #ifdef Q_WS_MAC
-/** Returns #MacOSXRelease determined using <i>uname</i> call. */
+/* static */
 MacOSXRelease VBoxGlobal::osRelease()
 {
@@ -321 +321 @@
     if (uname(&info) != -1)
     {
-        /* Parse known .release types: */
-            if (QString(info.release).startsWith("14."))
-                return MacOSXRelease_Yosemite;
-        else
-            if (QString(info.release).startsWith("13."))
-                return MacOSXRelease_Mavericks;
-        else
-            if (QString(info.release).startsWith("12."))
-                return MacOSXRelease_MountainLion;
-        else
-            if (QString(info.release).startsWith("11."))
-                return MacOSXRelease_Lion;
-        else
-            if (QString(info.release).startsWith("10."))
-                return MacOSXRelease_SnowLeopard;
-    }
-    /* Unknown by default: */
-    return MacOSXRelease_Unknown;
+        /* Compose map of known releases: */
+        QMap<int, MacOSXRelease> release;
+        release[10] = MacOSXRelease_SnowLeopard;
+        release[11] = MacOSXRelease_Lion;
+        release[12] = MacOSXRelease_MountainLion;
+        release[13] = MacOSXRelease_Mavericks;
+        release[14] = MacOSXRelease_Yosemite;
+
+        /* Cut the major release index of the string we have, s.a. 'man uname': */
+        const int iRelease = QString(info.release).section('.', 0, 0).toInt();
+
+        /* Return release if determined, return 'Old' if version less than 'New', return 'New' otherwise: */
+        return release.value(iRelease, iRelease < MacOSXRelease_New ? MacOSXRelease_Old : MacOSXRelease_New);
+    }
+    /* Return 'Old' by default: */
+    return MacOSXRelease_Old;
 }
 #endif /* Q_WS_MAC */

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

@@ -120 +120 @@
 
 #ifdef Q_WS_MAC
+    /** Returns #MacOSXRelease determined using <i>uname</i> call. */
     static MacOSXRelease osRelease();
 #endif /* Q_WS_MAC */