Changeset 103893 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 18, 2024 12:48:07 PM (13 months ago)

Author:

vboxsync

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

162265

Message:

FE/Qt: bugref:10384: UIGuestOSType: A bit of cleanup for family/subtype/type stuff.

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) (3 diffs)
• widgets/UIGuestOSTypeSelectionButton.cpp (modified) (2 diffs)

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

@@ -133 +133 @@
 
 UIGuestOSTypeManager::UIGuestOSFamilyInfo
-UIGuestOSTypeManager::getFamilies(bool fListAll,
+UIGuestOSTypeManager::getFamilies(bool fListAll /* = true */,
                                   KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
@@ -152 +152 @@
 UIGuestOSTypeManager::UIGuestOSSubtypeInfo
 UIGuestOSTypeManager::getSubtypesForFamilyId(const QString &strFamilyId,
-                                             bool fListAll,
+                                             bool fListAll /* = true */,
                                              KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
@@ -171 +171 @@
 UIGuestOSTypeManager::UIGuestOSTypeInfo
 UIGuestOSTypeManager::getTypesForFamilyId(const QString &strFamilyId,
-                                          bool fListAll,
+                                          bool fListAll /* = true */,
                                           KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
@@ -195 +195 @@
 UIGuestOSTypeManager::UIGuestOSTypeInfo
 UIGuestOSTypeManager::getTypesForSubtype(const QString &strSubtype,
-                                         bool fListAll,
+                                         bool fListAll /* = true */,
                                          KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {

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

@@ -192 +192 @@
     /** Returns a list of all families.
       * @param  fListAll  Brings whether a list of all families is requested, supported otherwise. */
-    UIGuestOSFamilyInfo getFamilies(bool fListAll,
+    UIGuestOSFamilyInfo getFamilies(bool fListAll = true,
                                     KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns the list of subtypes for @p strFamilyId. This may be an empty list.
       * @param  fListAll  Brings whether a list of all subtypes is requested, supported otherwise. */
     UIGuestOSSubtypeInfo getSubtypesForFamilyId(const QString &strFamilyId,
-                                                bool fListAll,
+                                                bool fListAll = true,
                                                 KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns a list of OS types for the @p strFamilyId. */
     UIGuestOSTypeInfo getTypesForFamilyId(const QString &strFamilyId,
-                                          bool fListAll,
+                                          bool fListAll = true,
                                           KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns a list of OS types for the @p strSubtype. */
     UIGuestOSTypeInfo getTypesForSubtype(const QString &strSubtype,
-                                         bool fListAll,
+                                         bool fListAll = true,
                                          KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
 

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

@@ -343 +343 @@
     const UIGuestOSTypeManager::UIGuestOSTypeInfo types
          = m_strDistribution.isEmpty()
-         ? gpGlobalSession->guestOSTypeManager().getTypesForFamilyId(m_strFamilyId, false, enmArch)
-         : gpGlobalSession->guestOSTypeManager().getTypesForSubtype(m_strDistribution, false, enmArch);
+         ? gpGlobalSession->guestOSTypeManager().getTypesForFamilyId(m_strFamilyId, false /* including restricted? */, enmArch)
+         : gpGlobalSession->guestOSTypeManager().getTypesForSubtype(m_strDistribution, false /* including restricted? */, enmArch);
 
     /* Save the most recently used item: */
@@ -618 +618 @@
     /* Acquire family IDs: */
     const UIGuestOSTypeManager::UIGuestOSFamilyInfo families
-        = gpGlobalSession->guestOSTypeManager().getFamilies(false, enmArch);
+        = gpGlobalSession->guestOSTypeManager().getFamilies(false /* including restricted? */, enmArch);
 
     /* Block signals initially and clear the combo: */
@@ -654 +654 @@
     /* Acquire a list of suitable sub-types: */
     const UIGuestOSTypeManager::UIGuestOSSubtypeInfo distributions
-        = gpGlobalSession->guestOSTypeManager().getSubtypesForFamilyId(m_strFamilyId, false, enmArch);
+        = gpGlobalSession->guestOSTypeManager().getSubtypesForFamilyId(m_strFamilyId, false /* including restricted? */, enmArch);
     m_pLabelDistribution->setEnabled(!distributions.isEmpty());
     m_pComboDistribution->setEnabled(!distributions.isEmpty());

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

@@ -107 +107 @@
 
     const UIGuestOSTypeManager::UIGuestOSFamilyInfo families
-        = gpGlobalSession->guestOSTypeManager().getFamilies(true);
+        = gpGlobalSession->guestOSTypeManager().getFamilies();
 
     for (int i = 0; i < families.size(); ++i)
@@ -114 +114 @@
         QMenu *pSubMenu = m_pMainMenu->addMenu(fi.m_strDescription);
         const UIGuestOSTypeManager::UIGuestOSSubtypeInfo distributions
-            = gpGlobalSession->guestOSTypeManager().getSubtypesForFamilyId(fi.m_strId, true);
+            = gpGlobalSession->guestOSTypeManager().getSubtypesForFamilyId(fi.m_strId);
 
         if (distributions.isEmpty())
-            createOSTypeMenu(gpGlobalSession->guestOSTypeManager().getTypesForFamilyId(fi.m_strId, true), pSubMenu);
+            createOSTypeMenu(gpGlobalSession->guestOSTypeManager().getTypesForFamilyId(fi.m_strId), pSubMenu);
         else
         {
             foreach (const UISubtypeInfo &distribution, distributions)
-                createOSTypeMenu(gpGlobalSession->guestOSTypeManager().getTypesForSubtype(distribution.m_strName, true),
+                createOSTypeMenu(gpGlobalSession->guestOSTypeManager().getTypesForSubtype(distribution.m_strName),
                                  pSubMenu->addMenu(distribution.m_strName));
         }