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

Timestamp:

Mar 5, 2024 6:57:38 PM (9 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10384: UIGuestOSType: Cache platform type directly inside UISubtypeInfo struct.

Location:

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

Files:

• UIGuestOSType.cpp (modified) (4 diffs)
• UIGuestOSType.h (modified) (3 diffs)

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

@@ -59 +59 @@
     m_guestOSFamilies.clear();
     m_guestOSSubtypes.clear();
-    m_guestOSSubtypeArch.clear();
 
     /* Enumerate guest OS types: */
@@ -110 +109 @@
 
     /* Cache or update subtype info: */
-    UISubtypeInfo si(strSubtype);
+    UISubtypeInfo si(strSubtype, enmArch);
     if (!m_guestOSSubtypes.contains(strFamilyId))
         m_guestOSSubtypes[strFamilyId] << si;
@@ -118 +117 @@
         if (!subtypes.contains(si))
             subtypes << si;
-    }
-
-    /* Cache subtype arch type; That will be x86, ARM or None (for *any*): */
-    if (!m_guestOSSubtypeArch.contains(strSubtype))
-        m_guestOSSubtypeArch[strSubtype] = enmArch;
-    else if (m_guestOSSubtypeArch.value(strSubtype) != enmArch)
-        m_guestOSSubtypeArch[strSubtype] = KPlatformArchitecture_None;
+        else
+        {
+            const int iIndex = subtypes.indexOf(si);
+            AssertReturnVoid(iIndex >= 0);
+            if (subtypes.at(iIndex).m_enmArch != enmArch)
+                subtypes[iIndex].m_enmArch = KPlatformArchitecture_None; // means any
+        }
+    }
 }
 
@@ -157 +157 @@
     /* Otherwise we'll have to prepare list by arch type: */
     UIGuestOSSubtypeInfo subtypes;
-    foreach (const UISubtypeInfo &subtype, m_guestOSSubtypes.value(strFamilyId))
-    {
-        const KPlatformArchitecture enmCurrentArch = m_guestOSSubtypeArch.value(subtype.m_strName, KPlatformArchitecture_Max);
+    foreach (const UISubtypeInfo &si, m_guestOSSubtypes.value(strFamilyId))
+    {
+        const KPlatformArchitecture enmCurrentArch = si.m_enmArch;
         if (enmCurrentArch == enmArch || enmCurrentArch == KPlatformArchitecture_None)
-            subtypes << subtype;
+            subtypes << si;
     }
     return subtypes;

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

@@ -86 +86 @@
     /** Constructs empty subtype info. */
     UISubtypeInfo()
+        : m_enmArch(KPlatformArchitecture_None)
     {}
 
     /** Constructs subtype info.
-      * @param  strName  Brings the name. */
-    UISubtypeInfo(const QString &strName)
+      * @param  strName  Brings the name.
+      * @param  enmArch  Brings the architecture type. */
+    UISubtypeInfo(const QString &strName,
+                  KPlatformArchitecture enmArch)
         : m_strName(strName)
+        , m_enmArch(enmArch)
     {}
 
@@ -101 +105 @@
 
     /** Holds the name. */
-    QString  m_strName;
+    QString                m_strName;
+    /** Holds the architecture. */
+    KPlatformArchitecture  m_enmArch;
 };
 
@@ -230 +236 @@
     /** Hold the list of guest OS subtype info. */
     QMap<QString, UIGuestOSSubtypeInfo> m_guestOSSubtypes;
-
-    /** Caches arch types on per-subtype basis. */
-    QMap<QString, KPlatformArchitecture>  m_guestOSSubtypeArch;
 };