Changeset 41613 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 7, 2012 2:07:55 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: VBoxGlobal stuff: Move some local stuff out of VBoxGlobal.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• net/UIUpdateManager.cpp (modified) (3 diffs)

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

@@ -57 +57 @@
 #include "QIMessageBox.h"
 #include "QIDialogButtonBox.h"
-#include "QIProcess.h"
 #include "UIIconPool.h"
 #include "UIActionPoolSelector.h"
@@ -1877 +1876 @@
 
     return QString (sTableTpl). arg (report);
-}
-
-QString VBoxGlobal::platformInfo()
-{
-    QString platform;
-
-#if defined (Q_OS_WIN)
-    platform = "win";
-#elif defined (Q_OS_LINUX)
-    platform = "linux";
-#elif defined (Q_OS_MACX)
-    platform = "macosx";
-#elif defined (Q_OS_OS2)
-    platform = "os2";
-#elif defined (Q_OS_FREEBSD)
-    platform = "freebsd";
-#elif defined (Q_OS_SOLARIS)
-    platform = "solaris";
-#else
-    platform = "unknown";
-#endif
-
-    /* The format is <system>.<bitness> */
-    platform += QString (".%1").arg (ARCH_BITS);
-
-    /* Add more system information */
-#if defined (Q_OS_WIN)
-    OSVERSIONINFO versionInfo;
-    ZeroMemory (&versionInfo, sizeof (OSVERSIONINFO));
-    versionInfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
-    GetVersionEx (&versionInfo);
-    int major = versionInfo.dwMajorVersion;
-    int minor = versionInfo.dwMinorVersion;
-    int build = versionInfo.dwBuildNumber;
-    QString sp = QString::fromUtf16 ((ushort*)versionInfo.szCSDVersion);
-
-    QString distrib;
-    if (major == 6)
-        distrib = QString ("Windows Vista %1");
-    else if (major == 5)
-    {
-        if (minor == 2)
-            distrib = QString ("Windows Server 2003 %1");
-        else if (minor == 1)
-            distrib = QString ("Windows XP %1");
-        else if (minor == 0)
-            distrib = QString ("Windows 2000 %1");
-        else
-            distrib = QString ("Unknown %1");
-    }
-    else if (major == 4)
-    {
-        if (minor == 90)
-            distrib = QString ("Windows Me %1");
-        else if (minor == 10)
-            distrib = QString ("Windows 98 %1");
-        else if (minor == 0)
-            distrib = QString ("Windows 95 %1");
-        else
-            distrib = QString ("Unknown %1");
-    }
-    else /** @todo Windows Server 2008 == vista? Probably not... */
-        distrib = QString ("Unknown %1");
-    distrib = distrib.arg (sp);
-    QString version = QString ("%1.%2").arg (major).arg (minor);
-    QString kernel = QString ("%1").arg (build);
-    platform += QString (" [Distribution: %1 | Version: %2 | Build: %3]")
-        .arg (distrib).arg (version).arg (kernel);
-#elif defined (Q_OS_LINUX)
-    /* Get script path: */
-    char szAppPrivPath[RTPATH_MAX];
-    int rc = RTPathAppPrivateNoArch(szAppPrivPath, sizeof(szAppPrivPath)); NOREF(rc);
-    AssertRC(rc);
-    /* Run script: */
-    QByteArray result = QIProcess::singleShot(QString(szAppPrivPath) + "/VBoxSysInfo.sh");
-    if (!result.isNull())
-        platform += QString(" [%1]").arg(QString(result).trimmed());
-#else
-    /* Use RTSystemQueryOSInfo. */
-    char szTmp[256];
-    QStringList components;
-    int vrc = RTSystemQueryOSInfo (RTSYSOSINFO_PRODUCT, szTmp, sizeof (szTmp));
-    if ((RT_SUCCESS (vrc) || vrc == VERR_BUFFER_OVERFLOW) && szTmp[0] != '\0')
-        components << QString ("Product: %1").arg (szTmp);
-    vrc = RTSystemQueryOSInfo (RTSYSOSINFO_RELEASE, szTmp, sizeof (szTmp));
-    if ((RT_SUCCESS (vrc) || vrc == VERR_BUFFER_OVERFLOW) && szTmp[0] != '\0')
-        components << QString ("Release: %1").arg (szTmp);
-    vrc = RTSystemQueryOSInfo (RTSYSOSINFO_VERSION, szTmp, sizeof (szTmp));
-    if ((RT_SUCCESS (vrc) || vrc == VERR_BUFFER_OVERFLOW) && szTmp[0] != '\0')
-        components << QString ("Version: %1").arg (szTmp);
-    vrc = RTSystemQueryOSInfo (RTSYSOSINFO_SERVICE_PACK, szTmp, sizeof (szTmp));
-    if ((RT_SUCCESS (vrc) || vrc == VERR_BUFFER_OVERFLOW) && szTmp[0] != '\0')
-        components << QString ("SP: %1").arg (szTmp);
-    if (!components.isEmpty())
-        platform += QString (" [%1]").arg (components.join (" | "));
-#endif
-
-    return platform;
 }
 

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

@@ -256 +256 @@
     QString detailsReport (const CMachine &aMachine, bool aWithLinks);
 
-    QString platformInfo();
-
     /* VirtualBox helpers */
 

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -36 +36 @@
 #include "UIGlobalSettingsExtension.h"
 #include "VBoxDefs.h"
+#include "QIProcess.h"
 
 /* COM includes: */
 #include "CExtPack.h"
 #include "CExtPackManager.h"
+
+/* Other VBox includes: */
+#include <iprt/path.h>
 
 /* Forward declarations: */
@@ -189 +193 @@
         url.addQueryItem("count", QString::number(cCount));
         url.addQueryItem("branch", VBoxUpdateData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate)).branchName());
-        QString strUserAgent(QString("VirtualBox %1 <%2>").arg(vboxGlobal().virtualBox().GetVersion()).arg(vboxGlobal().platformInfo()));
+        QString strUserAgent(QString("VirtualBox %1 <%2>").arg(vboxGlobal().virtualBox().GetVersion()).arg(platformInfo()));
 
         /* Send GET request: */
@@ -237 +241 @@
         /* Notify about step completion: */
         emit sigStepComplete();
+    }
+
+    /* Platform information getter: */
+    static QString platformInfo()
+    {
+        /* Prepare platform report: */
+        QString strPlatform;
+
+#if defined (Q_OS_WIN)
+        strPlatform = "win";
+#elif defined (Q_OS_LINUX)
+        strPlatform = "linux";
+#elif defined (Q_OS_MACX)
+        strPlatform = "macosx";
+#elif defined (Q_OS_OS2)
+        strPlatform = "os2";
+#elif defined (Q_OS_FREEBSD)
+        strPlatform = "freebsd";
+#elif defined (Q_OS_SOLARIS)
+        strPlatform = "solaris";
+#else
+        strPlatform = "unknown";
+#endif
+
+        /* The format is <system>.<bitness>: */
+        strPlatform += QString(".%1").arg(ARCH_BITS);
+
+        /* Add more system information: */
+#if defined (Q_OS_WIN)
+        OSVERSIONINFO versionInfo;
+        ZeroMemory(&versionInfo, sizeof(OSVERSIONINFO));
+        versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+        GetVersionEx(&versionInfo);
+        int iMajor = versionInfo.dwMajorVersion;
+        int iMinor = versionInfo.dwMinorVersion;
+        int iBuild = versionInfo.dwBuildNumber;
+        QString strVersionInfo = QString::fromUtf16((ushort*)versionInfo.szCSDVersion);
+
+        QString strDistributiveInfo;
+        if (iMajor == 6)
+            strDistributiveInfo = QString("Windows Vista %1");
+        else if (iMajor == 5)
+        {
+            if (iMinor == 2)
+                strDistributiveInfo = QString("Windows Server 2003 %1");
+            else if (iMinor == 1)
+                strDistributiveInfo = QString("Windows XP %1");
+            else if (iMinor == 0)
+                strDistributiveInfo = QString("Windows 2000 %1");
+            else
+                strDistributiveInfo = QString("Unknown %1");
+        }
+        else if (iMajor == 4)
+        {
+            if (iMinor == 90)
+                strDistributiveInfo = QString("Windows Me %1");
+            else if (iMinor == 10)
+                strDistributiveInfo = QString("Windows 98 %1");
+            else if (iMinor == 0)
+                strDistributiveInfo = QString("Windows 95 %1");
+            else
+                strDistributiveInfo = QString("Unknown %1");
+        }
+        else strDistributiveInfo = QString("Unknown %1");
+        // TODO: Windows Server 2008 == Vista? */
+        strDistributiveInfo = strDistributiveInfo.arg(strVersionInfo);
+        QString strVersion = QString("%1.%2").arg(iMajor).arg(iMinor);
+        QString strKernel = QString("%1").arg(iBuild);
+        strPlatform += QString(" [Distribution: %1 | Version: %2 | Build: %3]")
+            .arg(strDistributiveInfo).arg(strVersion).arg(strKernel);
+#elif defined (Q_OS_LINUX)
+        /* Get script path: */
+        char szAppPrivPath[RTPATH_MAX];
+        int rc = RTPathAppPrivateNoArch(szAppPrivPath, sizeof(szAppPrivPath)); NOREF(rc);
+        AssertRC(rc);
+        /* Run script: */
+        QByteArray result = QIProcess::singleShot(QString(szAppPrivPath) + "/VBoxSysInfo.sh");
+        if (!result.isNull())
+            strPlatform += QString(" [%1]").arg(QString(result).trimmed());
+#else
+        /* Use RTSystemQueryOSInfo: */
+        char szTmp[256];
+        QStringList components;
+        int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
+        if ((RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) && szTmp[0] != '\0')
+            components << QString("Product: %1").arg(szTmp);
+        vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szTmp, sizeof(szTmp));
+        if ((RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) && szTmp[0] != '\0')
+            components << QString("Release: %1").arg(szTmp);
+        vrc = RTSystemQueryOSInfo(RTSYSOSINFO_VERSION, szTmp, sizeof(szTmp));
+        if ((RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) && szTmp[0] != '\0')
+            components << QString("Version: %1").arg(szTmp);
+        vrc = RTSystemQueryOSInfo(RTSYSOSINFO_SERVICE_PACK, szTmp, sizeof(szTmp));
+        if ((RT_SUCCESS (vrc) || vrc == VERR_BUFFER_OVERFLOW) && szTmp[0] != '\0')
+            components << QString("SP: %1").arg(szTmp);
+        if (!components.isEmpty())
+            strPlatform += QString(" [%1]").arg(components.join(" | "));
+#endif
+
+        return strPlatform;
     }