Changeset 101315 in vbox

Timestamp:

Sep 29, 2023 10:39:08 AM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10523. Removing guest OS type related getters from UICommon.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (3 diffs)
• globals/UICommon.h (modified) (3 diffs)
• globals/UIDetailsGenerator.cpp (modified) (3 diffs)
• globals/UIGuestOSType.cpp (modified) (5 diffs)
• globals/UIGuestOSType.h (modified) (3 diffs)
• runtime/UISession.cpp (modified) (4 diffs)
• runtime/information/UIInformationRuntime.cpp (modified) (2 diffs)
• snapshots/UISnapshotDetailsWidget.cpp (modified) (2 diffs)
• widgets/UIApplianceEditorWidget.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (1 diff)

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

@@ -814 +814 @@
     m_pThreadPoolCloud = 0;
 
-    /* Ensure CGuestOSType objects are no longer used: */
-    m_guestOSFamilyIDs.clear();
-    m_guestOSTypes.clear();
-
     /* Starting COM cleanup: */
     m_comCleanupProtectionToken.lockForWrite();
@@ -1127 +1123 @@
 
 #endif /* VBOX_GUI_WITH_PIDFILE */
-
-QString UICommon::vmGuestOSFamilyDescription(const QString &strFamilyId) const
-{
-    AssertMsg(m_guestOSFamilyDescriptions.contains(strFamilyId),
-              ("Family ID incorrect: '%s'.", strFamilyId.toLatin1().constData()));
-    return m_guestOSFamilyDescriptions.value(strFamilyId);
-}
-
-QList<CGuestOSType> UICommon::vmGuestOSTypeList(const QString &strFamilyId) const
-{
-    AssertMsg(m_guestOSFamilyIDs.contains(strFamilyId),
-              ("Family ID incorrect: '%s'.", strFamilyId.toLatin1().constData()));
-    return m_guestOSFamilyIDs.contains(strFamilyId) ?
-           m_guestOSTypes[m_guestOSFamilyIDs.indexOf(strFamilyId)] : QList<CGuestOSType>();
-}
-
-CGuestOSType UICommon::vmGuestOSType(const QString &strTypeId,
-                                     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.at(i);
-    }
-    for (int j = 0; j < list.size(); ++j)
-        if (!list.at(j).GetId().compare(strTypeId))
-            return list.at(j);
-    return CGuestOSType();
-}
-
-QString UICommon::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();
-}
-
-/* static */
-bool UICommon::isDOSType(const QString &strOSTypeId)
-{
-    if (   strOSTypeId.left(3) == "dos"
-        || strOSTypeId.left(3) == "win"
-        || strOSTypeId.left(3) == "os2")
-        return true;
-
-    return false;
-}
 
 /* static */
@@ -3007 +2946 @@
     m_strHomeFolder = virtualBox().GetHomeFolder();
 
-    /* Re-initialize guest OS Type list: */
-    m_guestOSFamilyIDs.clear();
-    m_guestOSTypes.clear();
-    const CGuestOSTypeVector guestOSTypes = m_comVBox.GetGuestOSTypes();
-    const int cGuestOSTypeCount = guestOSTypes.size();
-    AssertMsg(cGuestOSTypeCount > 0, ("Number of OS types must not be zero"));
-    if (cGuestOSTypeCount > 0)
-    {
-        /* Here we ASSUME the 'Other' types are always the first,
-         * so we remember them and will append them to the list when finished.
-         * We do a two pass, first adding the specific types, then the two 'Other' types. */
-        for (int j = 0; j < 2; ++j)
-        {
-            int cMax = j == 0 ? cGuestOSTypeCount : RT_MIN(2, cGuestOSTypeCount);
-            for (int i = j == 0 ? 2 : 0; i < cMax; ++i)
-            {
-                const CGuestOSType os = guestOSTypes.at(i);
-                const QString strFamilyID = os.GetFamilyId();
-                const QString strFamilyDescription = os.GetFamilyDescription();
-                if (!m_guestOSFamilyIDs.contains(strFamilyID))
-                {
-                    m_guestOSFamilyIDs << strFamilyID;
-                    m_guestOSFamilyDescriptions[strFamilyID] = strFamilyDescription;
-                    m_guestOSTypes << QList<CGuestOSType>();
-                }
-                m_guestOSTypes[m_guestOSFamilyIDs.indexOf(strFamilyID)].append(os);
-            }
-        }
-    }
+    /* Re-initialize guest OS Type database: */
     if (m_pGuestOSTypeManager)
-        m_pGuestOSTypeManager->reCacheGuestOSTypes(guestOSTypes);
+        m_pGuestOSTypeManager->reCacheGuestOSTypes(m_comVBox.GetGuestOSTypes());
     /* Mark wrappers valid: */
     m_fWrappersValid = true;

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

@@ -317 +317 @@
     /** @name COM: Guest OS Type stuff.
      * @{ */
-        /** Returns the list of family IDs. */
-        QList<QString> vmGuestOSFamilyIDs() const { return m_guestOSFamilyIDs; }
-
-        /** Returns a family description with passed @a strFamilyId. */
-        QString vmGuestOSFamilyDescription(const QString &strFamilyId) const;
-        /** Returns a list of all guest OS types with passed @a strFamilyId. */
-        QList<CGuestOSType> vmGuestOSTypeList(const QString &strFamilyId) const;
-
-        /** Returns the guest OS type for passed @a strTypeId.
-          * It is being serached through the list of family with passed @a strFamilyId if specified. */
-        CGuestOSType vmGuestOSType(const QString &strTypeId, const QString &strFamilyId = QString()) const;
-        /** Returns a type description with passed @a strTypeId. */
-        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);
+        const UIGuestOSTypeManager *guestOSTypeManager() const { return m_pGuestOSTypeManager; }
+        UIGuestOSTypeManager &guestOSTypeManager2() const { return *m_pGuestOSTypeManager; }
     /** @} */
 
@@ -529 +515 @@
         bool isExtentionPackInstalled() const;
     /** @} */
-
-    const UIGuestOSTypeManager *guestOSTypeManager() const { return m_pGuestOSTypeManager; }
 
 public slots:
@@ -749 +733 @@
         bool  m_fVBoxSVCAvailable;
 
-        /** Holds the guest OS family IDs. */
-        QList<QString>               m_guestOSFamilyIDs;
-        /** Holds the guest OS family descriptions. */
-        QMap<QString, QString>       m_guestOSFamilyDescriptions;
-        /** Holds the guest OS types for each family ID. */
-        QList<QList<CGuestOSType> >  m_guestOSTypes;
         UIGuestOSTypeManager *m_pGuestOSTypeManager;
     /** @} */

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

@@ -37 +37 @@
 #include "UIDetailsGenerator.h"
 #include "UIErrorString.h"
+#include "UIGuestOSType.h"
 #include "UIMedium.h"
 #include "UITranslator.h"
@@ -118 +119 @@
         const QString strAnchorType = QString("os_type");
         const QString strOsTypeId = comMachine.GetOSTypeId();
+        const UIGuestOSTypeManager *pManager = uiCommon().guestOSTypeManager();
+        QString strOsTypeDescription;
+        if (pManager)
+            strOsTypeDescription = pManager->getDescription(strOsTypeId);
         table << UITextTableLine(QApplication::translate("UIDetails", "Operating System", "details (general)"),
                                  QString("<a href=#%1,%2>%3</a>")
                                      .arg(strAnchorType,
                                           strOsTypeId,
-                                          uiCommon().vmGuestOSTypeDescription(strOsTypeId)));
+                                          strOsTypeDescription));
     }
 
@@ -1409 +1414 @@
     {
         /* Select slashes depending on the OS type: */
-        if (UICommon::isDOSType(comGuest.GetOSTypeId()))
+        if (UIGuestOSTypeManager::isDOSType(comGuest.GetOSTypeId()))
             strInfo += e_strTableRow2.arg(QString("<b>\\\\vboxsvr\\%1</b>").arg(it.key()), it.value());
         else

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

@@ -29 +29 @@
 #include "UIGuestOSType.h"
 
+/* COM includes: */
+#include "CGuestOSType.h"
 
 /*********************************************************************************************************************************
@@ -60 +62 @@
         LONG64                  getRecommendedHDD() const;
         KGraphicsControllerType getRecommendedGraphicsController() const;
+        KStorageControllerType  getRecommendedDVDStorageController() const;
     /** @} */
 
@@ -192 +195 @@
 }
 
+KStorageControllerType UIGuestOSTypeManager::getRecommendedDVDStorageController(const QString &strTypeId) const
+{
+    AssertReturn(m_guestOSTypes, KStorageControllerType_Null);
+    return m_guestOSTypes->value(m_typeIdIndexMap.value(strTypeId, -1)).getRecommendedDVDStorageController();
+}
+
 ULONG UIGuestOSTypeManager::getRecommendedRAM(const QString &strTypeId) const
 {
@@ -238 +247 @@
     AssertReturn(m_guestOSTypes, false);
     return m_guestOSTypes->value(m_typeIdIndexMap.value(strTypeId, -1)).getRecommendedFloppy();
+}
+
+bool UIGuestOSTypeManager::isLinux(const QString &strTypeId) const
+{
+    QString strFamilyId = getFamilyId(strTypeId);
+    if (strFamilyId.contains("linux", Qt::CaseInsensitive))
+        return true;
+    return false;
+}
+
+bool UIGuestOSTypeManager::isWindows(const QString &strTypeId) const
+{
+    QString strFamilyId = getFamilyId(strTypeId);
+    if (strFamilyId.contains("windows", Qt::CaseInsensitive))
+        return true;
+    return false;
+}
+
+/* static */
+bool UIGuestOSTypeManager::isDOSType(const QString &strOSTypeId)
+{
+    if (   strOSTypeId.left(3) == "dos"
+        || strOSTypeId.left(3) == "win"
+        || strOSTypeId.left(3) == "os2")
+        return true;
+
+    return false;
 }
 
@@ -348 +384 @@
     return KGraphicsControllerType_Null;
 }
+
+KStorageControllerType UIGuestOSType::getRecommendedDVDStorageController() const
+{
+    if (m_comGuestOSType.isOk())
+        return m_comGuestOSType.GetRecommendedDVDStorageController();
+    return KStorageControllerType_Null;
+}

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

@@ -42 +42 @@
 
 class UIGuestOSType;
-class UIFoo;
 
 /** A wrapper and manager class for Guest OS types (IGuestOSType). Logically we structure os types into families
@@ -73 +72 @@
     UIGuestOSTypeInfo              getTypeListForVariant(const QString &strVariant) const;
 
+    static bool isDOSType(const QString &strOSTypeId);
+
     /** @name Getters for UIGuestOSType properties. They utilize a map for faster access to UIGuestOSType instance with @p strTypeId
       * @{ */
@@ -86 +87 @@
         KStorageBus             getRecommendedDVDStorageBus(const QString &strTypeId) const;
         bool                    getRecommendedFloppy(const QString &strTypeId) const;
+        KStorageControllerType  getRecommendedDVDStorageController(const QString &strTypeId) const;
+        bool                    isLinux(const QString &strTypeId) const;
+        bool                    isWindows(const QString &strTypeId) const;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -40 +40 @@
 #include "UIFrameBuffer.h"
 #include "UIIconPool.h"
+#include "UIGuestOSType.h"
 #include "UIMachine.h"
 #include "UIMachineLogic.h"
@@ -840 +841 @@
     /* Get recommended controller bus & type: */
     CVirtualBox comVBox = uiCommon().virtualBox();
-    const CGuestOSType comOsType = comVBox.GetGuestOSType(osTypeId());
+
     if (!comVBox.isOk())
     {
@@ -846 +847 @@
         return false;
     }
-    const KStorageBus enmRecommendedDvdBus = comOsType.GetRecommendedDVDStorageBus();
-    if (!comOsType.isOk())
-    {
-        UINotificationMessage::cannotAcquireGuestOSTypeParameter(comOsType);
-        return false;
-    }
-    const KStorageControllerType enmRecommendedDvdType = comOsType.GetRecommendedDVDStorageController();
-    if (!comOsType.isOk())
-    {
-        UINotificationMessage::cannotAcquireGuestOSTypeParameter(comOsType);
-        return false;
-    }
+
+    const UIGuestOSTypeManager *pManager = uiCommon().guestOSTypeManager();
+    AssertReturn(pManager, false);
+
+    const KStorageBus enmRecommendedDvdBus = pManager->getRecommendedDVDStorageBus(osTypeId());
+    const KStorageControllerType enmRecommendedDvdType = pManager->getRecommendedDVDStorageController(osTypeId());
 
     /* Search for an attachment of required bus & type: */
@@ -1310 +1305 @@
 
     /* Auto GA update is currently for Windows and Linux guests only */
-    const CGuestOSType osType = uiCommon().vmGuestOSType(uimachine()->osTypeId());
-    if (!osType.isOk())
-        return false;
-
-    const QString strGuestFamily = osType.GetFamilyId();
-    bool fIsWindowOrLinux = strGuestFamily.contains("windows", Qt::CaseInsensitive) || strGuestFamily.contains("linux", Qt::CaseInsensitive);
+    const UIGuestOSTypeManager *pManager = uiCommon().guestOSTypeManager();
+    AssertReturn(pManager, false);
+
+    bool fIsWindowOrLinux = pManager->isLinux(uimachine()->osTypeId()) || pManager->isWindows(uimachine()->osTypeId());
 
     if (!fIsWindowOrLinux)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.cpp

@@ -41 +41 @@
 #include "UIIconPool.h"
 #include "UIInformationRuntime.h"
+#include "UIGuestOSType.h"
 #include "UIMachine.h"
 
@@ -350 +351 @@
         strOSType = m_strOSNotDetected;
     else
-        strOSType = uiCommon().vmGuestOSTypeDescription(strOSType);
+    {
+        const UIGuestOSTypeManager *pManager = uiCommon().guestOSTypeManager();
+        if (pManager)
+            strOSType = pManager->getDescription(strOSType);
+    }
    updateInfoRow(InfoRow_GuestOSType, QString("%1").arg(m_strGuestOSTypeLabel), strOSType);
 }

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

@@ -54 +54 @@
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIIconPool.h"
+#include "UIGuestOSType.h"
 #include "UISnapshotDetailsWidget.h"
 #include "UIMessageCenter.h"
@@ -1296 +1297 @@
             /* Operating System: */
             ++iRowCount;
-            strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIDetails", "Operating System", "details (general)"),
-                                                     empReport(uiCommon().vmGuestOSTypeDescription(comMachine.GetOSTypeId()),
-                                                               uiCommon().vmGuestOSTypeDescription(comMachineOld.GetOSTypeId())));
+            const UIGuestOSTypeManager *pManager = uiCommon().guestOSTypeManager();
+            if (pManager)
+                strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIDetails", "Operating System", "details (general)"),
+                                                         empReport(pManager->getDescription(comMachine.GetOSTypeId()),
+                                                                   pManager->getDescription(comMachineOld.GetOSTypeId())));
 
             /* Location of the settings file: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -41 +41 @@
 #include "QITreeView.h"
 #include "UICommon.h"
+#include "UIGuestOSType.h"
 #include "UIGuestOSTypeSelectionButton.h"
 #include "UIApplianceEditorWidget.h"
@@ -537 +538 @@
                         value = strTmp; break;
                     }
-                    case KVirtualSystemDescriptionType_OS:               value = uiCommon().vmGuestOSTypeDescription(m_strConfigValue); break;
+                    case KVirtualSystemDescriptionType_OS:
+                    {
+                        const UIGuestOSTypeManager *pManager = uiCommon().guestOSTypeManager();
+                        if (pManager)
+                            value = pManager->getDescription(m_strConfigValue);
+                        break;
+                    }
                     case KVirtualSystemDescriptionType_Memory:           value = m_strConfigValue + " " + UICommon::tr("MB", "size suffix MBytes=1024 KBytes"); break;
                     case KVirtualSystemDescriptionType_SoundCard:        value = gpConverter->toString(static_cast<KAudioControllerType>(m_strConfigValue.toInt())); break;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -550 +550 @@
     else if (!pWizard->detectedOSTypeId().isEmpty())
     {
-        QString strType = uiCommon().vmGuestOSTypeDescription(pWizard->detectedOSTypeId());
+        const UIGuestOSTypeManager *pManager = uiCommon().guestOSTypeManager();
+        QString strType;
+        if (pManager)
+            strType = pManager->getDescription(pWizard->detectedOSTypeId());
         if (!pWizard->isUnattendedInstallSupported())
             strMessage = UIWizardNewVM::tr("Detected OS type: %1. %2")