Changeset 103687 in vbox

Timestamp:

Mar 5, 2024 5:57:51 PM (14 months ago)

Author:

vboxsync

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

162054

Message:

FE/Qt: bugref:10384: More cleanup for UIGuestOSType.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -137 +137 @@
     /** OS info pair. 'first' is id and 'second' is description. */
     typedef QPair<QString, QString> UIGuestInfoPair;
-    /** A list of all OS family pairs. */
+    /** A list of all OS families. */
     typedef QVector<UIFamilyInfo> UIGuestOSFamilyInfo;
     /** A list of all OS type pairs. */
@@ -154 +154 @@
                                     KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns the list of subtypes for @p strFamilyId. This may be an empty list. */
-    QStringList         getSubtypesForFamilyId(const QString &strFamilyId,
-                                               KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
+    QStringList getSubtypesForFamilyId(const QString &strFamilyId,
+                                       KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns a list of OS types for the @p strFamilyId. */
-    UIGuestOSTypeInfo   getTypesForFamilyId(const QString &strFamilyId,
-                                            KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
+    UIGuestOSTypeInfo getTypesForFamilyId(const QString &strFamilyId,
+                                          KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns a list of OS types for the @p strSubtype. */
-    UIGuestOSTypeInfo   getTypesForSubtype(const QString &strSubtype,
-                                           KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
+    UIGuestOSTypeInfo getTypesForSubtype(const QString &strSubtype,
+                                         KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
 
     /** Returns whether specified @a strOSTypeId is of DOS type. */

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

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

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

@@ -108 +108 @@
     m_pMainMenu->clear();
 
-    UIGuestOSTypeManager::UIGuestOSFamilyInfo familyList = uiCommon().guestOSTypeManager().getFamilies(true);
+    const UIGuestOSTypeManager::UIGuestOSFamilyInfo familyies = uiCommon().guestOSTypeManager().getFamilies(true);
 
-    for (int i = 0; i < familyList.size(); ++i)
+    for (int i = 0; i < familyies.size(); ++i)
     {
-        const UIFamilyInfo &fi = familyList.at(i);
+        const UIFamilyInfo &fi = familyies.at(i);
         QMenu *pSubMenu = m_pMainMenu->addMenu(fi.m_strDescription);
-        QStringList subtypeList = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(fi.m_strId);
+        const QStringList distributions = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(fi.m_strId);
 
-        if (subtypeList.isEmpty())
+        if (distributions.isEmpty())
             createOSTypeMenu(uiCommon().guestOSTypeManager().getTypesForFamilyId(fi.m_strId), pSubMenu);
         else
         {
-            foreach (const QString &strSubtype, subtypeList)
-                createOSTypeMenu(uiCommon().guestOSTypeManager().getTypesForSubtype(strSubtype), pSubMenu->addMenu(strSubtype));
+            foreach (const QString &strDistribution, distributions)
+                createOSTypeMenu(uiCommon().guestOSTypeManager().getTypesForSubtype(strDistribution),
+                                 pSubMenu->addMenu(strDistribution));
         }
     }