Changeset 103686 in vbox

Timestamp:

Mar 5, 2024 4:07:36 PM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10384: UIGuestOSType: Cache subtype info same way as family info.

Location:

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

Files:

• UIGuestOSType.cpp (modified) (3 diffs)
• UIGuestOSType.h (modified) (1 diff)

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

@@ -58 +58 @@
     m_guestOSTypes.clear();
     m_guestOSFamilies.clear();
+    m_guestOSSubtypes.clear();
     m_guestOSSubtypeArch.clear();
 
@@ -108 +109 @@
     }
 
+    /* Cache or update subtype info: */
+    if (!m_guestOSSubtypes.contains(strFamilyId))
+        m_guestOSSubtypes[strFamilyId] << strSubtype;
+    else
+    {
+        QStringList &subtypes = m_guestOSSubtypes[strFamilyId];
+        if (!subtypes.contains(strSubtype))
+            subtypes << strSubtype;
+    }
+
     /* Cache subtype arch type; That will be x86, ARM or None (for *any*): */
     if (!m_guestOSSubtypeArch.contains(strSubtype))
@@ -139 +150 @@
                                              KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
-    /* Prepare list by arch type: */
+    /* Return all subtypes by default: */
+    if (enmArch == KPlatformArchitecture_None)
+        return m_guestOSSubtypes.value(strFamilyId);
+
+    /* Otherwise we'll have to prepare list by arch type: */
     QStringList subtypes;
-    foreach (const UIGuestOSType &type, m_guestOSTypes)
-    {
-        if (type.getFamilyId() != strFamilyId)
-            continue;
-        const QString strSubtype = type.getSubtype();
-        if (strSubtype.isEmpty() || subtypes.contains(strSubtype))
-            continue;
+    foreach (const QString &strSubtype, m_guestOSSubtypes.value(strFamilyId))
+    {
         const KPlatformArchitecture enmCurrentArch = m_guestOSSubtypeArch.value(strSubtype, KPlatformArchitecture_Max);
-        if (   enmCurrentArch == enmArch
-            || enmArch == KPlatformArchitecture_None
-            || enmCurrentArch == KPlatformArchitecture_None)
+        if (enmCurrentArch == enmArch || enmCurrentArch == KPlatformArchitecture_None)
             subtypes << strSubtype;
     }

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

@@ -200 +200 @@
       * is index to m_guestOSTypes list. */
     QMap<QString, int> m_typeIdIndexMap;
-    /** First item of the pair is family id and the 2nd is family description. */
+
+    /** Hold the list of guest OS family info. */
     UIGuestOSFamilyInfo m_guestOSFamilies;
+    /** Hold the list of guest OS subtype info. */
+    QMap<QString, QStringList> m_guestOSSubtypes;
 
     /** Caches arch types on per-subtype basis. */