Changeset 103688 in vbox

Timestamp:

Mar 5, 2024 6:10:09 PM (9 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10384: UIGuestOSType: Extend subtype info from simple QString to UISubtypeInfo struct accumulating all the required subtype information.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIGuestOSType.cpp (modified) (3 diffs)
• globals/UIGuestOSType.h (modified) (4 diffs)
• settings/editors/UINameAndSystemEditor.cpp (modified) (2 diffs)
• widgets/UIGuestOSTypeSelectionButton.cpp (modified) (2 diffs)

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

@@ -110 +110 @@
 
     /* Cache or update subtype info: */
+    UISubtypeInfo si(strSubtype);
     if (!m_guestOSSubtypes.contains(strFamilyId))
-        m_guestOSSubtypes[strFamilyId] << strSubtype;
+        m_guestOSSubtypes[strFamilyId] << si;
     else
     {
-        QStringList &subtypes = m_guestOSSubtypes[strFamilyId];
-        if (!subtypes.contains(strSubtype))
-            subtypes << strSubtype;
+        UIGuestOSSubtypeInfo &subtypes = m_guestOSSubtypes[strFamilyId];
+        if (!subtypes.contains(si))
+            subtypes << si;
     }
 
@@ -146 +147 @@
 }
 
-QStringList
+UIGuestOSTypeManager::UIGuestOSSubtypeInfo
 UIGuestOSTypeManager::getSubtypesForFamilyId(const QString &strFamilyId,
                                              KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
@@ -155 +156 @@
 
     /* Otherwise we'll have to prepare list by arch type: */
-    QStringList subtypes;
-    foreach (const QString &strSubtype, m_guestOSSubtypes.value(strFamilyId))
-    {
-        const KPlatformArchitecture enmCurrentArch = m_guestOSSubtypeArch.value(strSubtype, KPlatformArchitecture_Max);
+    UIGuestOSSubtypeInfo subtypes;
+    foreach (const UISubtypeInfo &subtype, m_guestOSSubtypes.value(strFamilyId))
+    {
+        const KPlatformArchitecture enmCurrentArch = m_guestOSSubtypeArch.value(subtype.m_strName, KPlatformArchitecture_Max);
         if (enmCurrentArch == enmArch || enmCurrentArch == KPlatformArchitecture_None)
-            subtypes << strSubtype;
+            subtypes << subtype;
     }
     return subtypes;

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

@@ -79 +79 @@
     /** Holds whether family is supported. */
     bool                   m_fSupported;
+};
+
+/** Represents guest OS subtype info. */
+struct UISubtypeInfo
+{
+    /** Constructs empty subtype info. */
+    UISubtypeInfo()
+    {}
+
+    /** Constructs subtype info.
+      * @param  strName  Brings the name. */
+    UISubtypeInfo(const QString &strName)
+        : m_strName(strName)
+    {}
+
+    /** Returns whether this subtype info has the same name as @a other. */
+    bool operator==(const UISubtypeInfo &other) const
+    {
+        return m_strName == other.m_strName;
+    }
+
+    /** Holds the name. */
+    QString  m_strName;
 };
 
@@ -139 +162 @@
     /** A list of all OS families. */
     typedef QVector<UIFamilyInfo> UIGuestOSFamilyInfo;
+    /** A list of all OS subtypes. */
+    typedef QVector<UISubtypeInfo> UIGuestOSSubtypeInfo;
     /** A list of all OS type pairs. */
     typedef QVector<UIGuestInfoPair> UIGuestOSTypeInfo;
@@ -154 +179 @@
                                     KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns the list of subtypes for @p strFamilyId. This may be an empty list. */
-    QStringList getSubtypesForFamilyId(const QString &strFamilyId,
-                                       KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
+    UIGuestOSSubtypeInfo getSubtypesForFamilyId(const QString &strFamilyId,
+                                                KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns a list of OS types for the @p strFamilyId. */
     UIGuestOSTypeInfo getTypesForFamilyId(const QString &strFamilyId,
@@ -204 +229 @@
     UIGuestOSFamilyInfo m_guestOSFamilies;
     /** Hold the list of guest OS subtype info. */
-    QMap<QString, QStringList> m_guestOSSubtypes;
+    QMap<QString, UIGuestOSSubtypeInfo> m_guestOSSubtypes;
 
     /** Caches arch types on per-subtype basis. */

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -652 +652 @@
 
     /* Acquire a list of suitable sub-types: */
-    const QStringList distributions = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(m_strFamilyId, enmArch);
+    const UIGuestOSTypeManager::UIGuestOSSubtypeInfo distributions
+        = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(m_strFamilyId, enmArch);
     m_pLabelDistribution->setEnabled(!distributions.isEmpty());
     m_pComboDistribution->setEnabled(!distributions.isEmpty());
@@ -661 +662 @@
 
     /* Populate distribution combo: */
-    m_pComboDistribution->addItems(distributions);
+    foreach (const UISubtypeInfo &distribution, distributions)
+        m_pComboDistribution->addItem(distribution.m_strName);
 
     /* Unblock signals finally: */

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

@@ -114 +114 @@
         const UIFamilyInfo &fi = familyies.at(i);
         QMenu *pSubMenu = m_pMainMenu->addMenu(fi.m_strDescription);
-        const QStringList distributions = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(fi.m_strId);
+        const UIGuestOSTypeManager::UIGuestOSSubtypeInfo distributions = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(fi.m_strId);
 
         if (distributions.isEmpty())
@@ -120 +120 @@
         else
         {
-            foreach (const QString &strDistribution, distributions)
-                createOSTypeMenu(uiCommon().guestOSTypeManager().getTypesForSubtype(strDistribution),
-                                 pSubMenu->addMenu(strDistribution));
+            foreach (const UISubtypeInfo &distribution, distributions)
+                createOSTypeMenu(uiCommon().guestOSTypeManager().getTypesForSubtype(distribution.m_strName),
+                                 pSubMenu->addMenu(distribution.m_strName));
         }
     }