Changeset 17260 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 3, 2009 9:16:15 AM (16 years ago)

Author:

vboxsync

Message:

#3551: “Main: Replace remaining collections with safe arrays”
Replace SnapshotCollection. Reviewed by dmik. Tested with GUI.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)
• VirtualBox/src/VBoxSnapshotsWgt.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -66 +66 @@
 
     /* get the children */
-    ComPtr<ISnapshotCollection> coll;
-    rootSnapshot->COMGETTER(Children)(coll.asOutParam());
-    if (coll)
-    {
-        ComPtr<ISnapshotEnumerator> enumerator;
-        coll->Enumerate(enumerator.asOutParam());
-        ULONG index = 0;
-        BOOL hasMore = FALSE;
-        while (enumerator->HasMore(&hasMore), hasMore)
-        {
-            ComPtr<ISnapshot> snapshot;
-            enumerator->GetNext(snapshot.asOutParam());
+    SafeIfaceArray <ISnapshot> coll;
+    rootSnapshot->COMGETTER(Children)(ComSafeArrayAsOutParam(coll));
+    if (!coll.isNull())
+    {
+        for (size_t index = 0; index < coll.size(); ++index)
+        {
+            ComPtr<ISnapshot> snapshot = coll[index];
             if (snapshot)
             {
@@ -88 +83 @@
                 showSnapshots(snapshot, details, newPrefix, level + 1);
             }
-            index++;
         }
     }

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

@@ -2671 +2671 @@
                                regExp.cap (1).toInt() : maxSnapShotIndex;
         /* Traversing to the next child */
-        index = index.GetChildren().GetItemAt (0);
+        index = index.GetChildren()[0];
     }
     dlg.mLeName->setText (snapShotName.arg (maxSnapShotIndex + 1));

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

@@ -800 +800 @@
     }
 
-    CSnapshotEnumerator en = aSnapshot.GetChildren().Enumerate();
-    while (en.HasMore())
-    {
-        CSnapshot sn = en.GetNext();
+    CSnapshotVector snapvec = aSnapshot.GetChildren();
+    for (int i = 0; i < snapvec.size(); ++i)
+    {
+        CSnapshot sn = snapvec[i];
         populateSnapshots (sn, si);
     }