Changeset 57769 in vbox for trunk/src

Timestamp:

Sep 15, 2015 4:43:21 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Main.cpp cleanup/rework bit-by-bit (step 9).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/main.cpp (modified) (9 diffs)

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

@@ -325 +325 @@
     int iResultCode = 1;
 
-#ifdef Q_WS_X11
-    /* Make sure multi-threaded environment is safe: */
-    if (!MakeSureMultiThreadingIsSafe())
-        return iResultCode;
-#endif /* Q_WS_X11 */
-
     /* Simulate try-catch block: */
     do
     {
-#ifdef Q_WS_MAC
-        /* Prevent check in AppKit: */
-        PreventCheckInAppKit();
-#endif /* Q_WS_MAC */
-
         /* Console help preprocessing: */
         bool fHelpShown = false;
@@ -359 +348 @@
         }
 
-#if defined(Q_WS_X11) && defined(RT_OS_LINUX) && defined(DEBUG)
-        /* Install signal handler to backtrace the call stack: */
-        InstallSignalHandler();
-#endif /* Q_WS_X11 && RT_OS_LINUX && DEBUG */
-
 #ifdef VBOX_WITH_HARDENING
         /* Make sure the image verification code works: */
@@ -370 +354 @@
 
 #ifdef Q_WS_MAC
-        /* Apply font fixes: */
+        /* Prevent check in AppKit: */
+        PreventCheckInAppKit();
+
+        /* Apply font fixes (before QApplication get created and instantiated font-hints): */
         switch (VBoxGlobal::osRelease())
         {
@@ -377 +364 @@
             default: break;
         }
+
 # ifdef QT_MAC_USE_COCOA
         /* Instantiate own NSApplication before QApplication do it for us: */
@@ -383 +371 @@
 #endif /* Q_WS_MAC */
 
+#ifdef Q_WS_X11
+        /* Make sure multi-threaded environment is safe: */
+        if (!MakeSureMultiThreadingIsSafe())
+            break;
+
+# if defined(RT_OS_LINUX) && defined(DEBUG)
+        /* Install signal handler to backtrace the call stack: */
+        InstallSignalHandler();
+# endif /* RT_OS_LINUX && DEBUG */
+#endif /* Q_WS_X11 */
+
         /* Install Qt console message handler: */
         qInstallMsgHandler(QtMessageOutput);
@@ -388 +387 @@
         /* Create application: */
         QApplication a(argc, argv);
-
-#ifdef Q_WS_X11
-        /* Make all widget native.
-         * We did it to avoid various Qt crashes while testing widget attributes or acquiring winIds.
-         * Yes, we aware of note that alien widgets faster to draw but the only widget we need to be fast
-         * is viewport of VM which was always native since we are using his id for 3D service needs. */
-        a.setAttribute(Qt::AA_NativeWindows);
-#endif /* Q_WS_X11 */
-
-#ifdef Q_WS_MAC
-# ifdef VBOX_GUI_WITH_HIDPI
-        /* Enable HiDPI icons.
-         * For this we require a patched version of Qt 4.x with
-         * the changes from https://codereview.qt-project.org/#change,54636 applied. */
-        a.setAttribute(Qt::AA_UseHighDpiPixmaps);
-# endif /* VBOX_GUI_WITH_HIDPI */
-#endif /* Q_WS_MAC */
-
-#ifdef Q_OS_SOLARIS
-        /* Use plastique look&feel for Solaris instead of the default motif (Qt 4.7.x): */
-        QApplication::setStyle(new QPlastiqueStyle);
-#endif /* Q_OS_SOLARIS */
-
-#ifdef Q_WS_X11
-# ifndef Q_OS_SOLARIS
-        /* Apply font fixes: */
-        QFontDatabase fontDataBase;
-        QString currentFamily(QApplication::font().family());
-        bool isCurrentScaleable = fontDataBase.isScalable(currentFamily);
-        QString subFamily(QFont::substitute(currentFamily));
-        bool isSubScaleable = fontDataBase.isScalable(subFamily);
-        if (isCurrentScaleable && !isSubScaleable)
-            QFont::removeSubstitution(currentFamily);
-# endif /* !Q_OS_SOLARIS */
-#endif /* Q_WS_X11 */
 
 #ifdef Q_WS_WIN
@@ -435 +399 @@
 
 #ifdef Q_WS_MAC
+# ifdef VBOX_GUI_WITH_HIDPI
+        /* Enable HiDPI icons.
+         * For this we require a patched version of Qt 4.x with
+         * the changes from https://codereview.qt-project.org/#change,54636 applied. */
+        a.setAttribute(Qt::AA_UseHighDpiPixmaps);
+# endif /* VBOX_GUI_WITH_HIDPI */
+
         /* Disable menu icons on MacOS X host: */
         ::darwinDisableIconsInMenus();
@@ -440 +411 @@
 
 #ifdef Q_WS_X11
+        /* Make all widget native.
+         * We did it to avoid various Qt crashes while testing widget attributes or acquiring winIds.
+         * Yes, we aware of note that alien widgets faster to draw but the only widget we need to be fast
+         * is viewport of VM which was always native since we are using his id for 3D service needs. */
+        a.setAttribute(Qt::AA_NativeWindows);
+
+# ifdef Q_OS_SOLARIS
+        /* Use plastique look&feel for Solaris instead of the default motif (Qt 4.7.x): */
+        QApplication::setStyle(new QPlastiqueStyle);
+# endif /* Q_OS_SOLARIS */
+
+# ifndef Q_OS_SOLARIS
+        /* Apply font fixes (after QApplication get created and instantiated font-family): */
+        QFontDatabase fontDataBase;
+        QString currentFamily(QApplication::font().family());
+        bool isCurrentScaleable = fontDataBase.isScalable(currentFamily);
+        QString subFamily(QFont::substitute(currentFamily));
+        bool isSubScaleable = fontDataBase.isScalable(subFamily);
+        if (isCurrentScaleable && !isSubScaleable)
+            QFont::removeSubstitution(currentFamily);
+# endif /* !Q_OS_SOLARIS */
+
         /* Qt version check (major.minor are sensitive, fix number is ignored): */
         if (VBoxGlobal::qtRTVersion() < (VBoxGlobal::qtCTVersion() & 0xFFFF00))
@@ -648 +641 @@
 {
 # ifdef Q_WS_MAC
+    /* Prevent check in AppKit: */
     PreventCheckInAppKit();
 # endif /* Q_WS_MAC */