Changeset 103673 in vbox

Timestamp:

Mar 4, 2024 4:52:41 PM (13 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162033

Message:

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

Location:

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

Files:

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

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

@@ -51 +51 @@
     m_guestOSTypes.clear();
     m_guestOSFamilies.clear();
-    m_guestOSFamilyArch.clear();
     m_guestOSSubtypeArch.clear();
 
@@ -74 +73 @@
 void UIGuestOSTypeManager::addGuestOSType(const CGuestOSType &comType)
 {
+    /* Append guest OS type to a list of cached wrappers: */
     m_guestOSTypes.append(UIGuestOSType(comType));
     m_typeIdIndexMap[m_guestOSTypes.last().getId()] = m_guestOSTypes.size() - 1;
+
+    /* Acquire a bit of attributes: */
     const QString strFamilyId = m_guestOSTypes.last().getFamilyId();
     const QString strFamilyDesc = m_guestOSTypes.last().getFamilyDescription();
     const QString strSubtype = m_guestOSTypes.last().getSubtype();
-    UIFamilyInfo fi(strFamilyId, strFamilyDesc);
+    const KPlatformArchitecture enmArch = m_guestOSTypes.last().getPlatformArchitecture();
+
+    /* Cache or update family info: */
+    UIFamilyInfo fi(strFamilyId, strFamilyDesc, enmArch);
     if (!m_guestOSFamilies.contains(fi))
         m_guestOSFamilies << fi;
-
-    /* Acquire arch type: */
-    const KPlatformArchitecture enmArch = m_guestOSTypes.last().getPlatformArchitecture();
-    /* Cache family arch type; That will be x86, ARM or None (for *any*): */
-    if (!m_guestOSFamilyArch.contains(strFamilyId))
-        m_guestOSFamilyArch[strFamilyId] = enmArch;
-    else if (m_guestOSFamilyArch.value(strFamilyId) != enmArch)
-        m_guestOSFamilyArch[strFamilyId] = KPlatformArchitecture_None;
+    else
+    {
+        const int iIndex = m_guestOSFamilies.indexOf(fi);
+        AssertReturnVoid(iIndex >= 0);
+        if (m_guestOSFamilies.at(iIndex).m_enmArch != enmArch)
+            m_guestOSFamilies[iIndex].m_enmArch = KPlatformArchitecture_None; // means any
+    }
+
     /* Cache subtype arch type; That will be x86, ARM or None (for *any*): */
     if (!m_guestOSSubtypeArch.contains(strSubtype))
@@ -108 +113 @@
     foreach (const UIFamilyInfo &fi, m_guestOSFamilies)
     {
-        const KPlatformArchitecture enmCurrentArch = m_guestOSFamilyArch.value(fi.m_strId, KPlatformArchitecture_Max);
+        const KPlatformArchitecture enmCurrentArch = fi.m_enmArch;
         if (   enmCurrentArch == enmArch
             || enmCurrentArch == KPlatformArchitecture_None)

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

@@ -46 +46 @@
     /** Constructs empty family info. */
     UIFamilyInfo()
+        : m_enmArch(KPlatformArchitecture_None)
     {}
 
-    /** Constructs family info with predefined @a strId and @a strDescription. */
-    UIFamilyInfo(const QString &strId, const QString &strDescription)
+    /** Constructs family info.
+      * @param  strId           Brings the family ID.
+      * @param  strDescription  Brings the family description.
+      * @param  enmArch         Brings the family architecture. */
+    UIFamilyInfo(const QString &strId,
+                 const QString &strDescription,
+                 KPlatformArchitecture enmArch)
         : m_strId(strId)
         , m_strDescription(strDescription)
+        , m_enmArch(enmArch)
     {}
 
@@ -61 +68 @@
 
     /** Holds family id. */
-    QString  m_strId;
+    QString                m_strId;
     /** Holds family description. */
-    QString  m_strDescription;
+    QString                m_strDescription;
+    /** Holds family architecture. */
+    KPlatformArchitecture  m_enmArch;
 };
 
@@ -184 +193 @@
     UIGuestOSFamilyInfo m_guestOSFamilies;
 
-    /** Caches arch types on per-family basis. */
-    QMap<QString, KPlatformArchitecture>  m_guestOSFamilyArch;
     /** Caches arch types on per-subtype basis. */
     QMap<QString, KPlatformArchitecture>  m_guestOSSubtypeArch;