Changeset 102153 in vbox for trunk

Timestamp:

Nov 20, 2023 3:05:27 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: A bit of cleanup for UIGuestOSType stuff.

Location:

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

Files:

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

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

@@ -68 +68 @@
 }
 
-const UIGuestOSTypeManager::UIGuestOSFamilyInfo &UIGuestOSTypeManager::getFamilies() const
+UIGuestOSTypeManager::UIGuestOSFamilyInfo UIGuestOSTypeManager::getFamilies() const
 {
     return m_guestOSFamilies;
@@ -75 +75 @@
 QStringList UIGuestOSTypeManager::getSubtypeListForFamilyId(const QString &strFamilyId) const
 {
-    QStringList subtypeList;
+    QStringList subtypes;
     foreach (const UIGuestOSType &type, m_guestOSTypes)
     {
         if (type.getFamilyId() != strFamilyId)
             continue;
-        const QString &strSubtype = type.getSubtype();
-        if (!strSubtype.isEmpty() && !subtypeList.contains(strSubtype))
-            subtypeList << strSubtype;
+        const QString strSubtype = type.getSubtype();
+        if (strSubtype.isEmpty() || subtypes.contains(strSubtype))
+            continue;
+        subtypes << strSubtype;
     }
-    return subtypeList;
+    return subtypes;
 }
 
@@ -95 +96 @@
             continue;
         QPair<QString, QString> info(type.getId(), type.getDescription());
-
-        if (!typeInfoList.contains(info))
-            typeInfoList << info;
+        if (typeInfoList.contains(info))
+            continue;
+        typeInfoList << info;
     }
     return typeInfoList;
@@ -107 +108 @@
     if (strSubtype.isEmpty())
         return typeInfoList;
-
     foreach (const UIGuestOSType &type, m_guestOSTypes)
     {
@@ -113 +113 @@
             continue;
         QPair<QString, QString> info(type.getId(), type.getDescription());
-        if (!typeInfoList.contains(info))
-            typeInfoList << info;
+        if (typeInfoList.contains(info))
+            continue;
+        typeInfoList << info;
     }
     return typeInfoList;

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

@@ -114 +114 @@
 
     /** Returns a list of all families (id and description). */
-    const UIGuestOSFamilyInfo &getFamilies() 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);