Changeset 17260 in vbox for trunk

Timestamp:

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

Author:

vboxsync

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

43608

Message:

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

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxSnapshotsWgt.cpp (modified) (1 diff)
• Main/SnapshotImpl.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/SnapshotImpl.h (modified) (2 diffs)
• Main/xpcom/server.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);
     }

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -284 +284 @@
 }
 
-STDMETHODIMP Snapshot::COMGETTER(Children) (ISnapshotCollection **aChildren)
-{
-    CheckComArgOutPointerValid(aChildren);
+STDMETHODIMP Snapshot::COMGETTER(Children) (ComSafeArrayOut (ISnapshot *, aChildren))
+{
+    CheckComArgOutSafeArrayPointerValid(aChildren);
 
     AutoWriteLock alock (this);
@@ -293 +293 @@
     AutoWriteLock chLock (childrenLock ());
 
-    ComObjPtr <SnapshotCollection> collection;
-    collection.createObject();
-    collection->init (children());
-    collection.queryInterfaceTo (aChildren);
+    SafeIfaceArray <ISnapshot> collection (children());
+    collection.detachTo (ComSafeArrayOutArg (aChildren));
 
     return S_OK;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7457 +7457 @@
   -->
 
-  <enumerator
-     name="ISnapshotEnumerator" type="ISnapshot"
-     uuid="25cfa2a4-1f1d-4f05-9658-b7a5894ef1a3"
-     />
-
-  <collection
-     name="ISnapshotCollection" type="ISnapshot"
-     enumerator="ISnapshotEnumerator"
-     uuid="23852e3c-94cd-4801-ab05-ed35675b3894"
-     readonly="yes"
-     />
-
   <interface
      name="ISnapshot" extends="$unknown"
-     uuid="9f1bbf79-13b0-4da2-abba-4a992c65c083"
+     uuid="5db6b1d9-c76b-4424-a6f4-8257f642d6ea"
      wsmap="managed"
      >
@@ -7664 +7652 @@
     </attribute>
 
-    <attribute name="children" type="ISnapshotCollection" readonly="yes">
+    <attribute name="children" type="ISnapshot" readonly="yes" safearray="yes">
       <desc>
         Child snapshots (all snapshots having this one as a parent).

trunk/src/VBox/Main/include/SnapshotImpl.h

@@ -87 +87 @@
     STDMETHOD(COMGETTER(Machine)) (IMachine **aMachine);
     STDMETHOD(COMGETTER(Parent)) (ISnapshot **aParent);
-    STDMETHOD(COMGETTER(Children)) (ISnapshotCollection **aChildren);
+    STDMETHOD(COMGETTER(Children)) (ComSafeArrayOut (ISnapshot *, aChildren));
 
     // ISnapshot methods
@@ -125 +125 @@
 };
 
-COM_DECL_READONLY_ENUM_AND_COLLECTION (Snapshot)
-
 #endif // ____H_SNAPSHOTIMPL
 

trunk/src/VBox/Main/xpcom/server.cpp

@@ -242 +242 @@
 /* collections and enumerators */
 
-COM_IMPL_READONLY_ENUM_AND_COLLECTION(Snapshot)
 #ifdef VBOX_WITH_USB
 COM_IMPL_READONLY_ENUM_AND_COLLECTION(HostUSBDevice)