Changeset 102152 in vbox

Timestamp:

Nov 20, 2023 2:58:48 PM (17 months ago)

Author:

vboxsync

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

160277

Message:

FE/Qt: bugref:10513: UIGuestOSType: A bit of refactoring; Rename UIGuestOSTypeFamilyInfo to UIGuestOSFamilyInfo; Introduce UIGuestInfoPair typedef for convenience.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIGuestOSType.cpp (modified) (1 diff)
• 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

@@ -68 +68 @@
 }
 
-const UIGuestOSTypeManager::UIGuestOSTypeFamilyInfo &UIGuestOSTypeManager::getFamilies() const
+const UIGuestOSTypeManager::UIGuestOSFamilyInfo &UIGuestOSTypeManager::getFamilies() const
 {
     return m_guestOSFamilies;

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

@@ -103 +103 @@
     UIGuestOSTypeManager(const UIGuestOSTypeManager &other) = delete;
 
-    /** A list of all OS families. 'first' of each pair is family Id and 'second' is family description. */
-    typedef QVector<QPair<QString, QString> > UIGuestOSTypeFamilyInfo;
-    /** Guest OS type info list for all type.  'first' is typeId and 'second' is description. */
-    typedef QVector<QPair<QString, QString> > UIGuestOSTypeInfo;
+    /** OS info pair. 'first' is id and 'second' is description. */
+    typedef QPair<QString, QString> UIGuestInfoPair;
+    /** A list of all OS family pairs. */
+    typedef QVector<UIGuestInfoPair> UIGuestOSFamilyInfo;
+    /** A list of all OS type pairs. */
+    typedef QVector<UIGuestInfoPair> UIGuestOSTypeInfo;
 
     /** Re-create the guest OS type database. */
@@ -112 +114 @@
 
     /** Returns a list of all families (id and description). */
-    const UIGuestOSTypeFamilyInfo &getFamilies() const;
+    const UIGuestOSFamilyInfo &getFamilies() const;
     /** Returns the list of subtypes for @p strFamilyId. This may be an empty list. */
-    QStringList                    getSubtypeListForFamilyId(const QString &strFamilyId) const;
+    QStringList                getSubtypeListForFamilyId(const QString &strFamilyId) const;
     /** Returns a list of OS types for the @p strFamilyId. */
-    UIGuestOSTypeInfo              getTypeListForFamilyId(const QString &strFamilyId) const;
+    UIGuestOSTypeInfo          getTypeListForFamilyId(const QString &strFamilyId) const;
     /** Returns a list of OS types for the @p strSubtype. */
-    UIGuestOSTypeInfo              getTypeListForSubtype(const QString &strSubtype) const;
+    UIGuestOSTypeInfo          getTypeListForSubtype(const QString &strSubtype) const;
 
     static bool isDOSType(const QString &strOSTypeId);
@@ -152 +154 @@
     QMap<QString, int> m_typeIdIndexMap;
     /** First item of the pair is family id and the 2nd is family description. */
-    UIGuestOSTypeInfo m_guestOSFamilies;
+    UIGuestOSFamilyInfo m_guestOSFamilies;
 };
 

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

@@ -601 +601 @@
 
     /* Acquire family IDs: */
-    const UIGuestOSTypeManager::UIGuestOSTypeFamilyInfo &families = uiCommon().guestOSTypeManager().getFamilies();
+    const UIGuestOSTypeManager::UIGuestOSFamilyInfo &families = uiCommon().guestOSTypeManager().getFamilies();
 
     /* Block signals initially and clear the combo: */

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

@@ -108 +108 @@
     m_pMainMenu->clear();
 
-    UIGuestOSTypeManager::UIGuestOSTypeFamilyInfo familyList = uiCommon().guestOSTypeManager().getFamilies();
+    UIGuestOSTypeManager::UIGuestOSFamilyInfo familyList = uiCommon().guestOSTypeManager().getFamilies();
 
     for (int i = 0; i < familyList.size(); ++i)