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

Timestamp:

Jul 18, 2018 11:24:33 AM (7 years ago)

Author:

vboxsync

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

123802

Message:

FE/Qt: Few style fixes for r123794, r123795 and r123796.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• main.cpp (modified) (7 diffs)

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

@@ -383 +383 @@
 
     return fRc;
+}
+
+void UIMessageCenter::warnAboutUnknownOptionType(const QString &strOption)
+{
+    alert(0, MessageType_Error,
+          tr("Unknown option <b>%1</b>.")
+             .arg(strOption));
+}
+
+void UIMessageCenter::warnAboutUnrelatedOptionType(const QString &strOption)
+{
+    alert(0, MessageType_Error,
+          tr("<b>%1</b> is an option for the VirtualBox VM runner (VirtualBoxVM) application, not the VirtualBox Manager.")
+             .arg(strOption));
 }
 

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

@@ -231 +231 @@
 
     /* API: Main (startup) warnings: */
+    void warnAboutUnknownOptionType(const QString &strOption);
+    void warnAboutUnrelatedOptionType(const QString &strOption);
 #ifdef RT_OS_LINUX
     void warnAboutWrongUSBMounted() const;

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

@@ -4052 +4052 @@
 #ifdef RT_OS_WINDOWS /** @todo add more here, please... */
         else
-            msgCenter().error(0, MessageType_Error, tr("Unknown option <b>%1</b>.").arg(arguments.at(i)), "");
+            msgCenter().warnAboutUnknownOptionType(arguments.at(i));
 #endif
 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
         if (enmOptType == OptType_VMRunner && m_enmType != UIType_RuntimeUI)
-            msgCenter().error(0, MessageType_Error,
-                              tr("<b>%1</b> is an option for the VirtualBox VM runner (VirtualBoxVM) application, not the selector")
-                              .arg(arg), "");
+            msgCenter().warnAboutUnrelatedOptionType(arg);
 #endif
 

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

@@ -338 +338 @@
 
 #ifdef RT_OS_WINDOWS
-    /*
-     * Show message box.  We modify the option list a little to better
-     * make it fit in the dialog.
-     */
-    char        szTitleWithVersion[sizeof(s_szTitle) + 128];
-    char        szMsg[sizeof(s_szUsage) + 128];
-    char       *pszDst = szMsg;
-    size_t      offSrc = 0;
+    /* Show message box. Modify the option list a little
+     * to better make it fit in the upcoming dialog. */
+    char szTitleWithVersion[sizeof(s_szTitle) + 128];
+    char szMsg[sizeof(s_szUsage) + 128];
+    char *pszDst = szMsg;
+    size_t offSrc = 0;
     while (offSrc < sizeof(s_szUsage) - 1U)
     {
@@ -352 +350 @@
             && s_szUsage[offSrc + 1] == ' '
             && (   (ch = s_szUsage[offSrc + 2]) == '-' /* option line */
-                || ch == 'V' /* env.var. line*/ ) )
+                || ch == 'V' /* env.var. line */))
         {
             /* Split option lines: */
@@ -361 +359 @@
                 while (   s_szUsage[offSrc + cchOption] != ' '
                        || s_szUsage[offSrc + cchOption + 1] != ' ')
-                    cchOption++;
+                    ++cchOption;
 
                 memcpy(pszDst, &s_szUsage[offSrc], cchOption);
-                offSrc   += cchOption + 2;
-                pszDst   += cchOption;
+                offSrc += cchOption + 2;
+                pszDst += cchOption;
             }
             /* Change environment variable indentation: */
@@ -373 +371 @@
                 size_t cchLine = 0;
                 while ((ch = s_szUsage[offSrc + cchLine]) != '\n' && ch != '\0')
-                    cchLine++;
+                    ++cchLine;
 
                 memcpy(pszDst, &s_szUsage[offSrc], cchLine);
@@ -383 +381 @@
 
             while (s_szUsage[offSrc] == ' ')
-                offSrc++;
+                ++offSrc;
         }
 
-        /* Copy up to and including end of line. */
+        /* Copy up to and including end of line: */
         while ((ch = s_szUsage[offSrc++]) != '\n' && ch != '\0')
             *pszDst++ = ch;
@@ -616 +614 @@
 # endif /* VBOX_WS_X11 */
 
-    /*
-     * Initialize VBox Runtime.
-     */
+    /* Initialize VBox Runtime: */
 # if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
     /* Initialize the SUPLib as well only if we are really about to start a VM.
@@ -698 +694 @@
     }
 
-    /*
-     * Call actual main function:
-     */
+    /* Call to actual main function: */
     return TrustedMain(argc, argv, envp);
 }