Changeset 45448 in vbox

Timestamp:

Apr 10, 2013 7:59:40 AM (12 years ago)

Author:

vboxsync

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

84880

Message:

FE/Qt: Main.cpp cleanup (part 3).

File:

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

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

@@ -304 +304 @@
     LogFlowFuncEnter();
 
-# ifdef RT_OS_DARWIN
-    ShutUpAppKit();
-# endif /* RT_OS_DARWIN */
-
-    /* Console help preprocessing: */
-    for (int i=0; i<argc; i++)
-        if (   !strcmp(argv[i], "-h")
-            || !strcmp(argv[i], "-?")
-            || !strcmp(argv[i], "-help")
-            || !strcmp(argv[i], "--help"))
-        {
-            showHelp();
-            return 0;
+    /* Failed result initially: */
+    int iResultCode = 1;
+
+    /* Simulate try-catch block: */
+    do
+    {
+#ifdef RT_OS_DARWIN
+        ShutUpAppKit();
+#endif /* RT_OS_DARWIN */
+
+        /* Console help preprocessing: */
+        bool fHelpShown = false;
+        for (int i = 0; i < argc; ++i)
+        {
+            if (   !strcmp(argv[i], "-h")
+                || !strcmp(argv[i], "-?")
+                || !strcmp(argv[i], "-help")
+                || !strcmp(argv[i], "--help"))
+            {
+                showHelp();
+                fHelpShown = true;
+                break;
+            }
+        }
+        if (fHelpShown)
+        {
+            iResultCode = 0;
+            break;
         }
 
 #if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
-    /* Install our signal handler to backtrace the call stack: */
-    struct sigaction sa;
-    sa.sa_sigaction = bt_sighandler;
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags = SA_RESTART | SA_SIGINFO;
-    sigaction(SIGSEGV, &sa, NULL);
-    sigaction(SIGBUS, &sa, NULL);
-    sigaction(SIGUSR1, &sa, NULL);
+        /* Install our signal handler to backtrace the call stack: */
+        struct sigaction sa;
+        sa.sa_sigaction = bt_sighandler;
+        sigemptyset(&sa.sa_mask);
+        sa.sa_flags = SA_RESTART | SA_SIGINFO;
+        sigaction(SIGSEGV, &sa, NULL);
+        sigaction(SIGBUS, &sa, NULL);
+        sigaction(SIGUSR1, &sa, NULL);
 #endif
 
 #ifdef QT_MAC_USE_COCOA
-    /* Instantiate our NSApplication derivative before QApplication
-     * forces NSApplication to be instantiated. */
-    UICocoaApplication::instance();
+        /* Instantiate our NSApplication derivative before QApplication
+         * forces NSApplication to be instantiated. */
+        UICocoaApplication::instance();
 #endif /* QT_MAC_USE_COCOA */
 
-    qInstallMsgHandler(QtMessageOutput);
-
-    int rc = 1; /* failure */
-
-    /* Scope the QApplication variable: */
-    {
+        /* Install Qt console message handler: */
+        qInstallMsgHandler(QtMessageOutput);
+
 #ifdef Q_WS_X11
         /* Qt has a complex algorithm for selecting the right visual which
@@ -371 +383 @@
                                 : "Failed to open the X11 display!\n",
                      pszDisplay);
-            return 0;
+            break;
         }
         Visual *pVisual =   useDefaultVisual
@@ -450 +462 @@
                 break;
 
-            /* Exit if VBoxGlobal unable to process arguments: */
+            /* Exit if VBoxGlobal was able to pre-process arguments: */
             if (vboxGlobal().processArgs())
-                return 0;
+                break;
 
 #ifdef RT_OS_LINUX
@@ -470 +482 @@
 
                 /* Start application: */
-                rc = a.exec();
+                iResultCode = a.exec();
             }
+            /* VM selector process: */
             else
             {
@@ -501 +514 @@
 
                 /* Start application: */
-                rc = a.exec();
+                iResultCode = a.exec();
             }
         }
         while (0);
 
-        /* Create modal-window manager: */
+        /* Destroy modal-window manager: */
         UIModalWindowManager::destroy();
     }
+    while (0);
 
     /* Finish logging: */
-    LogFlowFunc(("rc=%d\n", rc));
+    LogFlowFunc(("rc=%d\n", iResultCode));
     LogFlowFuncLeave();
 
     /* Return result: */
-    return rc;
+    return iResultCode;
 }