Changeset 101180 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 19, 2023 5:18:37 PM (17 months ago)

Author:

vboxsync

Message:

Frontends/VBoxManage,Main/VirtualBox: Change the newly added IVirtualBox
method getGuestOSFamilies() to be an attribute instead as there are no
"in" arguments passed to this function. bugref:5936

File:

• trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -1947 +1947 @@
     return S_OK;
 }
+
+/**
+ * Walk the list of GuestOSType objects and return a list of all known guest
+ * OS families.
+ *
+ * @param aOSFamilies    Where to store the list of guest OS families.
+ *
+ * @note Locks the guest OS types list for reading.
+ */
+HRESULT VirtualBox::getGuestOSFamilies(std::vector<com::Utf8Str> &aOSFamilies)
+{
+    std::list<com::Utf8Str> allOSFamilies;
+
+    AutoReadLock alock(m->allGuestOSTypes.getLockHandle() COMMA_LOCKVAL_SRC_POS);
+
+    for (GuestOSTypesOList::const_iterator it = m->allGuestOSTypes.begin();
+         it != m->allGuestOSTypes.end(); ++it)
+    {
+        const Utf8Str &familyId = (*it)->i_familyId();
+        AssertMsg(!familyId.isEmpty(), ("familfyId must not be NULL"));
+        allOSFamilies.push_back(familyId);
+    }
+
+    /* throw out any duplicates */
+    allOSFamilies.sort();
+    allOSFamilies.unique();
+
+    aOSFamilies.resize(allOSFamilies.size());
+    size_t i = 0;
+    for (std::list<com::Utf8Str>::const_iterator it = allOSFamilies.begin();
+         it != allOSFamilies.end(); ++it, ++i)
+        aOSFamilies[i] = (*it);
+
+    return S_OK;
+}
+
 // Wrapped IVirtualBox methods
 /////////////////////////////////////////////////////////////////////////////
@@ -4431 +4467 @@
 
 /**
- * Walk the list of GuestOSType objects and return a list of all known guest
- * OS families.
- *
- * @param aOSFamilies    Where to store the list of guest OS families.
- *
- * @note Locks the guest OS types list for reading.
- */
-HRESULT VirtualBox::getGuestOSFamilies(std::vector<com::Utf8Str> &aOSFamilies)
-{
-    std::list<com::Utf8Str> allOSFamilies;
-
-    AutoReadLock alock(m->allGuestOSTypes.getLockHandle() COMMA_LOCKVAL_SRC_POS);
-
-    for (GuestOSTypesOList::const_iterator it = m->allGuestOSTypes.begin();
-         it != m->allGuestOSTypes.end(); ++it)
-    {
-        const Utf8Str &familyId = (*it)->i_familyId();
-        AssertMsg(!familyId.isEmpty(), ("familfyId must not be NULL"));
-        allOSFamilies.push_back(familyId);
-    }
-
-    /* throw out any duplicates */
-    allOSFamilies.sort();
-    allOSFamilies.unique();
-
-    aOSFamilies.resize(allOSFamilies.size());
-    size_t i = 0;
-    for (std::list<com::Utf8Str>::const_iterator it = allOSFamilies.begin();
-         it != allOSFamilies.end(); ++it, ++i)
-        aOSFamilies[i] = (*it);
-
-    return S_OK;
-}
-
-/**
  * Walk the list of GuestOSType objects and return a list of guest OS
  * variants which correspond to the supplied guest OS family ID.