Changeset 103680 in vbox

Timestamp:

Mar 5, 2024 12:31:30 PM (7 months ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -116 +116 @@
 
 UIGuestOSTypeManager::UIGuestOSFamilyInfo
-UIGuestOSTypeManager::getFamilies(bool fListAll, KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
+UIGuestOSTypeManager::getFamilies(bool fListAll,
+                                  KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
     /* Return all families by default: */
@@ -135 +136 @@
 
 QStringList
-UIGuestOSTypeManager::getSubtypeListForFamilyId(const QString &strFamilyId,
-                                                KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
+UIGuestOSTypeManager::getSubtypesForFamilyId(const QString &strFamilyId,
+                                             KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
     /* Prepare list by arch type: */
@@ -157 +158 @@
 
 UIGuestOSTypeManager::UIGuestOSTypeInfo
-UIGuestOSTypeManager::getTypeListForFamilyId(const QString &strFamilyId,
-                                             KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
+UIGuestOSTypeManager::getTypesForFamilyId(const QString &strFamilyId,
+                                          KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
     UIGuestOSTypeInfo typeInfoList;
+    if (strFamilyId.isEmpty())
+        return typeInfoList;
     foreach (const UIGuestOSType &type, m_guestOSTypes)
     {
@@ -176 +179 @@
 
 UIGuestOSTypeManager::UIGuestOSTypeInfo
-UIGuestOSTypeManager::getTypeListForSubtype(const QString &strSubtype,
-                                            KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
+UIGuestOSTypeManager::getTypesForSubtype(const QString &strSubtype,
+                                         KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
     UIGuestOSTypeInfo typeInfoList;

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

@@ -150 +150 @@
     void reCacheGuestOSTypes();
 
-    /** Returns a list of all families (id and description). */
-    UIGuestOSFamilyInfo getFamilies(bool fListAll, KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
+    /** Returns a list of all families. */
+    UIGuestOSFamilyInfo getFamilies(bool fListAll,
+                                    KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns the list of subtypes for @p strFamilyId. This may be an empty list. */
-    QStringList         getSubtypeListForFamilyId(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   getTypeListForFamilyId(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   getTypeListForSubtype(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

@@ -342 +342 @@
     const UIGuestOSTypeManager::UIGuestOSTypeInfo types
          = m_strDistribution.isEmpty()
-         ? uiCommon().guestOSTypeManager().getTypeListForFamilyId(m_strFamilyId, enmArch)
-         : uiCommon().guestOSTypeManager().getTypeListForSubtype(m_strDistribution, enmArch);
+         ? uiCommon().guestOSTypeManager().getTypesForFamilyId(m_strFamilyId, enmArch)
+         : uiCommon().guestOSTypeManager().getTypesForSubtype(m_strDistribution, enmArch);
 
     /* Save the most recently used item: */
@@ -651 +651 @@
 
     /* Acquire a list of suitable sub-types: */
-    const QStringList distributions = uiCommon().guestOSTypeManager().getSubtypeListForFamilyId(m_strFamilyId, enmArch);
+    const QStringList distributions = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(m_strFamilyId, enmArch);
     m_pLabelDistribution->setEnabled(!distributions.isEmpty());
     m_pComboDistribution->setEnabled(!distributions.isEmpty());

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

@@ -114 +114 @@
         const UIFamilyInfo &fi = familyList.at(i);
         QMenu *pSubMenu = m_pMainMenu->addMenu(fi.m_strDescription);
-        QStringList subtypeList = uiCommon().guestOSTypeManager().getSubtypeListForFamilyId(fi.m_strId);
+        QStringList subtypeList = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(fi.m_strId);
 
         if (subtypeList.isEmpty())
-            createOSTypeMenu(uiCommon().guestOSTypeManager().getTypeListForFamilyId(fi.m_strId), pSubMenu);
+            createOSTypeMenu(uiCommon().guestOSTypeManager().getTypesForFamilyId(fi.m_strId), pSubMenu);
         else
         {
             foreach (const QString &strSubtype, subtypeList)
-                createOSTypeMenu(uiCommon().guestOSTypeManager().getTypeListForSubtype(strSubtype), pSubMenu->addMenu(strSubtype));
+                createOSTypeMenu(uiCommon().guestOSTypeManager().getTypesForSubtype(strSubtype), pSubMenu->addMenu(strSubtype));
         }
     }