Changeset 37553 in vbox

Timestamp:

Jun 20, 2011 12:48:28 PM (14 years ago)

Author:

vboxsync

Message:

com: method for SafeArray -> RTCList

Location:

trunk

Files:

• include/VBox/com/array.h (modified) (2 diffs)
• include/VBox/com/list.h (modified) (1 diff)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)

trunk/include/VBox/com/array.h

@@ -168 +168 @@
 #include "VBox/com/ptr.h"
 #include "VBox/com/assert.h"
+#include "iprt/cpp/list.h"
 
 #ifdef VBOX_WITH_XPCOM
@@ -1008 +1009 @@
         return *this;
     }
+
+    /**
+     * Returns a copy of this SafeArray as RTCList<T>.
+     */
+        RTCList<T> toList()
+        {
+                RTCList<T> list(size());
+                for (size_t i = 0; i < size(); ++i)
+#ifdef VBOX_WITH_XPCOM
+                        list.append(m.arr[i]);
+#else
+                        list.append(m.raw[i]);
+#endif
+                return list;
+        }
 
     inline void initFrom(const com::SafeArray<T> & aRef);

trunk/include/VBox/com/list.h

@@ -196 +196 @@
 };
 
-//template <typename T> RTCList<T> SafeArrayToRTCList(ComSafeArrayIn(T, other), T* = 0)
-//{
-//    com::SafeArray<T> sfaOther(ComSafeArrayInArg(other));
-//    RTCList<T> list(sfaOther.size());
-//    for (size_t i = 0; i < sfaOther.size(); ++i)
-//        list.append(sfaOther[i]);
-//    return list;
-//}
-
 #endif /* !___VBox_com_list_h */
 

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

@@ -6083 +6083 @@
     /* Convert the options. */
     RTCList<CloneOptions_T> optList;
-    if (options != NULL)
-    {
-         com::SafeArray<CloneOptions_T> sfaOpts(ComSafeArrayInArg(options));
-         for (size_t i = 0; i < sfaOpts.size(); ++i)
-             optList.append(sfaOpts[i]);
-//        optList = SafeArrayToRTCList<CloneOptions_T>(ComSafeArrayInArg(options));
-    }
+        if (options != NULL)
+                optList = com::SafeArray<CloneOptions_T>(ComSafeArrayInArg(options)).toList();
+                
     AssertReturn(!optList.contains(CloneOptions_Link), E_NOTIMPL);
     AssertReturn(!(optList.contains(CloneOptions_KeepAllMACs) && optList.contains(CloneOptions_KeepNATMACs)), E_FAIL);