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

Timestamp:

Mar 4, 2024 4:10:46 PM (9 months ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -79 +79 @@
     const QString strFamilyDesc = m_guestOSTypes.last().getFamilyDescription();
     const QString strSubtype = m_guestOSTypes.last().getSubtype();
-    QPair<QString, QString> family = QPair<QString, QString>(strFamilyId, strFamilyDesc);
-    if (!m_guestOSFamilies.contains(family))
-        m_guestOSFamilies << family;
+    UIFamilyInfo fi(strFamilyId, strFamilyDesc);
+    if (!m_guestOSFamilies.contains(fi))
+        m_guestOSFamilies << fi;
 
     /* Acquire arch type: */
@@ -106 +106 @@
     /* Otherwise we'll have to prepare list by arch type: */
     UIGuestOSTypeManager::UIGuestOSFamilyInfo families;
-    foreach (const UIGuestInfoPair &family, m_guestOSFamilies)
-    {
-        const KPlatformArchitecture enmCurrentArch = m_guestOSFamilyArch.value(family.first, KPlatformArchitecture_Max);
+    foreach (const UIFamilyInfo &fi, m_guestOSFamilies)
+    {
+        const KPlatformArchitecture enmCurrentArch = m_guestOSFamilyArch.value(fi.m_strId, KPlatformArchitecture_Max);
         if (   enmCurrentArch == enmArch
             || enmCurrentArch == KPlatformArchitecture_None)
-            families << family;
+            families << fi;
     }
     return families;

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

@@ -40 +40 @@
 #include "COMEnums.h"
 #include "CGuestOSType.h"
+
+/** Represents guest OS family info. */
+struct UIFamilyInfo
+{
+    /** Constructs empty family info. */
+    UIFamilyInfo()
+    {}
+
+    /** Constructs family info with predefined @a strId and @a strDescription. */
+    UIFamilyInfo(const QString &strId, const QString &strDescription)
+        : m_strId(strId)
+        , m_strDescription(strDescription)
+    {}
+
+    /** Returns whether this family info has the same id as @a other. */
+    bool operator==(const UIFamilyInfo &other) const
+    {
+        return m_strId == other.m_strId;
+    }
+
+    /** Holds family id. */
+    QString  m_strId;
+    /** Holds family description. */
+    QString  m_strDescription;
+};
 
 /** A wrapper around CGuestOSType. Some of the properties are cached here for performance. */
@@ -87 +112 @@
 };
 
-
 /** A wrapper and manager class for Guest OS types (IGuestOSType). Logically we structure os types into families
   *  e.g. Window, Linux etc. Some families have so-called subtypes which for Linux corresponds to distros, while some
@@ -99 +123 @@
     typedef QPair<QString, QString> UIGuestInfoPair;
     /** A list of all OS family pairs. */
-    typedef QVector<UIGuestInfoPair> UIGuestOSFamilyInfo;
+    typedef QVector<UIFamilyInfo> UIGuestOSFamilyInfo;
     /** A list of all OS type pairs. */
     typedef QVector<UIGuestInfoPair> UIGuestOSTypeInfo;

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

@@ -625 +625 @@
     for (int i = 0; i < families.size(); ++i)
     {
-        m_pComboFamily->addItem(families[i].second);
-        m_pComboFamily->setItemData(i, families[i].first);
+        const UIFamilyInfo fi = families.at(i);
+        m_pComboFamily->addItem(fi.m_strDescription);
+        m_pComboFamily->setItemData(i, fi.m_strId);
     }
 

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

@@ -112 +112 @@
     for (int i = 0; i < familyList.size(); ++i)
     {
-        const QPair<QString, QString> &familyInfo = familyList[i];
-        QMenu *pSubMenu = m_pMainMenu->addMenu(familyInfo.second);
-        QStringList subtypeList = uiCommon().guestOSTypeManager().getSubtypeListForFamilyId(familyInfo.first);
+        const UIFamilyInfo &fi = familyList.at(i);
+        QMenu *pSubMenu = m_pMainMenu->addMenu(fi.m_strDescription);
+        QStringList subtypeList = uiCommon().guestOSTypeManager().getSubtypeListForFamilyId(fi.m_strId);
 
         if (subtypeList.isEmpty())
-            createOSTypeMenu(uiCommon().guestOSTypeManager().getTypeListForFamilyId(familyInfo.first), pSubMenu);
+            createOSTypeMenu(uiCommon().guestOSTypeManager().getTypeListForFamilyId(fi.m_strId), pSubMenu);
         else
         {