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

Timestamp:

Jun 20, 2018 1:57:27 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Huge overhaul for VBoxGlobal class: Full code refactoring according to coding-style and latest achievements.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• VBoxGlobal.cpp (modified) (127 diffs)
• VBoxGlobal.h (modified) (31 diffs)

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

@@ -185 +185 @@
 
     /** Constructs translator passing @a pParent to the base-class. */
-    VBoxTranslator (QObject *pParent = 0)
-        : QTranslator (pParent) {}
+    VBoxTranslator(QObject *pParent = 0)
+        : QTranslator(pParent)
+    {}
 
     /** Loads language file with gained @a strFileName. */
-    bool loadFile (const QString &strFileName)
-    {
-        QFile file (strFileName);
-        if (!file.open (QIODevice::ReadOnly))
+    bool loadFile(const QString &strFileName)
+    {
+        QFile file(strFileName);
+        if (!file.open(QIODevice::ReadOnly))
             return false;
         m_data = file.readAll();
-        return load ((uchar*)m_data.data(), m_data.size());
+        return load((uchar*)m_data.data(), m_data.size());
     }
 
@@ -242 +243 @@
 bool        VBoxGlobal::s_fCleaningUp = false;
 QString     VBoxGlobal::s_strLoadedLanguageId = vboxBuiltInLanguageName();
+QString     VBoxGlobal::s_strUserDefinedPortName = QString();
 
 /* static */
@@ -346 +348 @@
 QString VBoxGlobal::qtRTVersionString()
 {
-    return QString::fromLatin1 (qVersion());
+    return QString::fromLatin1(qVersion());
 }
 
@@ -352 +354 @@
 uint VBoxGlobal::qtRTVersion()
 {
-    QString strVersionRT = VBoxGlobal::qtRTVersionString();
-    return (strVersionRT.section ('.', 0, 0).toInt() << 16) +
-           (strVersionRT.section ('.', 1, 1).toInt() << 8) +
-           strVersionRT.section ('.', 2, 2).toInt();
+    const QString strVersionRT = VBoxGlobal::qtRTVersionString();
+    return (strVersionRT.section('.', 0, 0).toInt() << 16) +
+           (strVersionRT.section('.', 1, 1).toInt() << 8) +
+           strVersionRT.section('.', 2, 2).toInt();
 }
 
@@ -361 +363 @@
 QString VBoxGlobal::qtCTVersionString()
 {
-    return QString::fromLatin1 (QT_VERSION_STR);
+    return QString::fromLatin1(QT_VERSION_STR);
 }
 
@@ -367 +369 @@
 uint VBoxGlobal::qtCTVersion()
 {
-    QString strVersionCompiled = VBoxGlobal::qtCTVersionString();
+    const QString strVersionCompiled = VBoxGlobal::qtCTVersionString();
     return (strVersionCompiled.section('.', 0, 0).toInt() << 16) +
            (strVersionCompiled.section('.', 1, 1).toInt() << 8) +
@@ -416 +418 @@
 #endif /* VBOX_WS_MAC */
 
-bool VBoxGlobal::brandingIsActive (bool fForce /* = false */)
+bool VBoxGlobal::brandingIsActive(bool fForce /* = false */)
 {
     if (fForce)
@@ -426 +428 @@
         m_strBrandingConfigFilePath += "/custom/custom.ini";
     }
-    return QFile::exists (m_strBrandingConfigFilePath);
-}
-
-QString VBoxGlobal::brandingGetKey (QString strKey)
+
+    return QFile::exists(m_strBrandingConfigFilePath);
+}
+
+QString VBoxGlobal::brandingGetKey(QString strKey)
 {
     QSettings settings(m_strBrandingConfigFilePath, QSettings::IniFormat);
@@ -448 +451 @@
     /* Among those arguments: */
     bool fResult = false;
-    QStringList args = qApp->arguments();
+    const QStringList args = qApp->arguments();
+
     /* We are looking for a list of file URLs passed to the executable: */
     QList<QUrl> listArgUrls;
@@ -457 +461 @@
         if (args.at(i).startsWith("-"))
             break;
+
 #ifdef VBOX_WS_MAC
-        QString strArg = ::darwinResolveAlias(args.at(i));
-#else /* VBOX_WS_MAC */
-        QString strArg = args.at(i);
-#endif /* !VBOX_WS_MAC */
+        const QString strArg = ::darwinResolveAlias(args.at(i));
+#else
+        const QString strArg = args.at(i);
+#endif
+
         /* So if the argument file exists, we add it to URL list: */
         if (   !strArg.isEmpty()
@@ -467 +473 @@
             listArgUrls << QUrl::fromLocalFile(strArg);
     }
+
     /* If there are file URLs: */
     if (!listArgUrls.isEmpty())
@@ -474 +481 @@
         {
             /* Check which of them has allowed VM extensions: */
-            const QString& strFile = listArgUrls.at(i).toLocalFile();
+            const QString &strFile = listArgUrls.at(i).toLocalFile();
             if (VBoxGlobal::hasAllowedExtension(strFile, VBoxFileExts))
             {
@@ -490 +497 @@
         }
     }
+
     /* And if there are *still* URLs: */
     if (!listArgUrls.isEmpty())
@@ -498 +506 @@
         emit sigAskToOpenURLs();
     }
+
     return fResult;
 }
@@ -540 +549 @@
     if (!m_strPidFile.isEmpty())
     {
-        qint64 iPid = qApp->applicationPid();
+        const qint64 iPid = qApp->applicationPid();
         QFile file(m_strPidFile);
         if (file.open(QIODevice::WriteOnly | QIODevice::Truncate))
@@ -561 +570 @@
 #endif /* VBOX_GUI_WITH_PIDFILE */
 
-QString VBoxGlobal::languageName() const
+/* static */
+QString VBoxGlobal::languageName()
 {
     /* Returns "English" if no translation is installed
      * or if the translation file is invalid. */
-    return qApp->translate ("@@@", "English",
-                            "Native language name");
-}
-
-QString VBoxGlobal::languageCountry() const
+    return QApplication::translate("@@@", "English",
+                                   "Native language name");
+}
+
+/* static */
+QString VBoxGlobal::languageCountry()
 {
     /* Returns "--" if no translation is installed or if the translation file
      * is invalid, or if the language is independent on the country. */
-    return qApp->translate ("@@@", "--",
-                            "Native language country name "
-                            "(empty if this language is for all countries)");
-}
-
-QString VBoxGlobal::languageNameEnglish() const
+    return QApplication::translate("@@@", "--",
+                                   "Native language country name "
+                                   "(empty if this language is for all countries)");
+}
+
+/* static */
+QString VBoxGlobal::languageNameEnglish()
 {
     /* Returns "English" if no translation is installed
      * or if the translation file is invalid. */
-    return qApp->translate ("@@@", "English",
-                            "Language name, in English");
-}
-
-QString VBoxGlobal::languageCountryEnglish() const
+    return QApplication::translate("@@@", "English",
+                                   "Language name, in English");
+}
+
+/* static */
+QString VBoxGlobal::languageCountryEnglish()
 {
     /* Returns "--" if no translation is installed or if the translation file
      * is invalid, or if the language is independent on the country. */
-    return qApp->translate ("@@@", "--",
-                            "Language country name, in English "
-                            "(empty if native country name is empty)");
-}
-
-QString VBoxGlobal::languageTranslators() const
+    return QApplication::translate("@@@", "--",
+                                   "Language country name, in English "
+                                   "(empty if native country name is empty)");
+}
+
+/* static */
+QString VBoxGlobal::languageTranslators()
 {
     /* Returns "Oracle Corporation" if no translation is installed or if the translation file
      * is invalid, or if the translation is supplied by Oracle Corporation. */
-    return qApp->translate ("@@@", "Oracle Corporation",
-                            "Comma-separated list of translators");
+    return QApplication::translate("@@@", "Oracle Corporation",
+                                   "Comma-separated list of translators");
 }
 
@@ -660 +674 @@
      * This method will return "C" when the requested locale is invalid or when the "C" locale is set explicitly. */
 
-#if defined (VBOX_WS_MAC)
+#if defined(VBOX_WS_MAC)
     /* QLocale return the right id only if the user select the format
      * of the language also. So we use our own implementation */
     return ::darwinSystemLanguage();
-#elif defined (Q_OS_UNIX)
-    const char *pszValue = RTEnvGet ("LC_ALL");
+#elif defined(Q_OS_UNIX)
+    const char *pszValue = RTEnvGet("LC_ALL");
     if (pszValue == 0)
-        pszValue = RTEnvGet ("LC_MESSAGES");
+        pszValue = RTEnvGet("LC_MESSAGES");
     if (pszValue == 0)
-        pszValue = RTEnvGet ("LANG");
+        pszValue = RTEnvGet("LANG");
     if (pszValue != 0)
-        return QLocale (pszValue).name();
+        return QLocale(pszValue).name();
 #endif
-    return  QLocale::system().name();
-}
-
-/* static */
-void VBoxGlobal::loadLanguage (const QString &strLangId)
-{
-    QString strEffectiveLangId = strLangId.isEmpty() ?
-        VBoxGlobal::systemLanguageId() : strLangId;
+    return QLocale::system().name();
+}
+
+/* static */
+void VBoxGlobal::loadLanguage(const QString &strLangId)
+{
+    QString strEffectiveLangId = strLangId.isEmpty()
+                               ? VBoxGlobal::systemLanguageId()
+                               : strLangId;
     QString strLanguageFileName;
     QString strSelectedLangId = vboxBuiltInLanguageName();
@@ -698 +713 @@
 
     rc = RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
-    AssertRC (rc);
+    AssertRC(rc);
 
     QString strNlsPath = QString(szNlsPath) + vboxLanguageSubDirectory();
-    QDir nlsDir (strNlsPath);
-
-    Assert (!strEffectiveLangId.isEmpty());
+    QDir nlsDir(strNlsPath);
+
+    Assert(!strEffectiveLangId.isEmpty());
     if (!strEffectiveLangId.isEmpty() && strEffectiveLangId != vboxBuiltInLanguageName())
     {
-        QRegExp regExp (vboxLanguageIdRegExp());
-        int iPos = regExp.indexIn (strEffectiveLangId);
-        /* the language ID should match the regexp completely */
-        AssertReturnVoid (iPos == 0);
-
-        QString strStrippedLangId = regExp.cap (2);
-
-        if (nlsDir.exists (vboxLanguageFileBase() + strEffectiveLangId + vboxLanguageFileExtension()))
-        {
-            strLanguageFileName = nlsDir.absoluteFilePath (vboxLanguageFileBase() + strEffectiveLangId +
-                                                           vboxLanguageFileExtension());
+        QRegExp regExp(vboxLanguageIdRegExp());
+        int iPos = regExp.indexIn(strEffectiveLangId);
+        /* The language ID should match the regexp completely: */
+        AssertReturnVoid(iPos == 0);
+
+        QString strStrippedLangId = regExp.cap(2);
+
+        if (nlsDir.exists(vboxLanguageFileBase() + strEffectiveLangId + vboxLanguageFileExtension()))
+        {
+            strLanguageFileName = nlsDir.absoluteFilePath(vboxLanguageFileBase() +
+                                                          strEffectiveLangId +
+                                                          vboxLanguageFileExtension());
             strSelectedLangId = strEffectiveLangId;
         }
-        else if (nlsDir.exists (vboxLanguageFileBase() + strStrippedLangId + vboxLanguageFileExtension()))
-        {
-            strLanguageFileName = nlsDir.absoluteFilePath (vboxLanguageFileBase() + strStrippedLangId +
-                                                           vboxLanguageFileExtension());
+        else if (nlsDir.exists(vboxLanguageFileBase() + strStrippedLangId + vboxLanguageFileExtension()))
+        {
+            strLanguageFileName = nlsDir.absoluteFilePath(vboxLanguageFileBase() +
+                                                          strStrippedLangId +
+                                                          vboxLanguageFileExtension());
             strSelectedLangId = strStrippedLangId;
         }
@@ -731 +748 @@
              * fall-back to English (built-in). */
             if (!strLangId.isNull() && strEffectiveLangId != "en")
-                msgCenter().cannotFindLanguage (strEffectiveLangId, strNlsPath);
+                msgCenter().cannotFindLanguage(strEffectiveLangId, strNlsPath);
             /* strSelectedLangId remains built-in here: */
-            AssertReturnVoid (strSelectedLangId == vboxBuiltInLanguageName());
+            AssertReturnVoid(strSelectedLangId == vboxBuiltInLanguageName());
         }
     }
@@ -747 +764 @@
 
     /* Load new language files: */
-    sTranslator = new VBoxTranslator (qApp);
-    Assert (sTranslator);
+    sTranslator = new VBoxTranslator(qApp);
+    Assert(sTranslator);
     bool fLoadOk = true;
     if (sTranslator)
@@ -754 +771 @@
         if (strSelectedLangId != vboxBuiltInLanguageName())
         {
-            Assert (!strLanguageFileName.isNull());
-            fLoadOk = sTranslator->loadFile (strLanguageFileName);
+            Assert(!strLanguageFileName.isNull());
+            fLoadOk = sTranslator->loadFile(strLanguageFileName);
         }
         /* We install the translator in any case: on failure, this will
          * activate an empty translator that will give us English (built-in): */
-        qApp->installTranslator (sTranslator);
+        qApp->installTranslator(sTranslator);
     }
     else
@@ -768 +785 @@
     else
     {
-        msgCenter().cannotLoadLanguage (strLanguageFileName);
+        msgCenter().cannotLoadLanguage(strLanguageFileName);
         s_strLoadedLanguageId = vboxBuiltInLanguageName();
     }
@@ -780 +797 @@
         strLanguageFileName = QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_" +
                               languageId() + vboxLanguageFileExtension();
-        QTranslator *pQtSysTr = new QTranslator (sTranslator);
-        Assert (pQtSysTr);
-        if (pQtSysTr && pQtSysTr->load (strLanguageFileName))
-            qApp->installTranslator (pQtSysTr);
+        QTranslator *pQtSysTr = new QTranslator(sTranslator);
+        Assert(pQtSysTr);
+        if (pQtSysTr && pQtSysTr->load(strLanguageFileName))
+            qApp->installTranslator(pQtSysTr);
         /* Note that the Qt translation supplied by Oracle is always loaded
          * afterwards to make sure it will take precedence over the system
@@ -793 +810 @@
          * Oracle translation is always the best one. */
 #endif
-        strLanguageFileName =  nlsDir.absoluteFilePath (QString ("qt_") +
-                                                        languageId() +
-                                                        vboxLanguageFileExtension());
-        QTranslator *pQtTr = new QTranslator (sTranslator);
-        Assert (pQtTr);
-        if (pQtTr && (fLoadOk = pQtTr->load (strLanguageFileName)))
-            qApp->installTranslator (pQtTr);
+        strLanguageFileName = nlsDir.absoluteFilePath(QString("qt_") +
+                                                      languageId() +
+                                                      vboxLanguageFileExtension());
+        QTranslator *pQtTr = new QTranslator(sTranslator);
+        Assert(pQtTr);
+        if (pQtTr && (fLoadOk = pQtTr->load(strLanguageFileName)))
+            qApp->installTranslator(pQtTr);
         /* The below message doesn't fit 100% (because it's an additional
          * language and the main one won't be reset to built-in on failure)
@@ -805 +822 @@
          * message (but still, having something is better than having none) */
         if (!fLoadOk && !strLangId.isNull())
-            msgCenter().cannotLoadLanguage (strLanguageFileName);
+            msgCenter().cannotLoadLanguage(strLanguageFileName);
     }
     if (fResetToC)
@@ -813 +830 @@
      * Manually trigger an update. */
     ::darwinRetranslateAppMenu();
-#endif /* VBOX_WS_MAC */
+#endif
 }
 
@@ -870 +887 @@
      *           B cannot appear there). */
 
-    QString strRegexp =
-        QString ("^(?:(?:(\\d+)(?:\\s?(%2|%3|%4|%5|%6|%7))?)|(?:(\\d*)%1(\\d{1,2})(?:\\s?(%3|%4|%5|%6|%7))))$")
-            .arg (decimalSep())
-            .arg (tr ("B", "size suffix Bytes"))
-            .arg (tr ("KB", "size suffix KBytes=1024 Bytes"))
-            .arg (tr ("MB", "size suffix MBytes=1024 KBytes"))
-            .arg (tr ("GB", "size suffix GBytes=1024 MBytes"))
-            .arg (tr ("TB", "size suffix TBytes=1024 GBytes"))
-            .arg (tr ("PB", "size suffix PBytes=1024 TBytes"));
+    const QString strRegexp =
+        QString("^(?:(?:(\\d+)(?:\\s?(%2|%3|%4|%5|%6|%7))?)|(?:(\\d*)%1(\\d{1,2})(?:\\s?(%3|%4|%5|%6|%7))))$")
+            .arg(decimalSep())
+            .arg(tr("B", "size suffix Bytes"))
+            .arg(tr("KB", "size suffix KBytes=1024 Bytes"))
+            .arg(tr("MB", "size suffix MBytes=1024 KBytes"))
+            .arg(tr("GB", "size suffix GBytes=1024 MBytes"))
+            .arg(tr("TB", "size suffix TBytes=1024 GBytes"))
+            .arg(tr("PB", "size suffix PBytes=1024 TBytes"));
     return strRegexp;
 }
 
 /* static */
-quint64 VBoxGlobal::parseSize (const QString &strText)
+quint64 VBoxGlobal::parseSize(const QString &strText)
 {
     /* Text should be in form of B|KB|MB|GB|TB|PB. */
-    QRegExp regexp (sizeRegexp());
-    int iPos = regexp.indexIn (strText);
+    QRegExp regexp(sizeRegexp());
+    int iPos = regexp.indexIn(strText);
     if (iPos != -1)
     {
-        QString strInteger = regexp.cap (1);
+        QString strInteger = regexp.cap(1);
         QString strHundred;
-        QString strSuff = regexp.cap (2);
+        QString strSuff = regexp.cap(2);
         if (strInteger.isEmpty())
         {
-            strInteger = regexp.cap (3);
-            strHundred = regexp.cap (4);
-            strSuff = regexp.cap (5);
+            strInteger = regexp.cap(3);
+            strHundred = regexp.cap(4);
+            strSuff = regexp.cap(5);
         }
 
         quint64 uDenominator = 0;
-        if (strSuff.isEmpty() || strSuff == tr ("B", "size suffix Bytes"))
+        if (strSuff.isEmpty() || strSuff == tr("B", "size suffix Bytes"))
             uDenominator = 1;
-        else if (strSuff == tr ("KB", "size suffix KBytes=1024 Bytes"))
+        else if (strSuff == tr("KB", "size suffix KBytes=1024 Bytes"))
             uDenominator = _1K;
-        else if (strSuff == tr ("MB", "size suffix MBytes=1024 KBytes"))
+        else if (strSuff == tr("MB", "size suffix MBytes=1024 KBytes"))
             uDenominator = _1M;
-        else if (strSuff == tr ("GB", "size suffix GBytes=1024 MBytes"))
+        else if (strSuff == tr("GB", "size suffix GBytes=1024 MBytes"))
             uDenominator = _1G;
-        else if (strSuff == tr ("TB", "size suffix TBytes=1024 GBytes"))
+        else if (strSuff == tr("TB", "size suffix TBytes=1024 GBytes"))
             uDenominator = _1T;
-        else if (strSuff == tr ("PB", "size suffix PBytes=1024 TBytes"))
+        else if (strSuff == tr("PB", "size suffix PBytes=1024 TBytes"))
             uDenominator = _1P;
 
@@ -918 +935 @@
             return iInteger;
 
-        quint64 iHundred = strHundred.leftJustified (2, '0').toULongLong();
+        quint64 iHundred = strHundred.leftJustified(2, '0').toULongLong();
         iHundred = iHundred * uDenominator / 100;
         iInteger = iInteger * uDenominator + iHundred;
@@ -928 +945 @@
 
 /* static */
-QString VBoxGlobal::formatSize (quint64 uSize, uint cDecimal /* = 2 */,
-                                FormatSize enmMode /* = FormatSize_Round */)
+QString VBoxGlobal::formatSize(quint64 uSize, uint cDecimal /* = 2 */,
+                               FormatSize enmMode /* = FormatSize_Round */)
 {
     /* Text will be in form of B|KB|MB|GB|TB|PB.
@@ -983 +1000 @@
     quint64 uDecimal = uSize % uDenominator;
     quint64 uMult = 1;
-    for (uint i = 0; i < cDecimal; ++ i) uMult *= 10;
+    for (uint i = 0; i < cDecimal; ++i)
+        uMult *= 10;
 
     QString strNumber;
@@ -991 +1009 @@
         {
             uDecimal *= uMult;
-            /* not greater */
+            /* Not greater: */
             if (enmMode == FormatSize_RoundDown)
                 uDecimal = uDecimal / uDenominator;
-            /* not less */
+            /* Not less: */
             else if (enmMode == FormatSize_RoundUp)
                 uDecimal = (uDecimal + uDenominator - 1) / uDenominator;
-            /* nearest */
-            else uDecimal = (uDecimal + uDenominator / 2) / uDenominator;
+            /* Nearest: */
+            else
+                uDecimal = (uDecimal + uDenominator / 2) / uDenominator;
         }
         /* Check for the fractional part overflow due to rounding: */
@@ -1004 +1023 @@
         {
             uDecimal = 0;
-            ++ uInteger;
+            ++uInteger;
             /* Check if we've got 1024 XB after rounding and scale down if so: */
             if (uInteger == 1024 && iSuffix + 1 < (int)SizeSuffix_Max)
             {
                 uInteger /= 1024;
-                ++ iSuffix;
+                ++iSuffix;
             }
         }
-        strNumber = QString::number (uInteger);
-        if (cDecimal) strNumber += QString ("%1%2").arg (decimalSep())
-            .arg (QString::number (uDecimal).rightJustified (cDecimal, '0'));
+        strNumber = QString::number(uInteger);
+        if (cDecimal)
+            strNumber += QString("%1%2").arg(decimalSep())
+                                        .arg(QString::number(uDecimal).rightJustified(cDecimal, '0'));
     }
     else
     {
-        strNumber = QString::number (uInteger);
-    }
-
-    return QString ("%1 %2").arg (strNumber).arg (gpConverter->toString(static_cast<SizeSuffix>(iSuffix)));
+        strNumber = QString::number(uInteger);
+    }
+
+    return QString("%1 %2").arg(strNumber).arg(gpConverter->toString(static_cast<SizeSuffix>(iSuffix)));
 }
 
@@ -1042 +1062 @@
 }
 
-QStringList VBoxGlobal::COMPortNames() const
+/* static */
+QStringList VBoxGlobal::COMPortNames()
 {
     QStringList list;
-    for (size_t i = 0; i < RT_ELEMENTS (kComKnownPorts); ++ i)
-        list << kComKnownPorts [i].name;
+    for (size_t i = 0; i < RT_ELEMENTS(kComKnownPorts); ++i)
+        list << kComKnownPorts[i].name;
 
     return list;
 }
 
-QString VBoxGlobal::toCOMPortName (ulong uIRQ, ulong uIOBase) const
-{
-    for (size_t i = 0; i < RT_ELEMENTS (kComKnownPorts); ++ i)
-        if (kComKnownPorts [i].IRQ == uIRQ &&
-            kComKnownPorts [i].IOBase == uIOBase)
-            return kComKnownPorts [i].name;
-
-    return m_strUserDefinedPortName;
-}
-
-bool VBoxGlobal::toCOMPortNumbers (const QString &strName, ulong &uIRQ,
-                                   ulong &uIOBase) const
-{
-    for (size_t i = 0; i < RT_ELEMENTS (kComKnownPorts); ++ i)
-        if (strcmp (kComKnownPorts [i].name, strName.toUtf8().data()) == 0)
-        {
-            uIRQ = kComKnownPorts [i].IRQ;
-            uIOBase = kComKnownPorts [i].IOBase;
+/* static */
+QString VBoxGlobal::toCOMPortName(ulong uIRQ, ulong uIOBase)
+{
+    for (size_t i = 0; i < RT_ELEMENTS(kComKnownPorts); ++i)
+        if (kComKnownPorts[i].IRQ == uIRQ &&
+            kComKnownPorts[i].IOBase == uIOBase)
+            return kComKnownPorts[i].name;
+
+    return s_strUserDefinedPortName;
+}
+
+/* static */
+bool VBoxGlobal::toCOMPortNumbers(const QString &strName, ulong &uIRQ, ulong &uIOBase)
+{
+    for (size_t i = 0; i < RT_ELEMENTS(kComKnownPorts); ++i)
+        if (strcmp(kComKnownPorts[i].name, strName.toUtf8().data()) == 0)
+        {
+            uIRQ = kComKnownPorts[i].IRQ;
+            uIOBase = kComKnownPorts[i].IOBase;
             return true;
         }
@@ -1075 +1097 @@
 }
 
-QStringList VBoxGlobal::LPTPortNames() const
+/* static */
+QStringList VBoxGlobal::LPTPortNames()
 {
     QStringList list;
-    for (size_t i = 0; i < RT_ELEMENTS (kLptKnownPorts); ++ i)
-        list << kLptKnownPorts [i].name;
+    for (size_t i = 0; i < RT_ELEMENTS(kLptKnownPorts); ++i)
+        list << kLptKnownPorts[i].name;
 
     return list;
 }
 
-QString VBoxGlobal::toLPTPortName (ulong uIRQ, ulong uIOBase) const
-{
-    for (size_t i = 0; i < RT_ELEMENTS (kLptKnownPorts); ++ i)
-        if (kLptKnownPorts [i].IRQ == uIRQ &&
-            kLptKnownPorts [i].IOBase == uIOBase)
-            return kLptKnownPorts [i].name;
-
-    return m_strUserDefinedPortName;
-}
-
-bool VBoxGlobal::toLPTPortNumbers (const QString &strName, ulong &uIRQ,
-                                   ulong &uIOBase) const
-{
-    for (size_t i = 0; i < RT_ELEMENTS (kLptKnownPorts); ++ i)
-        if (strcmp (kLptKnownPorts [i].name, strName.toUtf8().data()) == 0)
-        {
-            uIRQ = kLptKnownPorts [i].IRQ;
-            uIOBase = kLptKnownPorts [i].IOBase;
+/* static */
+QString VBoxGlobal::toLPTPortName(ulong uIRQ, ulong uIOBase)
+{
+    for (size_t i = 0; i < RT_ELEMENTS(kLptKnownPorts); ++i)
+        if (kLptKnownPorts[i].IRQ == uIRQ &&
+            kLptKnownPorts[i].IOBase == uIOBase)
+            return kLptKnownPorts[i].name;
+
+    return s_strUserDefinedPortName;
+}
+
+/* static */
+bool VBoxGlobal::toLPTPortNumbers(const QString &strName, ulong &uIRQ, ulong &uIOBase)
+{
+    for (size_t i = 0; i < RT_ELEMENTS(kLptKnownPorts); ++i)
+        if (strcmp(kLptKnownPorts[i].name, strName.toUtf8().data()) == 0)
+        {
+            uIRQ = kLptKnownPorts[i].IRQ;
+            uIOBase = kLptKnownPorts[i].IOBase;
             return true;
         }
@@ -1109 +1133 @@
 
 /* static */
-QString VBoxGlobal::highlight (const QString &strTextArg, bool fToolTip /* = false */)
+QString VBoxGlobal::highlight(QString strText, bool fToolTip /* = false */)
 {
     /* We should reformat the input strText so that:
@@ -1134 +1158 @@
     }
 
-    QString strText = strTextArg;
-
     /* Replace special entities, '&' -- first! */
-    strText.replace ('&', "&amp;");
-    strText.replace ('<', "&lt;");
-    strText.replace ('>', "&gt;");
-    strText.replace ('\"', "&quot;");
+    strText.replace('&', "&amp;");
+    strText.replace('<', "&lt;");
+    strText.replace('>', "&gt;");
+    strText.replace('\"', "&quot;");
 
     /* Mark strings in single quotes with color: */
-    QRegExp rx = QRegExp ("((?:^|\\s)[(]?)'([^']*)'(?=[:.-!);]?(?:\\s|$))");
-    rx.setMinimal (true);
-    strText.replace (rx,
-        QString ("\\1%1<nobr>'\\2'</nobr>%2").arg (strFont).arg (endFont));
+    QRegExp rx = QRegExp("((?:^|\\s)[(]?)'([^']*)'(?=[:.-!);]?(?:\\s|$))");
+    rx.setMinimal(true);
+    strText.replace(rx, QString("\\1%1<nobr>'\\2'</nobr>%2").arg(strFont).arg(endFont));
 
     /* Mark UUIDs with color: */
-    strText.replace (QRegExp (
+    strText.replace(QRegExp(
         "((?:^|\\s)[(]?)"
         "(\\{[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\\})"
         "(?=[:.-!);]?(?:\\s|$))"),
-        QString ("\\1%1<nobr>\\2</nobr>%2").arg (uuidFont).arg (endFont));
+        QString("\\1%1<nobr>\\2</nobr>%2").arg(uuidFont).arg(endFont));
 
     /* Split to paragraphs at \n chars: */
     if (!fToolTip)
-        strText.replace ('\n', "</p><p>");
+        strText.replace('\n', "</p><p>");
     else
-        strText.replace ('\n', "<br>");
+        strText.replace('\n', "<br>");
 
     return strText;
@@ -1165 +1186 @@
 
 /* static */
-QString VBoxGlobal::emphasize (const QString &strTextArg)
+QString VBoxGlobal::emphasize(QString strText)
 {
     /* We should reformat the input string @a strText so that:
@@ -1177 +1198 @@
      *    or prepended to the existing paragraph). */
 
-    QString strEmphStart ("<b>");
-    QString strEmphEnd ("</b>");
-    QString uuidEmphStart ("<i>");
-    QString uuidEmphEnd ("</i>");
-
-    QString strText = strTextArg;
+    QString strEmphStart("<b>");
+    QString strEmphEnd("</b>");
+    QString uuidEmphStart("<i>");
+    QString uuidEmphEnd("</i>");
 
     /* Replace special entities, '&' -- first! */
-    strText.replace ('&', "&amp;");
-    strText.replace ('<', "&lt;");
-    strText.replace ('>', "&gt;");
-    strText.replace ('\"', "&quot;");
+    strText.replace('&', "&amp;");
+    strText.replace('<', "&lt;");
+    strText.replace('>', "&gt;");
+    strText.replace('\"', "&quot;");
 
     /* Mark strings in single quotes with bold style: */
-    QRegExp rx = QRegExp ("((?:^|\\s)[(]?)'([^']*)'(?=[:.-!);]?(?:\\s|$))");
-    rx.setMinimal (true);
-    strText.replace(rx,
-        QString ("\\1%1<nobr>'\\2'</nobr>%2").arg (strEmphStart).arg (strEmphEnd));
+    QRegExp rx = QRegExp("((?:^|\\s)[(]?)'([^']*)'(?=[:.-!);]?(?:\\s|$))");
+    rx.setMinimal(true);
+    strText.replace(rx, QString("\\1%1<nobr>'\\2'</nobr>%2").arg(strEmphStart).arg(strEmphEnd));
 
     /* Mark UUIDs with italic style: */
-    strText.replace (QRegExp (
+    strText.replace(QRegExp(
         "((?:^|\\s)[(]?)"
         "(\\{[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\\})"
         "(?=[:.-!);]?(?:\\s|$))"),
-        QString ("\\1%1<nobr>\\2</nobr>%2").arg (uuidEmphStart).arg (uuidEmphEnd));
+        QString("\\1%1<nobr>\\2</nobr>%2").arg(uuidEmphStart).arg(uuidEmphEnd));
 
     /* Split to paragraphs at \n chars: */
-    strText.replace ('\n', "</p><p>");
+    strText.replace('\n', "</p><p>");
 
     return strText;
@@ -1210 +1228 @@
 
 /* static */
-QString VBoxGlobal::removeAccelMark (const QString &strTextArg)
+QString VBoxGlobal::removeAccelMark(QString strText)
 {
     /* In order to support accelerators used in non-alphabet languages
@@ -1218 +1236 @@
      * removed from the string. */
 
-    QString strText = strTextArg;
-
-    QRegExp accel ("\\(&[a-zA-Z]\\)");
-    int iPos = accel.indexIn (strText);
+    QRegExp accel("\\(&[a-zA-Z]\\)");
+    int iPos = accel.indexIn(strText);
     if (iPos >= 0)
-        strText.remove (iPos, accel.cap().length());
+        strText.remove(iPos, accel.cap().length());
     else
     {
-        iPos = strText.indexOf ('&');
+        iPos = strText.indexOf('&');
         if (iPos >= 0)
-            strText.remove (iPos, 1);
+            strText.remove(iPos, 1);
     }
 
@@ -1249 +1265 @@
 }
 
-QString VBoxGlobal::helpFile() const
-{
-#if defined (VBOX_WS_WIN)
+/* static */
+QString VBoxGlobal::helpFile()
+{
+#if defined(VBOX_WS_WIN)
     const QString strName = "VirtualBox";
     const QString strSuffix = "chm";
-#elif defined (VBOX_WS_MAC)
+#elif defined(VBOX_WS_MAC)
     const QString strName = "UserManual";
     const QString strSuffix = "pdf";
-#elif defined (VBOX_WS_X11)
+#elif defined(VBOX_WS_X11)
 # if defined VBOX_OSE
     const QString strName = "UserManual";
@@ -1266 +1283 @@
 # endif
 #endif
+
     /* Where are the docs located? */
     char szDocsPath[RTPATH_MAX];
-    int rc = RTPathAppDocs (szDocsPath, sizeof (szDocsPath));
-    AssertRC (rc);
+    int rc = RTPathAppDocs(szDocsPath, sizeof(szDocsPath));
+    AssertRC(rc);
+
     /* Make sure that the language is in two letter code.
      * Note: if languageId() returns an empty string lang.name() will
      * return "C" which is an valid language code. */
-    QLocale lang (VBoxGlobal::languageId());
+    QLocale lang(VBoxGlobal::languageId());
 
     /* Construct the path and the filename: */
-    QString strManual = QString ("%1/%2_%3.%4").arg (szDocsPath)
-                                               .arg (strName)
-                                               .arg (lang.name())
-                                               .arg (strSuffix);
+    QString strManual = QString("%1/%2_%3.%4").arg(szDocsPath)
+                                              .arg(strName)
+                                              .arg(lang.name())
+                                              .arg(strSuffix);
+
     /* Check if a help file with that name exists: */
-    QFileInfo fi (strManual);
+    QFileInfo fi(strManual);
     if (fi.exists())
         return strManual;
 
     /* Fall back to the standard: */
-    strManual = QString ("%1/%2.%4").arg (szDocsPath)
-                                    .arg (strName)
-                                    .arg (strSuffix);
+    strManual = QString("%1/%2.%4").arg(szDocsPath)
+                                   .arg(strName)
+                                   .arg(strSuffix);
     return strManual;
 }
@@ -1310 +1330 @@
 
 /* static */
-QRect VBoxGlobal::normalizeGeometry (const QRect &rectangle, const QRegion &boundRegion,
-                                     bool fCanResize /* = true */)
+QRect VBoxGlobal::normalizeGeometry(const QRect &rectangle, const QRegion &boundRegion, bool fCanResize /* = true */)
 {
     /* Perform direct and flipped search of position for @a rectangle to make sure it is fully contained
@@ -1317 +1336 @@
      * necessary. Selects the minimum shifted result between direct and flipped variants. */
 
-    /* Direct search for normalized rectangle */
-    QRect var1 (getNormalized (rectangle, boundRegion, fCanResize));
+    /* Direct search for normalized rectangle: */
+    QRect var1(getNormalized(rectangle, boundRegion, fCanResize));
 
     /* Flipped search for normalized rectangle: */
-    QRect var2 (flip (getNormalized (flip (rectangle).boundingRect(),
-                                     flip (boundRegion), fCanResize)).boundingRect());
+    QRect var2(flip(getNormalized(flip(rectangle).boundingRect(),
+                                  flip(boundRegion), fCanResize)).boundingRect());
 
     /* Calculate shift from starting position for both variants: */
-    double dLength1 = sqrt (pow ((double) (var1.x() - rectangle.x()), (double) 2) +
-                            pow ((double) (var1.y() - rectangle.y()), (double) 2));
-    double dLength2 = sqrt (pow ((double) (var2.x() - rectangle.x()), (double) 2) +
-                            pow ((double) (var2.y() - rectangle.y()), (double) 2));
+    double dLength1 = sqrt(pow((double)(var1.x() - rectangle.x()), (double)2) +
+                           pow((double)(var1.y() - rectangle.y()), (double)2));
+    double dLength2 = sqrt(pow((double)(var2.x() - rectangle.x()), (double)2) +
+                           pow((double)(var2.y() - rectangle.y()), (double)2));
 
     /* Return minimum shifted variant: */
@@ -1335 +1354 @@
 
 /* static */
-QRect VBoxGlobal::getNormalized (const QRect &rectangle, const QRegion &boundRegion,
-                                 bool /* fCanResize = true */)
+QRect VBoxGlobal::getNormalized(const QRect &rectangle, const QRegion &boundRegion, bool /* fCanResize = true */)
 {
     /* Ensures that the given rectangle @a rectangle is fully contained within the region @a boundRegion
@@ -1344 +1362 @@
 
     /* Storing available horizontal sub-rectangles & vertical shifts: */
-    int iWindowVertical = rectangle.center().y();
-    QVector <QRect> rectanglesVector (boundRegion.rects());
-    QList <QRect> rectanglesList;
-    QList <int> shiftsList;
-    foreach (QRect currentItem, rectanglesVector)
-    {
-        int iCurrentDelta = qAbs (iWindowVertical - currentItem.center().y());
-        int iShift2Top = currentItem.top() - rectangle.top();
-        int iShift2Bot = currentItem.bottom() - rectangle.bottom();
+    const int iWindowVertical = rectangle.center().y();
+    QList<QRect> rectanglesList;
+    QList<int> shiftsList;
+    foreach (QRect currentItem, boundRegion.rects())
+    {
+        const int iCurrentDelta = qAbs(iWindowVertical - currentItem.center().y());
+        const int iShift2Top = currentItem.top() - rectangle.top();
+        const int iShift2Bot = currentItem.bottom() - rectangle.bottom();
 
         int iTtemPosition = 0;
         foreach (QRect item, rectanglesList)
         {
-            int iDelta = qAbs (iWindowVertical - item.center().y());
-            if (iDelta > iCurrentDelta) break; else ++ iTtemPosition;
-        }
-        rectanglesList.insert (iTtemPosition, currentItem);
+            const int iDelta = qAbs(iWindowVertical - item.center().y());
+            if (iDelta > iCurrentDelta)
+                break;
+            else
+                ++iTtemPosition;
+        }
+        rectanglesList.insert(iTtemPosition, currentItem);
 
         int iShift2TopPos = 0;
         foreach (int iShift, shiftsList)
-            if (qAbs (iShift) > qAbs (iShift2Top)) break; else ++ iShift2TopPos;
-        shiftsList.insert (iShift2TopPos, iShift2Top);
+            if (qAbs(iShift) > qAbs(iShift2Top))
+                break;
+            else
+                ++iShift2TopPos;
+        shiftsList.insert(iShift2TopPos, iShift2Top);
 
         int iShift2BotPos = 0;
         foreach (int iShift, shiftsList)
-            if (qAbs(iShift) > qAbs(iShift2Bot)) break; else ++ iShift2BotPos;
-        shiftsList.insert (iShift2BotPos, iShift2Bot);
+            if (qAbs(iShift) > qAbs(iShift2Bot))
+                break;
+            else
+                ++iShift2BotPos;
+        shiftsList.insert(iShift2BotPos, iShift2Bot);
     }
 
     /* Trying to find the appropriate place for window: */
     QRect result;
-    for (int i = -1; i < shiftsList.size(); ++ i)
+    for (int i = -1; i < shiftsList.size(); ++i)
     {
         /* Move to appropriate vertical: */
-        QRect newRectangle (rectangle);
-        if (i >= 0) newRectangle.translate (0, shiftsList [i]);
+        QRect newRectangle(rectangle);
+        if (i >= 0)
+            newRectangle.translate(0, shiftsList[i]);
 
         /* Search horizontal shift: */
@@ -1385 +1412 @@
         foreach (QRect item, rectanglesList)
         {
-            QRect trectangle (newRectangle.translated (item.left() - newRectangle.left(), 0));
-            if (!item.intersects (trectangle))
+            QRect trectangle(newRectangle.translated(item.left() - newRectangle.left(), 0));
+            if (!item.intersects(trectangle))
                 continue;
 
             if (newRectangle.left() < item.left())
             {
-                int iShift = item.left() - newRectangle.left();
-                iMaxShift = qAbs (iShift) > qAbs (iMaxShift) ? iShift : iMaxShift;
+                const int iShift = item.left() - newRectangle.left();
+                iMaxShift = qAbs(iShift) > qAbs(iMaxShift) ? iShift : iMaxShift;
             }
             else if (newRectangle.right() > item.right())
             {
-                int iShift = item.right() - newRectangle.right();
-                iMaxShift = qAbs (iShift) > qAbs (iMaxShift) ? iShift : iMaxShift;
+                const int iShift = item.right() - newRectangle.right();
+                iMaxShift = qAbs(iShift) > qAbs(iMaxShift) ? iShift : iMaxShift;
             }
         }
 
         /* Shift across the horizontal direction: */
-        newRectangle.translate (iMaxShift, 0);
+        newRectangle.translate(iMaxShift, 0);
 
         /* Check the translated rectangle to feat the rules: */
-        if (boundRegion.united (newRectangle) == boundRegion)
+        if (boundRegion.united(newRectangle) == boundRegion)
             result = newRectangle;
 
-        if (!result.isNull()) break;
+        if (!result.isNull())
+            break;
     }
 
@@ -1419 +1447 @@
         foreach (QRect item, rectanglesList)
         {
-            quint64 uSquare = item.width() * item.height();
+            const quint64 uSquare = item.width() * item.height();
             if (uSquare > uMaxSquare)
             {
@@ -1428 +1456 @@
 
         result = rectangle;
-        result.moveTo (maxRectangle.x(), maxRectangle.y());
+        result.moveTo(maxRectangle.x(), maxRectangle.y());
         if (maxRectangle.right() < result.right())
-            result.setRight (maxRectangle.right());
+            result.setRight(maxRectangle.right());
         if (maxRectangle.bottom() < result.bottom())
-            result.setBottom (maxRectangle.bottom());
+            result.setBottom(maxRectangle.bottom());
     }
 
@@ -1439 +1467 @@
 
 /* static */
-QRegion VBoxGlobal::flip (const QRegion &region)
+QRegion VBoxGlobal::flip(const QRegion &region)
 {
     QRegion result;
-    QVector <QRect> rectangles (region.rects());
+    QVector<QRect> rectangles(region.rects());
     foreach (QRect rectangle, rectangles)
-        result += QRect (rectangle.y(), rectangle.x(),
-                         rectangle.height(), rectangle.width());
+        result += QRect(rectangle.y(), rectangle.x(),
+                        rectangle.height(), rectangle.width());
     return result;
 }
 
 /* static */
-void VBoxGlobal::centerWidget (QWidget *pWidget, QWidget *pRelative,
-                               bool fCanResize /* = true */)
+void VBoxGlobal::centerWidget(QWidget *pWidget, QWidget *pRelative, bool fCanResize /* = true */)
 {
     /* If necessary, pWidget's position is adjusted to make it fully visible within
@@ -1462 +1489 @@
      * pWidget will be centered relative to the available desktop area. */
 
-    AssertReturnVoid (pWidget);
-    AssertReturnVoid (pWidget->isTopLevel());
+    AssertReturnVoid(pWidget);
+    AssertReturnVoid(pWidget->isTopLevel());
 
     QRect deskGeo, parentGeo;
-    QWidget *w = pRelative;
-    if (w)
-    {
-        w = w->window();
-        deskGeo = gpDesktop->availableGeometry (w);
-        parentGeo = w->frameGeometry();
+    if (pRelative)
+    {
+        pRelative = pRelative->window();
+        deskGeo = gpDesktop->availableGeometry(pRelative);
+        parentGeo = pRelative->frameGeometry();
         // WORKAROUND:
         // On X11/Gnome, geo/frameGeo.x() and y() are always 0 for top level
         // widgets with parents, what a shame. Use mapToGlobal() to workaround.
-        QPoint d = w->mapToGlobal (QPoint (0, 0));
-        d.rx() -= w->geometry().x() - w->x();
-        d.ry() -= w->geometry().y() - w->y();
-        parentGeo.moveTopLeft (d);
+        QPoint d = pRelative->mapToGlobal(QPoint(0, 0));
+        d.rx() -= pRelative->geometry().x() - pRelative->x();
+        d.ry() -= pRelative->geometry().y() - pRelative->y();
+        parentGeo.moveTopLeft(d);
     }
     else
@@ -1492 +1518 @@
     // is based on the idea taken from QDialog::adjustPositionInternal().
 
-    int iExtraW = 0, iExtraH = 0;
+    int iExtraW = 0;
+    int iExtraH = 0;
 
     QWidgetList list = QApplication::topLevelWidgets();
-    QListIterator<QWidget*> it (list);
+    QListIterator<QWidget*> it(list);
     while ((iExtraW == 0 || iExtraH == 0) && it.hasNext())
     {
@@ -1506 +1533 @@
         iFrameH = pCurrent->frameGeometry().height() - pCurrent->height();
 
-        iExtraW = qMax (iExtraW, iFrameW);
-        iExtraH = qMax (iExtraH, iFrameH);
-    }
-
-    /* On non-X11 platforms, the following would be enough instead of the
-     * above workaround: */
+        iExtraW = qMax(iExtraW, iFrameW);
+        iExtraH = qMax(iExtraH, iFrameH);
+    }
+
+    /* On non-X11 platforms, the following would be enough instead of the above workaround: */
     // QRect geo = frameGeometry();
-    QRect geo = QRect (0, 0, pWidget->width() + iExtraW,
-                             pWidget->height() + iExtraH);
-
-    geo.moveCenter (QPoint (parentGeo.x() + (parentGeo.width() - 1) / 2,
-                            parentGeo.y() + (parentGeo.height() - 1) / 2));
+    QRect geo = QRect(0, 0, pWidget->width() + iExtraW,
+                            pWidget->height() + iExtraH);
+
+    geo.moveCenter(QPoint(parentGeo.x() + (parentGeo.width() - 1) / 2,
+                          parentGeo.y() + (parentGeo.height() - 1) / 2));
 
     /* Ensure the widget is within the available desktop area: */
-    QRect newGeo = normalizeGeometry (geo, deskGeo, fCanResize);
+    QRect newGeo = normalizeGeometry(geo, deskGeo, fCanResize);
 #ifdef VBOX_WS_MAC
     // WORKAROUND:
@@ -1526 +1552 @@
     // ::move call. So manually add the height of the toolbar before setting
     // the position.
-    if (w)
-        newGeo.translate (0, ::darwinWindowToolBarHeight (pWidget));
+    if (pRelative)
+        newGeo.translate(0, ::darwinWindowToolBarHeight(pWidget));
 #endif /* VBOX_WS_MAC */
 
-    pWidget->move (newGeo.topLeft());
-
-    if (fCanResize &&
-        (geo.width() != newGeo.width() || geo.height() != newGeo.height()))
+    pWidget->move(newGeo.topLeft());
+
+    if (   fCanResize
+        && (geo.width() != newGeo.width() || geo.height() != newGeo.height()))
         pWidget->resize(newGeo.width() - iExtraW, newGeo.height() - iExtraH);
 }
@@ -1580 +1606 @@
         uint16_t fMask =   XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y
                          | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT;
-        uint32_t values[] = { (uint32_t)(x * dDPR), (uint32_t)(y * dDPR),
-                              (uint32_t)(w * dDPR), (uint32_t)(h * dDPR) };
+        uint32_t values[] = { (uint32_t)(x * dDPR), (uint32_t)(y * dDPR), (uint32_t)(w * dDPR), (uint32_t)(h * dDPR) };
         xcb_configure_window(QX11Info::connection(), (xcb_window_t)pWidget->winId(),
                              fMask, values);
@@ -1629 +1654 @@
 }
 
-#if defined (VBOX_WS_X11)
-
-static char *XXGetProperty (Display *pDpy, Window windowHandle,
-                            Atom propType, const char *pszPropName)
-{
-    Atom propNameAtom = XInternAtom (pDpy, pszPropName,
-                                     True /* only_if_exists */);
+#if defined(VBOX_WS_X11)
+
+static char *XXGetProperty(Display *pDpy, Window windowHandle, Atom propType, const char *pszPropName)
+{
+    Atom propNameAtom = XInternAtom(pDpy, pszPropName, True /* only_if_exists */);
     if (propNameAtom == None)
         return NULL;
@@ -1644 +1667 @@
     unsigned long nBytesAfter = 0;
     unsigned char *propVal = NULL;
-    int rc = XGetWindowProperty (pDpy, windowHandle, propNameAtom,
-                                 0, LONG_MAX, False /* delete */,
-                                 propType, &actTypeAtom, &actFmt,
-                                 &nItems, &nBytesAfter, &propVal);
+    int rc = XGetWindowProperty(pDpy, windowHandle, propNameAtom,
+                                0, LONG_MAX, False /* delete */,
+                                propType, &actTypeAtom, &actFmt,
+                                &nItems, &nBytesAfter, &propVal);
     if (rc != Success)
         return NULL;
 
-    return reinterpret_cast <char *> (propVal);
-}
-
-static Bool XXSendClientMessage (Display *pDpy, Window windowHandle, const char *pszMsg,
-                                 unsigned long aData0 = 0, unsigned long aData1 = 0,
-                                 unsigned long aData2 = 0, unsigned long aData3 = 0,
-                                 unsigned long aData4 = 0)
-{
-    Atom msgAtom = XInternAtom (pDpy, pszMsg, True /* only_if_exists */);
+    return reinterpret_cast<char*>(propVal);
+}
+
+static Bool XXSendClientMessage(Display *pDpy, Window windowHandle, const char *pszMsg,
+                                unsigned long aData0 = 0, unsigned long aData1 = 0,
+                                unsigned long aData2 = 0, unsigned long aData3 = 0,
+                                unsigned long aData4 = 0)
+{
+    Atom msgAtom = XInternAtom(pDpy, pszMsg, True /* only_if_exists */);
     if (msgAtom == None)
         return False;
@@ -1674 +1697 @@
     /* Always send as 32 bit for now: */
     ev.xclient.format = 32;
-    ev.xclient.data.l [0] = aData0;
-    ev.xclient.data.l [1] = aData1;
-    ev.xclient.data.l [2] = aData2;
-    ev.xclient.data.l [3] = aData3;
-    ev.xclient.data.l [4] = aData4;
-
-    return XSendEvent (pDpy, DefaultRootWindow (pDpy), False,
-                       SubstructureRedirectMask, &ev) != 0;
+    ev.xclient.data.l[0] = aData0;
+    ev.xclient.data.l[1] = aData1;
+    ev.xclient.data.l[2] = aData2;
+    ev.xclient.data.l[3] = aData3;
+    ev.xclient.data.l[4] = aData4;
+
+    return XSendEvent(pDpy, DefaultRootWindow(pDpy), False,
+                      SubstructureRedirectMask, &ev) != 0;
 }
 
@@ -1687 +1710 @@
 
 /* static */
-bool VBoxGlobal::activateWindow (WId wId, bool fSwitchDesktop /* = true */)
+bool VBoxGlobal::activateWindow(WId wId, bool fSwitchDesktop /* = true */)
 {
     RT_NOREF(fSwitchDesktop);
     bool fResult = true;
 
-#if defined (VBOX_WS_WIN)
+#if defined(VBOX_WS_WIN)
 
     HWND handle = (HWND)wId;
 
-    if (IsIconic (handle))
-        fResult &= !!ShowWindow (handle, SW_RESTORE);
-    else if (!IsWindowVisible (handle))
-        fResult &= !!ShowWindow (handle, SW_SHOW);
-
-    fResult &= !!SetForegroundWindow (handle);
-
-#elif defined (VBOX_WS_X11)
+    if (IsIconic(handle))
+        fResult &= !!ShowWindow(handle, SW_RESTORE);
+    else if (!IsWindowVisible(handle))
+        fResult &= !!ShowWindow(handle, SW_SHOW);
+
+    fResult &= !!SetForegroundWindow(handle);
+
+#elif defined(VBOX_WS_X11)
 
     Display *pDisplay = QX11Info::display();
@@ -1710 +1733 @@
     {
         /* try to find the desktop ID using the NetWM property */
-        CARD32 *pDesktop = (CARD32 *) XXGetProperty (pDisplay, wId, XA_CARDINAL,
-                                                     "_NET_WM_DESKTOP");
+        CARD32 *pDesktop = (CARD32 *) XXGetProperty(pDisplay, wId, XA_CARDINAL,
+                                                    "_NET_WM_DESKTOP");
         if (pDesktop == NULL)
             // WORKAROUND:
             // if the NetWM properly is not supported try to find
             // the desktop ID using the GNOME WM property.
-            pDesktop = (CARD32 *) XXGetProperty (pDisplay, wId, XA_CARDINAL,
-                                                 "_WIN_WORKSPACE");
+            pDesktop = (CARD32 *) XXGetProperty(pDisplay, wId, XA_CARDINAL,
+                                                "_WIN_WORKSPACE");
 
         if (pDesktop != NULL)
         {
-            Bool ok = XXSendClientMessage (pDisplay, DefaultRootWindow (pDisplay),
-                                           "_NET_CURRENT_DESKTOP",
-                                           *pDesktop);
+            Bool ok = XXSendClientMessage(pDisplay, DefaultRootWindow(pDisplay),
+                                          "_NET_CURRENT_DESKTOP",
+                                          *pDesktop);
             if (!ok)
             {
@@ -1729 +1752 @@
                 fResult = false;
             }
-            XFree (pDesktop);
+            XFree(pDesktop);
         }
         else
@@ -1738 +1761 @@
     }
 
-    Bool ok = XXSendClientMessage (pDisplay, wId, "_NET_ACTIVE_WINDOW");
+    Bool ok = XXSendClientMessage(pDisplay, wId, "_NET_ACTIVE_WINDOW");
     fResult &= !!ok;
 
-    XRaiseWindow (pDisplay, wId);
+    XRaiseWindow(pDisplay, wId);
 
 #else
 
-    NOREF (wId);
-    NOREF (fSwitchDesktop);
+    NOREF(wId);
+    NOREF(fSwitchDesktop);
     AssertFailed();
     fResult = false;
@@ -1758 +1781 @@
 }
 
-#if defined (VBOX_WS_X11)
+#if defined(VBOX_WS_X11)
 
 /* static */
@@ -1981 +2004 @@
 }
 
-#endif
+#endif /* VBOX_WS_X11 */
 
 /* static */
@@ -2002 +2025 @@
 
     /* Calculate minimum-width magic: */
-    int iSpinBoxWidth = pSpinBox->width();
-    int iSpinBoxEditFieldWidth = rect.width();
-    int iSpinBoxDelta = qMax(0, iSpinBoxWidth - iSpinBoxEditFieldWidth);
+    const int iSpinBoxWidth = pSpinBox->width();
+    const int iSpinBoxEditFieldWidth = rect.width();
+    const int iSpinBoxDelta = qMax(0, iSpinBoxWidth - iSpinBoxEditFieldWidth);
     QFontMetrics metrics(pSpinBox->font(), pSpinBox);
-    QString strDummy(cCount, '0');
-    int iTextWidth = metrics.width(strDummy);
+    const QString strDummy(cCount, '0');
+    const int iTextWidth = metrics.width(strDummy);
 
     /* Tune spin-box minimum-width: */
@@ -2029 +2052 @@
 
 CGuestOSType VBoxGlobal::vmGuestOSType(const QString &strTypeId,
-             const QString &strFamilyId /* = QString() */) const
-{
-    QList <CGuestOSType> list;
-    if (m_guestOSFamilyIDs.contains (strFamilyId))
-    {
-        list = m_guestOSTypes [m_guestOSFamilyIDs.indexOf (strFamilyId)];
+                                       const QString &strFamilyId /* = QString() */) const
+{
+    QList<CGuestOSType> list;
+    if (m_guestOSFamilyIDs.contains(strFamilyId))
+    {
+        list = m_guestOSTypes.at(m_guestOSFamilyIDs.indexOf(strFamilyId));
     }
     else
     {
-        for (int i = 0; i < m_guestOSFamilyIDs.size(); ++ i)
-            list += m_guestOSTypes [i];
-    }
-    for (int j = 0; j < list.size(); ++ j)
-        if (!list [j].GetId().compare (strTypeId))
-            return list [j];
-    AssertMsgFailed (("Type ID incorrect: '%s'.", strTypeId.toLatin1().constData()));
+        for (int i = 0; i < m_guestOSFamilyIDs.size(); ++i)
+            list += m_guestOSTypes.at(i);
+    }
+    for (int j = 0; j < list.size(); ++j)
+        if (!list.at(j).GetId().compare(strTypeId))
+            return list.at(j);
+    AssertMsgFailed(("Type ID incorrect: '%s'.", strTypeId.toLatin1().constData()));
     return CGuestOSType();
 }
 
-QString VBoxGlobal::vmGuestOSTypeDescription (const QString &strTypeId) const
-{
-    for (int i = 0; i < m_guestOSFamilyIDs.size(); ++ i)
-    {
-        QList <CGuestOSType> list (m_guestOSTypes [i]);
-        for ( int j = 0; j < list.size(); ++ j)
-            if (!list [j].GetId().compare (strTypeId))
-                return list [j].GetDescription();
+QString VBoxGlobal::vmGuestOSTypeDescription(const QString &strTypeId) const
+{
+    for (int i = 0; i < m_guestOSFamilyIDs.size(); ++i)
+    {
+        QList<CGuestOSType> list(m_guestOSTypes[i]);
+        for (int j = 0; j < list.size(); ++j)
+            if (!list.at(j).GetId().compare(strTypeId))
+                return list.at(j).GetDescription();
     }
     return QString();
@@ -2061 +2084 @@
 
 /* static */
-bool VBoxGlobal::isDOSType (const QString &strOSTypeId)
-{
-    if (strOSTypeId.left (3) == "dos" ||
-        strOSTypeId.left (3) == "win" ||
-        strOSTypeId.left (3) == "os2")
+bool VBoxGlobal::isDOSType(const QString &strOSTypeId)
+{
+    if (   strOSTypeId.left(3) == "dos"
+        || strOSTypeId.left(3) == "win"
+        || strOSTypeId.left(3) == "os2")
         return true;
 
@@ -2071 +2094 @@
 }
 
+/* static */
 bool VBoxGlobal::switchToMachine(CMachine &comMachine)
 {
@@ -2076 +2100 @@
     ULONG64 id = comMachine.ShowConsoleWindow();
 #else
-    WId id = (WId) comMachine.ShowConsoleWindow();
+    WId id = (WId)comMachine.ShowConsoleWindow();
 #endif
+
     AssertWrapperOk(comMachine);
     if (!comMachine.isOk())
@@ -2090 +2115 @@
 #if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 
-    return vboxGlobal().activateWindow(id, true);
+    return activateWindow(id, true);
 
 #elif defined(VBOX_WS_MAC)
+
     // WORKAROUND:
     // This is just for the case were the other process cannot steal
@@ -2130 +2156 @@
         {
             /* Just switch to existing VM window: */
-            return VBoxGlobal::switchToMachine(comMachine);
+            return switchToMachine(comMachine);
         }
         /* For the Runtime UI: */
@@ -2137 +2163 @@
             /* Only separate UI process can reach that place,
              * switch to existing VM window and exit. */
-            VBoxGlobal::switchToMachine(comMachine);
+            switchToMachine(comMachine);
             return false;
         }
@@ -2167 +2193 @@
     /* Allow started VM process to be foreground window: */
     AllowSetForegroundWindow(ASFW_ANY);
-#endif /* Q_OS_WIN */
+#endif
 #ifdef VBOX_WS_X11
     /* Make sure VM process will start on the same display as the VM selector: */
@@ -2176 +2202 @@
     if (pXauth)
         strEnv.append(QString("XAUTHORITY=%1\n").arg(pXauth));
-#endif /* VBOX_WS_X11 */
+#endif
     QString strType;
     switch (enmLaunchMode)
     {
         case LaunchMode_Default:  strType = ""; break;
-        case LaunchMode_Separate: strType = vboxGlobal().isSeparateProcess() ? "headless" : "separate"; break;
+        case LaunchMode_Separate: strType = isSeparateProcess() ? "headless" : "separate"; break;
         case LaunchMode_Headless: strType = "headless"; break;
         default: AssertFailedReturn(false);
@@ -2282 +2308 @@
 }
 
-/* static */
-QList <QPair <QString, QString> > VBoxGlobal::MediumBackends(KDeviceType enmType)
+QList<QPair<QString, QString> > VBoxGlobal::MediumBackends(KDeviceType enmType) const
 {
     /* Prepare a list of pairs with the form <tt>{"Backend Name", "*.suffix1 .suffix2 ..."}</tt>. */
-    CSystemProperties comSystemProperties = vboxGlobal().virtualBox().GetSystemProperties();
+    CSystemProperties comSystemProperties = virtualBox().GetSystemProperties();
     QVector<CMediumFormat> mediumFormats = comSystemProperties.GetMediumFormats();
     QList< QPair<QString, QString> > backendPropList;
-    for (int i = 0; i < mediumFormats.size(); ++ i)
+    for (int i = 0; i < mediumFormats.size(); ++i)
     {
         /* File extensions */
@@ -2295 +2320 @@
         QVector <KDeviceType> deviceTypes;
 
-        mediumFormats [i].DescribeFileExtensions(fileExtensions, deviceTypes);
+        mediumFormats[i].DescribeFileExtensions(fileExtensions, deviceTypes);
 
         QStringList f;
-        for (int a = 0; a < fileExtensions.size(); ++ a)
-            if (deviceTypes [a] == enmType)
-                f << QString ("*.%1").arg (fileExtensions [a]);
+        for (int a = 0; a < fileExtensions.size(); ++a)
+            if (deviceTypes[a] == enmType)
+                f << QString("*.%1").arg(fileExtensions[a]);
         /* Create a pair out of the backend description and all suffix's. */
         if (!f.isEmpty())
-            backendPropList << QPair<QString, QString> (mediumFormats [i].GetName(), f.join(" "));
+            backendPropList << QPair<QString, QString>(mediumFormats[i].GetName(), f.join(" "));
     }
     return backendPropList;
@@ -2309 +2334 @@
 
 /* static */
-QList <QPair <QString, QString> > VBoxGlobal::HDDBackends()
+QList<QPair<QString, QString> > VBoxGlobal::HDDBackends() const
 {
     return MediumBackends(KDeviceType_HardDisk);
@@ -2315 +2340 @@
 
 /* static */
-QList <QPair <QString, QString> > VBoxGlobal::DVDBackends()
+QList<QPair<QString, QString> > VBoxGlobal::DVDBackends() const
 {
     return MediumBackends(KDeviceType_DVD);
@@ -2321 +2346 @@
 
 /* static */
-QList <QPair <QString, QString> > VBoxGlobal::FloppyBackends()
+QList<QPair<QString, QString> > VBoxGlobal::FloppyBackends() const
 {
     return MediumBackends(KDeviceType_Floppy);
@@ -2360 +2385 @@
 {
     /* Redirect request to medium-enumerator: */
-    return m_pMediumEnumerator
-        && m_pMediumEnumerator->isMediumEnumerationInProgress();
+    return    m_pMediumEnumerator
+           && m_pMediumEnumerator->isMediumEnumerationInProgress();
 }
 
@@ -2443 +2468 @@
         recentMediumList.removeAll(strMediumLocation);
     recentMediumList.prepend(strMediumLocation);
-    while(recentMediumList.size() > 5) recentMediumList.removeLast();
+    while(recentMediumList.size() > 5)
+        recentMediumList.removeLast();
     switch (enmMediumType)
     {
@@ -2482 +2508 @@
 {
     /* Initialize variables: */
-    QList < QPair <QString, QString> > filters;
+    QList<QPair <QString, QString> > filters;
     QStringList backends;
     QStringList prefixes;
@@ -2493 +2519 @@
         case UIMediumType_HardDisk:
         {
-            filters = vboxGlobal().HDDBackends();
+            filters = HDDBackends();
             strTitle = tr("Please choose a virtual hard disk file");
             allType = tr("All virtual hard disk files (%1)");
@@ -2505 +2531 @@
         case UIMediumType_DVD:
         {
-            filters = vboxGlobal().DVDBackends();
+            filters = DVDBackends();
             strTitle = tr("Please choose a virtual optical disk file");
             allType = tr("All virtual optical disk files (%1)");
@@ -2517 +2543 @@
         case UIMediumType_Floppy:
         {
-            filters = vboxGlobal().FloppyBackends();
+            filters = FloppyBackends();
             strTitle = tr("Please choose a virtual floppy disk file");
             allType = tr("All virtual floppy disk files (%1)");
@@ -2531 +2557 @@
     }
     QString strHomeFolder = fUseLastFolder && !strLastFolder.isEmpty() ? strLastFolder :
-                            strDefaultFolder.isEmpty() ? vboxGlobal().homeFolder() : strDefaultFolder;
+                            strDefaultFolder.isEmpty() ? homeFolder() : strDefaultFolder;
 
     /* Prepare filters and backends: */
@@ -2537 +2563 @@
     {
         /* Get iterated filter: */
-        QPair <QString, QString> item = filters.at(i);
+        QPair<QString, QString> item = filters.at(i);
         /* Create one backend filter string: */
         backends << QString("%1 (%2)").arg(item.first).arg(item.second);
@@ -2635 +2661 @@
 {
     /* Current attachment attributes: */
-    const CMediumAttachment comCurrentAttachment = comMachine.GetMediumAttachment(strControllerName, storageSlot.port, storageSlot.device);
+    const CMediumAttachment comCurrentAttachment = comMachine.GetMediumAttachment(strControllerName,
+                                                                                  storageSlot.port,
+                                                                                  storageSlot.device);
     const CMedium comCurrentMedium = comCurrentAttachment.GetMedium();
     const QString strCurrentID = comCurrentMedium.isNull() ? QString() : comCurrentMedium.GetId();
@@ -2647 +2675 @@
     AssertMsgReturnVoid(enmMediumType != UIMediumType_Invalid, ("Incorrect storage medium type!\n"));
 
-
     /* Prepare open-existing-medium action: */
-    QAction *pActionOpenExistingMedium = menu.addAction(UIIconPool::iconSet(":/select_file_16px.png"), QString(), pListener, pszSlotName);
-    pActionOpenExistingMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, comCurrentAttachment.GetPort(), comCurrentAttachment.GetDevice(),
-                                                                          enmMediumType)));
-    pActionOpenExistingMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Choose disk image...", "This is used for hard disks, optical media and floppies"));
+    QAction *pActionOpenExistingMedium = menu.addAction(UIIconPool::iconSet(":/select_file_16px.png"),
+                                                        QString(), pListener, pszSlotName);
+    pActionOpenExistingMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, comCurrentAttachment.GetPort(),
+                                                                          comCurrentAttachment.GetDevice(), enmMediumType)));
+    pActionOpenExistingMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Choose disk image...",
+                                                               "This is used for hard disks, optical media and floppies"));
 
     /* Prepare ad-hoc-viso action for DVD-ROMs: */
     if (enmMediumType == UIMediumType_DVD)
     {
-        QAction *pActionAdHocViso = menu.addAction(UIIconPool::iconSet(":/select_file_16px.png"), QString(),
-                                                   pListener, pszSlotName);
+        QAction *pActionAdHocViso = menu.addAction(UIIconPool::iconSet(":/select_file_16px.png"),
+                                                   QString(), pListener, pszSlotName);
         pActionAdHocViso->setData(QVariant::fromValue(UIMediumTarget(strControllerName, comCurrentAttachment.GetPort(),
                                                                      comCurrentAttachment.GetDevice(), enmMediumType,
                                                                      UIMediumTarget::UIMediumTargetType_CreateAdHocVISO)));
-        pActionAdHocViso->setText(QApplication::translate("UIMachineSettingsStorage", "Create ad hoc VISO...", "This is used for optical media"));
+        pActionAdHocViso->setText(QApplication::translate("UIMachineSettingsStorage", "Create ad hoc VISO...",
+                                                          "This is used for optical media"));
     }
 
     /* Insert separator: */
     menu.addSeparator();
-
 
     /* Get existing-host-drive vector: */
@@ -2700 +2729 @@
             pActionChooseHostDrive->setCheckable(true);
             pActionChooseHostDrive->setChecked(!comCurrentMedium.isNull() && comMedium.GetId() == strCurrentID);
-            pActionChooseHostDrive->setData(QVariant::fromValue(UIMediumTarget(strControllerName, comCurrentAttachment.GetPort(), comCurrentAttachment.GetDevice(),
-                                                                               enmMediumType, UIMediumTarget::UIMediumTargetType_WithID, comMedium.GetId())));
-        }
-    }
-
+            pActionChooseHostDrive->setData(QVariant::fromValue(UIMediumTarget(strControllerName,
+                                                                               comCurrentAttachment.GetPort(),
+                                                                               comCurrentAttachment.GetDevice(),
+                                                                               enmMediumType,
+                                                                               UIMediumTarget::UIMediumTargetType_WithID,
+                                                                               comMedium.GetId())));
+        }
+    }
 
     /* Get recent-medium list: */
@@ -2746 +2778 @@
         if (!fIsRecentMediumUsed)
         {
-            QAction *pActionChooseRecentMedium = menu.addAction(QFileInfo(strRecentMediumLocation).fileName(), pListener, pszSlotName);
+            QAction *pActionChooseRecentMedium = menu.addAction(QFileInfo(strRecentMediumLocation).fileName(),
+                                                                pListener, pszSlotName);
             pActionChooseRecentMedium->setCheckable(true);
             pActionChooseRecentMedium->setChecked(!comCurrentMedium.isNull() && strRecentMediumLocation == strCurrentLocation);
-            pActionChooseRecentMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, comCurrentAttachment.GetPort(), comCurrentAttachment.GetDevice(),
-                                                                                  enmMediumType, UIMediumTarget::UIMediumTargetType_WithLocation, strRecentMediumLocation)));
+            pActionChooseRecentMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName,
+                                                                                  comCurrentAttachment.GetPort(),
+                                                                                  comCurrentAttachment.GetDevice(),
+                                                                                  enmMediumType,
+                                                                                  UIMediumTarget::UIMediumTargetType_WithLocation,
+                                                                                  strRecentMediumLocation)));
             pActionChooseRecentMedium->setToolTip(strRecentMediumLocation);
         }
     }
-
 
     /* Last action for optical/floppy attachments only: */
@@ -2765 +2801 @@
         QAction *pActionUnmountMedium = menu.addAction(QString(), pListener, pszSlotName);
         pActionUnmountMedium->setEnabled(!comCurrentMedium.isNull());
-        pActionUnmountMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, comCurrentAttachment.GetPort(), comCurrentAttachment.GetDevice())));
+        pActionUnmountMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, comCurrentAttachment.GetPort(),
+                                                                         comCurrentAttachment.GetDevice())));
         pActionUnmountMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
         if (enmMediumType == UIMediumType_DVD)
@@ -2816 +2853 @@
                 const QString strMachineFolder(QFileInfo(comConstMachine.GetSettingsFilePath()).absolutePath());
                 const QString strMediumID = target.type != UIMediumTarget::UIMediumTargetType_CreateAdHocVISO
-                                          ? vboxGlobal().openMediumWithFileOpenDialog(target.mediumType,
-                                                                                      windowManager().mainWindowShown(),
-                                                                                      strMachineFolder)
-                                          : vboxGlobal().createVisoMediumWithFileOpenDialog(windowManager().mainWindowShown(),
-                                                                                            strMachineFolder);
+                                          ? openMediumWithFileOpenDialog(target.mediumType,
+                                                                         windowManager().mainWindowShown(),
+                                                                         strMachineFolder)
+                                          : createVisoMediumWithFileOpenDialog(windowManager().mainWindowShown(),
+                                                                               strMachineFolder);
                 /* Return focus back: */
                 if (pLastFocusedWidget)
@@ -2838 +2875 @@
 
             /* Prepare target medium: */
-            const UIMedium guiMedium = vboxGlobal().medium(strNewID);
+            const UIMedium guiMedium = medium(strNewID);
             comMedium = guiMedium.medium();
             strActualID = fMount ? strNewID : strCurrentID;
@@ -2847 +2884 @@
         {
             /* Open medium by location and get new medium ID if any: */
-            const QString strNewID = vboxGlobal().openMedium(target.mediumType, target.data);
+            const QString strNewID = openMedium(target.mediumType, target.data);
             /* Else just exit: */
             if (strNewID.isEmpty())
@@ -2856 +2893 @@
 
             /* Prepare target medium: */
-            const UIMedium guiMedium = fMount ? vboxGlobal().medium(strNewID) : UIMedium();
+            const UIMedium guiMedium = fMount ? medium(strNewID) : UIMedium();
             comMedium = fMount ? guiMedium.medium() : CMedium();
             strActualID = fMount ? strNewID : strCurrentID;
@@ -2920 +2957 @@
         {
             /* Ask for force remounting: */
-            if (msgCenter().cannotRemountMedium(comMachine, vboxGlobal().medium(strActualID),
+            if (msgCenter().cannotRemountMedium(comMachine, medium(strActualID),
                                                 fMount, true /* retry? */))
             {
@@ -2927 +2964 @@
                 fWasMounted = comMachine.isOk();
                 if (!fWasMounted)
-                    msgCenter().cannotRemountMedium(comMachine, vboxGlobal().medium(strActualID),
+                    msgCenter().cannotRemountMedium(comMachine, medium(strActualID),
                                                     fMount, false /* retry? */);
             }
@@ -2964 +3001 @@
 
         /* Search for corresponding UI medium again: */
-
         guiMedium = medium(strMediumID);
         if (guiMedium.isNull())
@@ -3007 +3043 @@
 #endif /* RT_OS_LINUX */
 
-QString VBoxGlobal::details (const CUSBDevice &comDevice) const
+/* static */
+QString VBoxGlobal::details(const CUSBDevice &comDevice)
 {
     QString strDetails;
@@ -3026 +3063 @@
         {
             strDetails =
-                tr ("Unknown device %1:%2", "USB device details")
-                    .arg (QString().sprintf ("%04hX", comDevice.GetVendorId()))
-                    .arg (QString().sprintf ("%04hX", comDevice.GetProductId()));
+                tr("Unknown device %1:%2", "USB device details")
+                   .arg(QString().sprintf("%04hX", comDevice.GetVendorId()))
+                   .arg(QString().sprintf("%04hX", comDevice.GetProductId()));
         }
         else
         {
-            if (strProduct.toUpper().startsWith (strManufacturer.toUpper()))
+            if (strProduct.toUpper().startsWith(strManufacturer.toUpper()))
                 strDetails = strProduct;
             else
@@ -3039 +3076 @@
         ushort iRev = comDevice.GetRevision();
         if (iRev != 0)
-            strDetails += QString().sprintf (" [%04hX]", iRev);
+            strDetails += QString().sprintf(" [%04hX]", iRev);
     }
 
@@ -3045 +3082 @@
 }
 
-QString VBoxGlobal::toolTip (const CUSBDevice &comDevice) const
+/* static */
+QString VBoxGlobal::toolTip(const CUSBDevice &comDevice)
 {
     QString strTip =
-        tr ("<nobr>Vendor ID: %1</nobr><br>"
-            "<nobr>Product ID: %2</nobr><br>"
-            "<nobr>Revision: %3</nobr>", "USB device tooltip")
-            .arg (QString().sprintf ("%04hX", comDevice.GetVendorId()))
-            .arg (QString().sprintf ("%04hX", comDevice.GetProductId()))
-            .arg (QString().sprintf ("%04hX", comDevice.GetRevision()));
-
-    QString strSerial = comDevice.GetSerialNumber();
+        tr("<nobr>Vendor ID: %1</nobr><br>"
+           "<nobr>Product ID: %2</nobr><br>"
+           "<nobr>Revision: %3</nobr>", "USB device tooltip")
+           .arg(QString().sprintf("%04hX", comDevice.GetVendorId()))
+           .arg(QString().sprintf("%04hX", comDevice.GetProductId()))
+           .arg(QString().sprintf("%04hX", comDevice.GetRevision()));
+
+    const QString strSerial = comDevice.GetSerialNumber();
     if (!strSerial.isEmpty())
-        strTip += QString (tr ("<br><nobr>Serial No. %1</nobr>", "USB device tooltip"))
-                               .arg (strSerial);
-
-    /* add the state field if it's a host USB device */
-    CHostUSBDevice hostDev (comDevice);
+        strTip += QString(tr("<br><nobr>Serial No. %1</nobr>", "USB device tooltip"))
+                             .arg(strSerial);
+
+    /* Add the state field if it's a host USB device: */
+    CHostUSBDevice hostDev(comDevice);
     if (!hostDev.isNull())
     {
-        strTip += QString (tr ("<br><nobr>State: %1</nobr>", "USB device tooltip"))
-                               .arg (gpConverter->toString (hostDev.GetState()));
+        strTip += QString(tr("<br><nobr>State: %1</nobr>", "USB device tooltip"))
+                             .arg(gpConverter->toString(hostDev.GetState()));
     }
 
@@ -3071 +3109 @@
 }
 
-QString VBoxGlobal::toolTip (const CUSBDeviceFilter &comFilter) const
+/* static */
+QString VBoxGlobal::toolTip(const CUSBDeviceFilter &comFilter)
 {
     QString strTip;
 
-    QString strVendorId = comFilter.GetVendorId();
+    const QString strVendorId = comFilter.GetVendorId();
     if (!strVendorId.isEmpty())
-        strTip += tr ("<nobr>Vendor ID: %1</nobr>", "USB filter tooltip")
-                      .arg (strVendorId);
-
-    QString strProductId = comFilter.GetProductId();
+        strTip += tr("<nobr>Vendor ID: %1</nobr>", "USB filter tooltip")
+                     .arg(strVendorId);
+
+    const QString strProductId = comFilter.GetProductId();
     if (!strProductId.isEmpty())
-        strTip += strTip.isEmpty() ? "":"<br/>" + tr ("<nobr>Product ID: %2</nobr>", "USB filter tooltip")
-                                                      .arg (strProductId);
-
-    QString strRevision = comFilter.GetRevision();
+        strTip += strTip.isEmpty() ? "":"<br/>" + tr("<nobr>Product ID: %2</nobr>", "USB filter tooltip")
+                                                     .arg(strProductId);
+
+    const QString strRevision = comFilter.GetRevision();
     if (!strRevision.isEmpty())
-        strTip += strTip.isEmpty() ? "":"<br/>" + tr ("<nobr>Revision: %3</nobr>", "USB filter tooltip")
-                                                      .arg (strRevision);
-
-    QString strProduct = comFilter.GetProduct();
+        strTip += strTip.isEmpty() ? "":"<br/>" + tr("<nobr>Revision: %3</nobr>", "USB filter tooltip")
+                                                     .arg(strRevision);
+
+    const QString strProduct = comFilter.GetProduct();
     if (!strProduct.isEmpty())
-        strTip += strTip.isEmpty() ? "":"<br/>" + tr ("<nobr>Product: %4</nobr>", "USB filter tooltip")
-                                                      .arg (strProduct);
-
-    QString strManufacturer = comFilter.GetManufacturer();
+        strTip += strTip.isEmpty() ? "":"<br/>" + tr("<nobr>Product: %4</nobr>", "USB filter tooltip")
+                                                     .arg(strProduct);
+
+    const QString strManufacturer = comFilter.GetManufacturer();
     if (!strManufacturer.isEmpty())
-        strTip += strTip.isEmpty() ? "":"<br/>" + tr ("<nobr>Manufacturer: %5</nobr>", "USB filter tooltip")
-                                                      .arg (strManufacturer);
-
-    QString strSerial = comFilter.GetSerialNumber();
+        strTip += strTip.isEmpty() ? "":"<br/>" + tr("<nobr>Manufacturer: %5</nobr>", "USB filter tooltip")
+                                                     .arg(strManufacturer);
+
+    const QString strSerial = comFilter.GetSerialNumber();
     if (!strSerial.isEmpty())
-        strTip += strTip.isEmpty() ? "":"<br/>" + tr ("<nobr>Serial No.: %1</nobr>", "USB filter tooltip")
-                                                      .arg (strSerial);
-
-    QString strPort = comFilter.GetPort();
+        strTip += strTip.isEmpty() ? "":"<br/>" + tr("<nobr>Serial No.: %1</nobr>", "USB filter tooltip")
+                                                     .arg(strSerial);
+
+    const QString strPort = comFilter.GetPort();
     if (!strPort.isEmpty())
-        strTip += strTip.isEmpty() ? "":"<br/>" + tr ("<nobr>Port: %1</nobr>", "USB filter tooltip")
-                                                      .arg (strPort);
-
-    /* add the state field if it's a host USB device */
-    CHostUSBDevice hostDev (comFilter);
+        strTip += strTip.isEmpty() ? "":"<br/>" + tr("<nobr>Port: %1</nobr>", "USB filter tooltip")
+                                                     .arg(strPort);
+
+    /* Add the state field if it's a host USB device: */
+    CHostUSBDevice hostDev(comFilter);
     if (!hostDev.isNull())
     {
-        strTip += strTip.isEmpty() ? "":"<br/>" + tr ("<nobr>State: %1</nobr>", "USB filter tooltip")
-                                                      .arg (gpConverter->toString (hostDev.GetState()));
+        strTip += strTip.isEmpty() ? "":"<br/>" + tr("<nobr>State: %1</nobr>", "USB filter tooltip")
+                                                     .arg(gpConverter->toString(hostDev.GetState()));
     }
 
@@ -3121 +3160 @@
 }
 
-QString VBoxGlobal::toolTip(const CHostVideoInputDevice &comWebcam) const
+/* static */
+QString VBoxGlobal::toolTip(const CHostVideoInputDevice &comWebcam)
 {
     QStringList records;
@@ -3138 +3178 @@
 /* static */
 void VBoxGlobal::doExtPackInstallation(QString const &strFilePath, QString const &strDigest,
-                                       QWidget *pParent, QString *pstrExtPackName)
+                                       QWidget *pParent, QString *pstrExtPackName) const
 {
     /* Open the extpack tarball via IExtPackManager: */
-    CExtPackManager comManager = vboxGlobal().virtualBox().GetExtensionPackManager();
+    CExtPackManager comManager = virtualBox().GetExtensionPackManager();
     CExtPackFile comExtPackFile;
     if (strDigest.isEmpty())
@@ -3238 +3278 @@
     bool fSupported = false;
 #endif
-    unconst(this)->m_i3DAvailable = fSupported;
+    m_i3DAvailable = fSupported;
     return fSupported;
 }
@@ -3298 +3338 @@
     }
     /* Translate value into megabytes with rounding to highest side: */
-    quint64 uNeedMBytes = uNeedBits % (8 * _1M) ? uNeedBits / (8 * _1M) + 1 :
-                          uNeedBits / (8 * _1M) /* convert to megabytes */;
+    quint64 uNeedMBytes = uNeedBits % (8 * _1M)
+                        ? uNeedBits / (8 * _1M) + 1
+                        : uNeedBits / (8 * _1M) /* convert to megabytes */;
 
     if (strGuestOSTypeId.startsWith("Windows"))
     {
-       /* Windows guests need offscreen VRAM too for graphics acceleration features: */
+        /* Windows guests need offscreen VRAM too for graphics acceleration features: */
 #ifdef VBOX_WITH_CRHGSMI
-       if (isWddmCompatibleOsType(strGuestOSTypeId))
-       {
-           /* WDDM mode, there are two surfaces for each screen: shadow & primary: */
-           uNeedMBytes *= 3;
-       }
-       else
+        if (isWddmCompatibleOsType(strGuestOSTypeId))
+        {
+            /* WDDM mode, there are two surfaces for each screen: shadow & primary: */
+            uNeedMBytes *= 3;
+        }
+        else
 #endif /* VBOX_WITH_CRHGSMI */
-       {
-           uNeedMBytes *= 2;
-       }
+        {
+            uNeedMBytes *= 2;
+        }
     }
 
@@ -3393 +3434 @@
 
 /* static */
-QPixmap VBoxGlobal::joinPixmaps (const QPixmap &pixmap1, const QPixmap &pixmap2)
+QPixmap VBoxGlobal::joinPixmaps(const QPixmap &pixmap1, const QPixmap &pixmap2)
 {
     if (pixmap1.isNull())
@@ -3400 +3441 @@
         return pixmap1;
 
-    QPixmap result (pixmap1.width() + pixmap2.width() + 2,
-                    qMax (pixmap1.height(), pixmap2.height()));
-    result.fill (Qt::transparent);
-
-    QPainter painter (&result);
-    painter.drawPixmap (0, 0, pixmap1);
-    painter.drawPixmap (pixmap1.width() + 2, result.height() - pixmap2.height(), pixmap2);
+    QPixmap result(pixmap1.width() + pixmap2.width() + 2,
+                   qMax(pixmap1.height(), pixmap2.height()));
+    result.fill(Qt::transparent);
+
+    QPainter painter(&result);
+    painter.drawPixmap(0, 0, pixmap1);
+    painter.drawPixmap(pixmap1.width() + 2, result.height() - pixmap2.height(), pixmap2);
     painter.end();
 
@@ -3412 +3453 @@
 }
 
-bool VBoxGlobal::openURL (const QString &strUrl)
+bool VBoxGlobal::openURL(const QString &strUrl) const
 {
     /** Service event. */
     class ServiceEvent : public QEvent
     {
-        public:
-
-            /** Constructs service event on th basis of passed @a fResult. */
-            ServiceEvent (bool fResult) : QEvent (QEvent::User), m_fResult (fResult) {}
-
-            /** Returns the result which event brings. */
-            bool result() const { return m_fResult; }
-
-        private:
-
-            /** Holds the result which event brings. */
-            bool m_fResult;
+    public:
+
+        /** Constructs service event on th basis of passed @a fResult. */
+        ServiceEvent(bool fResult)
+            : QEvent(QEvent::User)
+            , m_fResult(fResult)
+        {}
+
+        /** Returns the result which event brings. */
+        bool result() const { return m_fResult; }
+
+    private:
+
+        /** Holds the result which event brings. */
+        bool m_fResult;
     };
 
@@ -3434 +3478 @@
     class ServiceClient : public QEventLoop
     {
-        public:
-
-            /** Constructs service client on the basis of passed @a fResult. */
-            ServiceClient() : m_fResult (false) {}
-
-            /** Returns the result which event brings. */
-            bool result() const { return m_fResult; }
-
-        private:
-
-            /** Handles any Qt @a pEvent. */
-            bool event (QEvent *pEvent)
+    public:
+
+        /** Constructs service client on the basis of passed @a fResult. */
+        ServiceClient()
+            : m_fResult(false)
+        {}
+
+        /** Returns the result which event brings. */
+        bool result() const { return m_fResult; }
+
+    private:
+
+        /** Handles any Qt @a pEvent. */
+        bool event(QEvent *pEvent)
+        {
+            /* Handle service event: */
+            if (pEvent->type() == QEvent::User)
             {
-                /* Handle service event: */
-                if (pEvent->type() == QEvent::User)
-                {
-                    ServiceEvent *pServiceEvent = static_cast <ServiceEvent*> (pEvent);
-                    m_fResult = pServiceEvent->result();
-                    pServiceEvent->accept();
-                    quit();
-                    return true;
-                }
-                return false;
+                ServiceEvent *pServiceEvent = static_cast<ServiceEvent*>(pEvent);
+                m_fResult = pServiceEvent->result();
+                pServiceEvent->accept();
+                quit();
+                return true;
             }
-
-            bool m_fResult;
+            return false;
+        }
+
+        bool m_fResult;
     };
 
@@ -3465 +3511 @@
     class ServiceServer : public QThread
     {
-        public:
-
-            /** Constructs service server on the basis of passed @a client and @a strUrl. */
-            ServiceServer (ServiceClient &client, const QString &strUrl)
-                : m_client (client), m_strUrl (strUrl) {}
-
-        private:
-
-            /** Executes thread task. */
-            void run()
-            {
-                QApplication::postEvent (&m_client, new ServiceEvent (QDesktopServices::openUrl (m_strUrl)));
-            }
-
-            /** Holds the client reference. */
-            ServiceClient &m_client;
-            /** Holds the URL to be processed. */
-            const QString &m_strUrl;
+    public:
+
+        /** Constructs service server on the basis of passed @a client and @a strUrl. */
+        ServiceServer(ServiceClient &client, const QString &strUrl)
+            : m_client(client), m_strUrl(strUrl) {}
+
+    private:
+
+        /** Executes thread task. */
+        void run()
+        {
+            QApplication::postEvent(&m_client, new ServiceEvent(QDesktopServices::openUrl(m_strUrl)));
+        }
+
+        /** Holds the client reference. */
+        ServiceClient &m_client;
+        /** Holds the URL to be processed. */
+        const QString &m_strUrl;
     };
 
-    /* Create/start client & server: */
+    /* Create client & server: */
     ServiceClient client;
-    ServiceServer server (client, strUrl);
+    ServiceServer server(client, strUrl);
     server.start();
     client.exec();
@@ -3496 +3542 @@
 
     if (!fResult)
-        msgCenter().cannotOpenURL (strUrl);
+        msgCenter().cannotOpenURL(strUrl);
 
     return fResult;
@@ -3509 +3555 @@
 }
 
-bool VBoxGlobal::eventFilter (QObject *pObject, QEvent *pEvent)
+bool VBoxGlobal::eventFilter(QObject *pObject, QEvent *pEvent)
 {
     /** @todo Just use the QIWithRetranslateUI3 template wrapper. */
 
-    if (pEvent->type() == QEvent::LanguageChange &&
-        pObject->isWidgetType() &&
-        static_cast <QWidget *> (pObject)->isTopLevel())
+    if (   pEvent->type() == QEvent::LanguageChange
+        && pObject->isWidgetType()
+        && static_cast<QWidget*>(pObject)->isTopLevel())
     {
         /* Catch the language change event before any other widget gets it in
@@ -3530 +3576 @@
 
     /* Call to base-class: */
-    return QObject::eventFilter (pObject, pEvent);
+    return QObject::eventFilter(pObject, pEvent);
 }
 
 void VBoxGlobal::retranslateUi()
 {
-    m_strUserDefinedPortName = tr ("User-defined", "serial port");
-
-    m_pixWarning = UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_MessageBoxWarning).pixmap (16, 16);
-    Assert (!m_pixWarning.isNull());
-
-    m_pixError = UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_MessageBoxCritical).pixmap (16, 16);
-    Assert (!m_pixError.isNull());
+    s_strUserDefinedPortName = tr("User-defined", "serial port");
+
+    m_pixWarning = UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_MessageBoxWarning).pixmap(16, 16);
+    Assert(!m_pixWarning.isNull());
+
+    m_pixError = UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_MessageBoxCritical).pixmap(16, 16);
+    Assert(!m_pixError.isNull());
 
     /* Re-enumerate uimedium since they contain some translations too: */
@@ -3552 +3598 @@
     // we keep a table of them, which must be updated when the language is changed.
     UINativeHotKey::retranslateKeyNames();
-#endif /* VBOX_WS_X11 */
+#endif
 }
 
@@ -3586 +3632 @@
 
     HRESULT rc = COMBase::InitializeCOM(true);
-    if (FAILED (rc))
+    if (FAILED(rc))
     {
 #ifdef VBOX_WITH_XPCOM
@@ -3644 +3690 @@
     QString sLanguageId = gEDataManager->languageId();
     if (!sLanguageId.isNull())
-        loadLanguage (sLanguageId);
+        loadLanguage(sLanguageId);
 
     retranslateUi();
@@ -3651 +3697 @@
             this, &VBoxGlobal::sltGUILanguageChange);
 
-    qApp->installEventFilter (this);
+    qApp->installEventFilter(this);
 
     /* process command line */
@@ -3673 +3719 @@
     initDebuggerVar(&m_fDbgAutoShow, "VBOX_GUI_DBG_AUTO_SHOW", GUI_Dbg_AutoShow, false);
     m_fDbgAutoShowCommandLine = m_fDbgAutoShowStatistics = m_fDbgAutoShow;
-    m_enmLaunchRunning = LaunchRunning_Default;
 #endif
 
@@ -3691 +3736 @@
          * options to start a VM in main.cpp and hardenedmain.cpp exactly,
          * otherwise there will be weird error messages. */
-        if (   !::strcmp (arg, "--startvm")
-            || !::strcmp (arg, "-startvm"))
+        if (   !::strcmp(arg, "--startvm")
+            || !::strcmp(arg, "-startvm"))
         {
             if (++i < argc)
@@ -3700 +3745 @@
             }
         }
-        else if (!::strcmp (arg, "-separate") || !::strcmp (arg, "--separate"))
+        else if (!::strcmp(arg, "-separate") || !::strcmp(arg, "--separate"))
         {
             fSeparateProcess = true;
@@ -3721 +3766 @@
             visualStateType = UIVisualStateType_Scale;
         /* Passwords: */
-        else if (!::strcmp (arg, "--settingspw"))
+        else if (!::strcmp(arg, "--settingspw"))
         {
             if (++i < argc)
@@ -3729 +3774 @@
             }
         }
-        else if (!::strcmp (arg, "--settingspwfile"))
+        else if (!::strcmp(arg, "--settingspwfile"))
         {
             if (++i < argc)
@@ -3765 +3810 @@
         }
         /* Misc options: */
-        else if (!::strcmp (arg, "-comment") || !::strcmp (arg, "--comment"))
+        else if (!::strcmp(arg, "-comment") || !::strcmp(arg, "--comment"))
             ++i;
         else if (!::strcmp(arg, "--no-startvm-errormsgbox"))
@@ -3806 +3851 @@
 #ifdef VBOX_WITH_DEBUGGER_GUI
         /* Debugger/Debugging options: */
-        else if (!::strcmp(arg, "-dbg") || !::strcmp (arg, "--dbg"))
+        else if (!::strcmp(arg, "-dbg") || !::strcmp(arg, "--dbg"))
             setDebuggerVar(&m_fDbgEnabled, true);
-        else if (!::strcmp( arg, "-debug") || !::strcmp (arg, "--debug"))
+        else if (!::strcmp( arg, "-debug") || !::strcmp(arg, "--debug"))
         {
             setDebuggerVar(&m_fDbgEnabled, true);

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

@@ -61 +61 @@
 class SHARED_LIBRARY_STUFF VBoxGlobal : public QObject
 {
-    Q_OBJECT
+    Q_OBJECT;
 
 signals:
@@ -144 +144 @@
      * @{ */
         /** Returns whether VBoxGlobal cleanup is in progress. */
-        bool isCleaningUp() { return s_fCleaningUp; }
+        static bool isCleaningUp() { return s_fCleaningUp; }
 
         /** Returns Qt runtime version string. */
@@ -156 +156 @@
 
         /** Returns whether VBoxGlobal instance is properly initialized. */
-        bool isValid() { return m_fValid; }
+        bool isValid() const { return m_fValid; }
 
         /** Returns VBox version string. */
@@ -170 +170 @@
         /** Mac OS X: Returns #MacOSXRelease determined during VBoxGlobal prepare routine. */
         MacOSXRelease osRelease() const { return m_enmMacOSVersion; }
-#endif /* VBOX_WS_MAC */
+#endif
 
 #ifdef VBOX_WS_X11
@@ -177 +177 @@
         /** X11: Returns the type of the Window Manager we are running under. */
         X11WMType typeOfWindowManager() const { return m_enmWindowManagerType; }
-#endif /* VBOX_WS_X11 */
+#endif
 
         /** Returns whether branding is active. */
-        bool brandingIsActive (bool fForce = false);
+        bool brandingIsActive(bool fForce = false);
         /** Returns value for certain branding @a strKey from custom.ini file. */
-        QString brandingGetKey (QString strKey);
+        QString brandingGetKey(QString strKey);
     /** @} */
 
@@ -229 +229 @@
         bool isSupervisorCodeExecedRecompiled() const { return m_fRecompileSupervisor; }
         /** Returns the --recompile-user option value. */
-        bool isUserCodeExecedRecompiled()       const { return m_fRecompileUser; }
+        bool isUserCodeExecedRecompiled() const { return m_fRecompileUser; }
         /** Returns the --execute-all-in-iem option value. */
-        bool areWeToExecuteAllInIem()           const { return m_fExecuteAllInIem; }
+        bool areWeToExecuteAllInIem() const { return m_fExecuteAllInIem; }
         /** Returns whether --warp-factor option value is equal to 100. */
         bool isDefaultWarpPct() const { return m_uWarpPct == 100; }
         /** Returns the --warp-factor option value. */
-        uint32_t getWarpPct()       const { return m_uWarpPct; }
+        uint32_t getWarpPct() const { return m_uWarpPct; }
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -249 +249 @@
         /** VBoxDbg module handle. */
         RTLDRMOD getDebuggerModule() const { return m_hVBoxDbg; }
-#endif /* VBOX_WITH_DEBUGGER_GUI */
+#endif
 
         /** Returns whether VM should start paused. */
@@ -265 +265 @@
      * @{ */
         /** Native language name of the currently installed translation. */
-        QString languageName() const;
+        static QString languageName();
         /** Native language country name of the currently installed translation. */
-        QString languageCountry() const;
+        static QString languageCountry();
         /** Language name of the currently installed translation, in English. */
-        QString languageNameEnglish() const;
+        static QString languageNameEnglish();
         /** Language country name of the currently installed translation, in English. */
-        QString languageCountryEnglish() const;
+        static QString languageCountryEnglish();
         /** Comma-separated list of authors of the currently installed translation. */
-        QString languageTranslators() const;
+        static QString languageTranslators();
 
         /** Returns VBox language sub-directory. */
@@ -294 +294 @@
           * @param  strLangId  Brings the language ID in in form of xx_YY.
           *                    QString() means the system default language. */
-        static void loadLanguage (const QString &strLangId = QString());
+        static void loadLanguage(const QString &strLangId = QString());
 
         /** Returns tr("%n year(s)"). */
@@ -314 +314 @@
         static QString sizeRegexp();
         /** Parses the given size strText and returns the size value in bytes. */
-        static quint64 parseSize (const QString &strText);
+        static quint64 parseSize(const QString &strText);
         /** Formats the given @a uSize value in bytes to a human readable string.
           * @param  uSize     Brings the size value in bytes.
           * @param  enmMode   Brings the conversion mode.
           * @param  cDecimal  Brings the number of decimal digits in result. */
-        static QString formatSize (quint64 uSize, uint cDecimal = 2, FormatSize enmMode = FormatSize_Round);
+        static QString formatSize(quint64 uSize, uint cDecimal = 2, FormatSize enmMode = FormatSize_Round);
 
         /** Returns full medium-format name for the given @a strBaseMediumFormatName. */
@@ -325 +325 @@
 
         /** Returns the list of the standard COM port names (i.e. "COMx"). */
-        QStringList COMPortNames() const;
+        static QStringList COMPortNames();
         /** Returns the name of the standard COM port corresponding to the given parameters,
           * or "User-defined" (which is also returned when both @a uIRQ and @a uIOBase are 0). */
-        QString toCOMPortName (ulong uIRQ, ulong uIOBase) const;
+        static QString toCOMPortName(ulong uIRQ, ulong uIOBase);
         /** Returns port parameters corresponding to the given standard COM name.
           * Returns @c true on success, or @c false if the given port name is not one of the standard names (i.e. "COMx"). */
-        bool toCOMPortNumbers (const QString &strName, ulong &uIRQ, ulong &uIOBase) const;
+        static bool toCOMPortNumbers(const QString &strName, ulong &uIRQ, ulong &uIOBase);
         /** Returns the list of the standard LPT port names (i.e. "LPTx"). */
-        QStringList LPTPortNames() const;
+        static QStringList LPTPortNames();
         /** Returns the name of the standard LPT port corresponding to the given parameters,
           * or "User-defined" (which is also returned when both @a uIRQ and @a uIOBase are 0). */
-        QString toLPTPortName (ulong uIRQ, ulong uIOBase) const;
+        static QString toLPTPortName(ulong uIRQ, ulong uIOBase);
         /** Returns port parameters corresponding to the given standard LPT name.
           * Returns @c true on success, or @c false if the given port name is not one of the standard names (i.e. "LPTx"). */
-        bool toLPTPortNumbers (const QString &strName, ulong &uIRQ, ulong &uIOBase) const;
+        static bool toLPTPortNumbers(const QString &strName, ulong &uIRQ, ulong &uIOBase);
 
         /** Reformats the input @a strText to highlight it. */
-        static QString highlight (const QString &strText, bool fToolTip = false);
+        static QString highlight(QString strText, bool fToolTip = false);
         /** Reformats the input @a strText to emphasize it. */
-        static QString emphasize (const QString &strText);
+        static QString emphasize(QString strText);
         /** Removes the first occurrence of the accelerator mark (the ampersand symbol) from the given @a strText. */
-        static QString removeAccelMark (const QString &strText);
+        static QString removeAccelMark(QString strText);
         /** Inserts a passed @a strKey into action @a strText. */
         static QString insertKeyToActionText (const QString &strText, const QString &strKey);
@@ -354 +354 @@
      * @{ */
         /** Returns full help file name. */
-        QString helpFile() const;
+        static QString helpFile();
 
         /** Returns documents path. */
@@ -363 +363 @@
      * @{ */
         /** Search position for @a rectangle to make sure it is fully contained @a boundRegion. */
-        static QRect normalizeGeometry (const QRect &rectangle, const QRegion &boundRegion,
-                                        bool fCanResize = true);
+        static QRect normalizeGeometry(const QRect &rectangle, const QRegion &boundRegion,
+                                       bool fCanResize = true);
         /** Ensures that the given rectangle @a rectangle is fully contained within the region @a boundRegion. */
-        static QRect getNormalized (const QRect &rectangle, const QRegion &boundRegion,
-                                    bool fCanResize = true);
+        static QRect getNormalized(const QRect &rectangle, const QRegion &boundRegion,
+                                   bool fCanResize = true);
         /** Returns the flipped (transposed) @a region. */
-        static QRegion flip (const QRegion &region);
+        static QRegion flip(const QRegion &region);
 
         /** Aligns the center of @a pWidget with the center of @a pRelative. */
-        static void centerWidget (QWidget *pWidget, QWidget *pRelative,
-                                  bool fCanResize = true);
+        static void centerWidget(QWidget *pWidget, QWidget *pRelative, bool fCanResize = true);
 
         /** Assigns top-level @a pWidget geometry passed as QRect coordinates.
@@ -383 +382 @@
 
         /** Activates the specified window with given @a wId. Can @a fSwitchDesktop if requested. */
-        static bool activateWindow (WId wId, bool fSwitchDesktop = true);
+        static bool activateWindow(WId wId, bool fSwitchDesktop = true);
 
 #ifdef VBOX_WS_X11
@@ -434 +433 @@
         /** Returns the list of few guest OS types, queried from
           * IVirtualBox corresponding to every family id. */
-        QList <CGuestOSType> vmGuestOSFamilyList() const;
+        QList<CGuestOSType> vmGuestOSFamilyList() const;
         /** Returns the list of all guest OS types, queried from
           * IVirtualBox corresponding to passed family id. */
-        QList <CGuestOSType> vmGuestOSTypeList (const QString &strFamilyId) const;
+        QList<CGuestOSType> vmGuestOSTypeList(const QString &strFamilyId) const;
 
         /** Returns the guest OS type object corresponding to the given type id of list
           * containing OS types related to OS family determined by family id attribute.
           * If the index is invalid a null object is returned. */
-        CGuestOSType vmGuestOSType (const QString &strTypeId,
-                                    const QString &strFamilyId = QString()) const;
+        CGuestOSType vmGuestOSType(const QString &strTypeId, const QString &strFamilyId = QString()) const;
         /** Returns the description corresponding to the given guest OS type id. */
-        QString vmGuestOSTypeDescription (const QString &strTypeId) const;
+        QString vmGuestOSTypeDescription(const QString &strTypeId) const;
 
         /** Returns whether guest type with passed @a strOSTypeId is one of DOS types. */
-        static bool isDOSType (const QString &strOSTypeId);
+        static bool isDOSType(const QString &strOSTypeId);
     /** @} */
 
@@ -454 +452 @@
      * @{ */
         /** Switches to certain @a comMachine. */
-        bool switchToMachine(CMachine &comMachine);
+        static bool switchToMachine(CMachine &comMachine);
         /** Launches certain @a comMachine in specified @a enmLaunchMode. */
         bool launchMachine(CMachine &comMachine, LaunchMode enmLaunchMode = LaunchMode_Default);
@@ -467 +465 @@
      * @{ */
         /** Returns medium formats which are currently supported by VirtualBox for the given @a enmDeviceType. */
-        static QList <QPair <QString, QString> > MediumBackends(KDeviceType enmDeviceType);
+        QList<QPair<QString, QString> > MediumBackends(KDeviceType enmDeviceType) const;
         /** Returns which hard disk formats are currently supported by VirtualBox. */
-        static QList <QPair <QString, QString> > HDDBackends();
+        QList<QPair<QString, QString> > HDDBackends() const;
         /** Returns which optical disk formats are currently supported by VirtualBox. */
-        static QList <QPair <QString, QString> > DVDBackends();
+        QList<QPair<QString, QString> > DVDBackends() const;
         /** Returns which floppy disk formats are currently supported by VirtualBox. */
-        static QList <QPair <QString, QString> > FloppyBackends();
+        QList<QPair<QString, QString> > FloppyBackends() const;
 
         /** Starts medium enumeration. */
@@ -532 +530 @@
         /** Verifies that USB drivers are properly configured on Linux. */
         static void checkForWrongUSBMounted();
-#endif /* RT_OS_LINUX */
+#endif
 
         /** Generates details for passed USB @a comDevice. */
-        QString details(const CUSBDevice &comDevice) const;
+        static QString details(const CUSBDevice &comDevice);
         /** Generates tool-tip for passed USB @a comDevice. */
-        QString toolTip(const CUSBDevice &comDevice) const;
+        static QString toolTip(const CUSBDevice &comDevice);
         /** Generates tool-tip for passed USB @a comFilter. */
-        QString toolTip(const CUSBDeviceFilter &comFilter) const;
+        static QString toolTip(const CUSBDeviceFilter &comFilter);
         /** Generates tool-tip for passed USB @a comWebcam. */
-        QString toolTip(const CHostVideoInputDevice &comWebcam) const;
+        static QString toolTip(const CHostVideoInputDevice &comWebcam);
     /** @} */
 
@@ -551 +549 @@
           * @param  pParent          Brings the parent dialog reference.
           * @param  pstrExtPackName  Brings the extension pack name. */
-        static void doExtPackInstallation(QString const &strFilePath,
-                                          QString const &strDigest,
-                                          QWidget *pParent,
-                                          QString *pstrExtPackName);
+        void doExtPackInstallation(QString const &strFilePath,
+                                   QString const &strDigest,
+                                   QWidget *pParent,
+                                   QString *pstrExtPackName) const;
     /** @} */
 
@@ -567 +565 @@
         /** Returns whether guest OS type with passed @a strGuestOSTypeId is WDDM compatible. */
         static bool isWddmCompatibleOsType(const QString &strGuestOSTypeId);
-#endif /* VBOX_WITH_CRHGSMI */
+#endif
         /** Returns the required video memory in bytes for the current desktop
           * resolution at maximum possible screen depth in bpp. */
@@ -576 +574 @@
      * @{ */
         /** Returns the thread-pool instance. */
-        UIThreadPool* threadPool() const { return m_pThreadPool; }
+        UIThreadPool *threadPool() const { return m_pThreadPool; }
     /** @} */
 
@@ -608 +606 @@
 
         /** Joins two pixmaps horizontally with 2px space between them and returns the result. */
-        static QPixmap joinPixmaps (const QPixmap &pixmap1, const QPixmap &pixmap2);
+        static QPixmap joinPixmaps(const QPixmap &pixmap1, const QPixmap &pixmap2);
     /** @} */
 
@@ -616 +614 @@
      * @{ */
         /** Opens the specified URL using OS/Desktop capabilities. */
-        bool openURL (const QString &strURL);
+        bool openURL(const QString &strURL) const;
     /** @} */
 
@@ -628 +626 @@
 
     /** Preprocesses any Qt @a pEvent for passed @a pObject. */
-    bool eventFilter (QObject *pObject, QEvent *pEvent);
+    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
 
     /** Handles translation event. */
-    void retranslateUi();
+    virtual void retranslateUi() /* override */;
 
 protected slots:
@@ -705 +703 @@
      * @{ */
         /** Holds whether VBoxGlobal cleanup is in progress. */
-        static bool        s_fCleaningUp;
+        static bool  s_fCleaningUp;
 
         /** Holds the currently loaded language ID. */
-        static QString     s_strLoadedLanguageId;
+        static QString  s_strLoadedLanguageId;
+
+        /** Holds the tr("User Defined") port name. */
+        static QString  s_strUserDefinedPortName;
 
 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY
         /** Holds the UI type. */
-        UIType m_enmType;
+        UIType  m_enmType;
 #endif
 
         /** Holds whether VBoxGlobal instance is properly initialized. */
-        bool m_fValid;
+        bool  m_fValid;
 
 #ifdef VBOX_WS_MAC
         /** Mac OS X: Holds the #MacOSXRelease determined using <i>uname</i> call. */
-        MacOSXRelease m_enmMacOSVersion;
-#endif /* VBOX_WS_MAC */
+        MacOSXRelease  m_enmMacOSVersion;
+#endif
 
 #ifdef VBOX_WS_X11
         /** X11: Holds the #X11WMType of the Window Manager we are running under. */
-        X11WMType m_enmWindowManagerType;
+        X11WMType  m_enmWindowManagerType;
         /** X11: Holds whether the Window Manager we are running at is composition one. */
-        bool m_fCompositingManagerRunning;
-#endif /* VBOX_WS_X11 */
+        bool       m_fCompositingManagerRunning;
+#endif
 
         /** Holds the VBox branding config file path. */
-        QString m_strBrandingConfigFilePath;
+        QString  m_strBrandingConfigFilePath;
     /** @} */
 
@@ -737 +738 @@
      * @{ */
         /** Holds the URL arguments list. */
-        QList<QUrl> m_listArgUrls;
+        QList<QUrl>  m_listArgUrls;
 
         /** Holds the --startvm option value (managed VM id). */
-        QString m_strManagedVMId;
+        QString  m_strManagedVMId;
         /** Holds the --separate option value (whether GUI process is separate from VM process). */
-        bool m_fSeparateProcess;
+        bool     m_fSeparateProcess;
         /** Holds the --no-startvm-errormsgbox option value (whether startup VM errors are disabled). */
-        bool m_fShowStartVMErrors;
+        bool     m_fShowStartVMErrors;
 
         /** Holds the --aggressive-caching / --no-aggressive-caching option value (whether medium-enumeration is required). */
-        bool m_fAgressiveCaching;
+        bool  m_fAgressiveCaching;
 
         /** Holds the --restore-current option value. */
-        bool m_fRestoreCurrentSnapshot;
+        bool  m_fRestoreCurrentSnapshot;
 
         /** Holds the --fda option value (floppy image). */
-        QString m_strFloppyImage;
+        QString  m_strFloppyImage;
         /** Holds the --dvd | --cdrom option value (DVD image). */
-        QString m_strDvdImage;
+        QString  m_strDvdImage;
 
         /** Holds the --disable-patm option value. */
-        bool m_fDisablePatm;
+        bool      m_fDisablePatm;
         /** Holds the --disable-csam option value. */
-        bool m_fDisableCsam;
+        bool      m_fDisableCsam;
         /** Holds the --recompile-supervisor option value. */
-        bool m_fRecompileSupervisor;
+        bool      m_fRecompileSupervisor;
         /** Holds the --recompile-user option value. */
-        bool m_fRecompileUser;
+        bool      m_fRecompileUser;
         /** Holds the --execute-all-in-iem option value. */
-        bool m_fExecuteAllInIem;
+        bool      m_fExecuteAllInIem;
         /** Holds the --warp-factor option value. */
-        uint32_t m_uWarpPct;
+        uint32_t  m_uWarpPct;
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
         /** Holds whether the debugger should be accessible. */
-        mutable int m_fDbgEnabled;
+        mutable int  m_fDbgEnabled;
         /** Holds whether to show the debugger automatically with the console. */
-        mutable int m_fDbgAutoShow;
+        mutable int  m_fDbgAutoShow;
         /** Holds whether to show the command line window when m_fDbgAutoShow is set. */
-        mutable int m_fDbgAutoShowCommandLine;
+        mutable int  m_fDbgAutoShowCommandLine;
         /** Holds whether to show the statistics window when m_fDbgAutoShow is set. */
-        mutable int m_fDbgAutoShowStatistics;
+        mutable int  m_fDbgAutoShowStatistics;
         /** VBoxDbg module handle. */
-        RTLDRMOD m_hVBoxDbg;
+        RTLDRMOD     m_hVBoxDbg;
 
         /** Holds whether --start-running, --start-paused or nothing was given. */
-        enum LaunchRunning m_enmLaunchRunning;
+        enum LaunchRunning  m_enmLaunchRunning;
 #endif
 
         /** Holds the --settingspw option value. */
-        char m_astrSettingsPw[256];
+        char  m_astrSettingsPw[256];
         /** Holds the --settingspwfile option value. */
-        bool m_fSettingsPwSet;
+        bool  m_fSettingsPwSet;
 
 #ifdef VBOX_GUI_WITH_PIDFILE
@@ -795 +796 @@
         QString m_strPidFile;
 #endif
-
-        /** @todo remove */
-        QString m_strUserDefinedPortName;
     /** @} */
 
@@ -803 +801 @@
      * @{ */
         /** Holds the COM cleanup protection token. */
-        QReadWriteLock m_comCleanupProtectionToken;
+        QReadWriteLock  m_comCleanupProtectionToken;
 
         /** Holds the instance of VirtualBox client wrapper. */
-        CVirtualBoxClient m_comVBoxClient;
+        CVirtualBoxClient  m_comVBoxClient;
         /** Holds the copy of VirtualBox object wrapper. */
-        CVirtualBox m_comVBox;
+        CVirtualBox        m_comVBox;
         /** Holds the copy of VirtualBox host-object wrapper. */
-        CHost m_comHost;
+        CHost              m_comHost;
         /** Holds the symbolic VirtualBox home-folder representation. */
-        QString m_strHomeFolder;
+        QString            m_strHomeFolder;
 
         /** Holds whether acquired COM wrappers are currently valid. */
-        bool m_fWrappersValid;
+        bool  m_fWrappersValid;
         /** Holds whether VBoxSVC is currently available. */
-        bool m_fVBoxSVCAvailable;
+        bool  m_fVBoxSVCAvailable;
 
         /** Holds the guest OS family IDs. */
-        QList<QString> m_guestOSFamilyIDs;
+        QList<QString>               m_guestOSFamilyIDs;
         /** Holds the guest OS types for each family ID. */
-        QList<QList<CGuestOSType> > m_guestOSTypes;
+        QList<QList<CGuestOSType> >  m_guestOSTypes;
     /** @} */
 
@@ -828 +826 @@
      * @{ */
         /** Holds whether 3D is available. */
-        int m_i3DAvailable;
+        mutable int  m_i3DAvailable;
     /** @} */
 
@@ -843 +841 @@
 
         /** Holds the global file icon provider instance. */
-        QFileIconProvider m_fileIconProvider;
+        QFileIconProvider  m_fileIconProvider;
 
         /** Holds the warning pixmap. */
-        QPixmap m_pixWarning;
+        QPixmap  m_pixWarning;
         /** Holds the error pixmap. */
-        QPixmap m_pixError;
+        QPixmap  m_pixError;
     /** @} */
 
@@ -854 +852 @@
      * @{ */
         /** Holds the medium enumerator cleanup protection token. */
-        mutable QReadWriteLock m_meCleanupProtectionToken;
+        mutable QReadWriteLock  m_meCleanupProtectionToken;
 
         /** Holds the medium enumerator. */