Changeset 18745 in vbox for trunk/src

Timestamp:

Apr 6, 2009 11:12:15 AM (16 years ago)

Author:

vboxsync

Message:

Frontends/Qt: double-dash command line options

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobal.cpp (modified) (3 diffs)
• main.cpp (modified) (3 diffs)

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

@@ -5368 +5368 @@
     {
         const char *arg = qApp->argv() [i];
-        if (       !::strcmp (arg, "-startvm"))
+        if (    !::strcmp (arg, "--startvm")
+            ||  !::strcmp (arg, "-startvm")
+            ||  !::strcmp (arg, "-s")
+            ||  !::strcmp (arg, "--vm")
+            ||  !::strcmp (arg, "-vm"))
         {
             if (++i < argc)
@@ -5391 +5395 @@
         }
 #ifdef VBOX_GUI_WITH_SYSTRAY
-        else if (!::strcmp (arg, "-systray"))
+        else if (!::strcmp (arg, "-systray") || !::strcmp (arg, "--systray"))
         {
             mIsTrayMenu = true;
         }
 #endif
-        else if (!::strcmp (arg, "-comment"))
+        else if (!::strcmp (arg, "-comment") || !::strcmp (arg, "--comment"))
         {
             ++i;
         }
-        else if (!::strcmp (arg, "-rmode"))
+        else if (!::strcmp (arg, "-rmode") || !::strcmp (arg, "--rmode"))
         {
             if (++i < argc)
@@ -5410 +5414 @@
             mDbgEnabled = true;
         }
-        else if (!::strcmp( arg, "-debug") || !::strcmp( arg, "--debug"))
+        else if (!::strcmp( arg, "-debug") || !::strcmp (arg, "--debug"))
         {
             mDbgEnabled = true;

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

@@ -231 +231 @@
             "\n"
             "Usage:\n"
-            "  -startvm <vmname|UUID>     start a VM by specifying its UUID or name\n"
-            "  -rmode %-19s select different render mode (default is %s)\n"
+            "  --startvm <vmname|UUID>    start a VM by specifying its UUID or name\n"
+            "  --rmode %-18s select different render mode (default is %s)\n"
 # ifdef VBOX_WITH_DEBUGGER_GUI
-            "  -dbg                       enable the GUI debug menu\n"
-            "  -debug                     like -dbg and show debug windows at VM startup\n"
-            "  -no-debug                  disable the GUI debug menu and debug windows\n"
+            "  --dbg                      enable the GUI debug menu\n"
+            "  --debug                    like --dbg and show debug windows at VM startup\n"
+            "  --no-debug                 disable the GUI debug menu and debug windows\n"
             "\n"
             "The following environment variables are evaluated:\n"
@@ -258 +258 @@
 #ifdef Q_WS_WIN
     /* Initialize COM early, before QApplication calls OleInitialize(), to
-     * make sure we enter the multi threded apartment instead of a single
+     * make sure we enter the multi threaded apartment instead of a single
      * threaded one. Note that this will make some non-threadsafe system
      * services that use OLE and require STA (such as Drag&Drop) not work
@@ -506 +506 @@
     for (int i = 1; i < argc; i++)
     {
-        if (!::strcmp (argv[i], "-startvm" ))
+        if (    !::strcmp(argv[i], "--startvm")
+            ||  !::strcmp(argv[i], "-startvm")
+            ||  !::strcmp(argv[i], "-s")
+            ||  !::strcmp(argv[i], "--vm")
+            ||  !::strcmp(argv[i], "-vm"))
         {
             fInitSUPLib = true;