Changeset 16966 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Feb 20, 2009 9:14:28 AM (16 years ago)

Author:

vboxsync

Message:

#3551: “Main: Replace remaining collections with safe arrays”
Converted SharedFolderCollection. Approved by dmik. Tested with GUI.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1754 +1754 @@
 
 STDMETHODIMP
-Machine::COMGETTER(SharedFolders) (ISharedFolderCollection **aSharedFolders)
-{
-    CheckComArgOutPointerValid (aSharedFolders);
+Machine::COMGETTER(SharedFolders) (ComSafeArrayOut (ISharedFolder *, aSharedFolders))
+{
+    CheckComArgOutSafeArrayPointerValid (aSharedFolders);
 
     AutoCaller autoCaller (this);
@@ -1763 +1763 @@
     AutoReadLock alock (this);
 
-    ComObjPtr <SharedFolderCollection> coll;
-    coll.createObject();
-    coll->init (mHWData->mSharedFolders);
-    coll.queryInterfaceTo (aSharedFolders);
+    SafeIfaceArray <ISharedFolder> folders (mHWData->mSharedFolders);
+    folders.detachTo (ComSafeArrayOutArg(aSharedFolders));
 
     return S_OK;