Changeset 57952 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

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

Author:

vboxsync

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

102931

Message:

FE/Qt: Mac OS X: Cache detected OS X release in VBoxGlobal for further reusing.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (3 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)

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

@@ -232 +232 @@
 VBoxGlobal::VBoxGlobal()
     : mValid (false)
+#ifdef Q_WS_MAC
+    , m_osRelease(MacOSXRelease_Old)
+#endif /* Q_WS_MAC */
     , m_fWrappersValid(false)
     , m_fVBoxSVCAvailable(true)
@@ -315 +318 @@
 #ifdef Q_WS_MAC
 /* static */
-MacOSXRelease VBoxGlobal::osRelease()
+MacOSXRelease VBoxGlobal::determineOsRelease()
 {
     /* Prepare 'utsname' struct: */
@@ -3978 +3981 @@
     connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(cleanup()));
 
+#ifdef Q_WS_MAC
+    /* Determine OS release early: */
+    m_osRelease = determineOsRelease();
+#endif /* Q_WS_MAC */
+
     /* Create message-center: */
     UIMessageCenter::create();

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();
+    /** Mac OS X: Returns #MacOSXRelease determined using <i>uname</i> call. */
+    static MacOSXRelease determineOsRelease();
+    /** Mac OS X: Returns #MacOSXRelease determined during VBoxGlobal prepare routine. */
+    MacOSXRelease osRelease() const { return m_osRelease; }
 #endif /* Q_WS_MAC */
 
@@ -520 +522 @@
 
     bool mValid;
+
+#ifdef Q_WS_MAC
+    /** Mac OS X: Holds the #MacOSXRelease determined using <i>uname</i> call. */
+    MacOSXRelease m_osRelease;
+#endif /* Q_WS_MAC */
 
     /** COM cleanup protection token. */

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -373 +373 @@
 #ifdef Q_WS_MAC
         /* Apply font fixes (before QApplication get created and instantiated font-hints): */
-        switch (VBoxGlobal::osRelease())
+        switch (VBoxGlobal::determineOsRelease())
         {
             case MacOSXRelease_Mavericks: QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande"); break;