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

Timestamp:

Feb 20, 2009 12:26:19 PM (16 years ago)

Author:

vboxsync

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

43138

Message:

#3551: “Main: Replace remaining collections with safe arrays”
Converted ostype collection. Tested with VBoxManage list ostypes.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -5536 +5536 @@
 #endif
 
-    /* Initialize guest OS Type list */
-    CGuestOSTypeCollection coll = mVBox.GetGuestOSTypes();
-    int osTypeCount = coll.GetCount();
+    /* Initialize guest OS Type list. */
+    CGuestOSTypeVector coll = mVBox.GetGuestOSTypes();
+    int osTypeCount = coll.size();
     AssertMsg (osTypeCount > 0, ("Number of OS types must not be zero"));
     if (osTypeCount > 0)
     {
-        CGuestOSTypeEnumerator en = coll.Enumerate();
-
-        /* Here we assume 'Other' type is always the first, so we
-         * remember it and will append it to the list when finish */
-        CGuestOSType otherType (en.GetNext());
+        /* Here we assume the 'Other' type is always the first, so we
+         * remember it and will append it to the list when finished. */
+        CGuestOSType otherType = coll[0];
         QString otherFamilyId (otherType.GetFamilyId());
 
         /* Fill the lists with all the available OS Types except
-         * the 'Other' one type, it will be appended. */
-        while (en.HasMore())
-        {
-            CGuestOSType os (en.GetNext());
+         * the 'Other' type, which will be appended. */
+        for (int i = 1; i < coll.size(); ++i)
+        {
+            CGuestOSType os = coll[i];
             QString familyId (os.GetFamilyId());
             if (!mFamilyIDs.contains (familyId))
@@ -5563 +5561 @@
         }
 
-        /* Append the 'Other' OS Type to the end of list */
+        /* Append the 'Other' OS Type to the end of list. */
         if (!mFamilyIDs.contains (otherFamilyId))
         {
@@ -5572 +5570 @@
     }
 
-    /* Fill in OS type icon dictionary */
+    /* Fill in OS type icon dictionary. */
     static const char *kOSTypeIcons [][2] =
     {