Changeset 9401 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include/COMDefs.h

Timestamp:

Jun 5, 2008 8:01:41 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Some updates to the COM wrapper for Qt4.

File:

• trunk/src/VBox/Frontends/VirtualBox4/include/COMDefs.h (modified) (11 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/COMDefs.h

@@ -10 +10 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -80 +80 @@
 #undef ASSERT
 
-#include <qstring.h>
-#include <quuid.h>
-#include <q3valuevector.h>
+/* Qt includes */
+#include <QString>
+#include <QUuid>
+#include <QVector>
 
 #include <iprt/memory> // for auto_copy_ptr
@@ -228 +229 @@
 
     template <typename QT, typename CT>
-    static void ToSafeArray (const Q3ValueVector <QT> &aVec, com::SafeArray <CT> &aArr)
+    static void ToSafeArray (const QVector <QT> &aVec, com::SafeArray <CT> &aArr)
     {
         AssertMsgFailedReturnVoid (("No conversion!\n"));
@@ -234 +235 @@
 
     template <typename CT, typename QT>
-    static void FromSafeArray (const com::SafeArray <CT> &aArr, Q3ValueVector <QT> &aVec)
+    static void FromSafeArray (const com::SafeArray <CT> &aArr, QVector <QT> &aVec)
     {
         AssertMsgFailedReturnVoid (("No conversion!\n"));
@@ -240 +241 @@
 
     template <typename QT, typename CT>
-    static void ToSafeArray (const Q3ValueVector <QT *> &aVec, com::SafeArray <CT *> &aArr)
+    static void ToSafeArray (const QVector <QT *> &aVec, com::SafeArray <CT *> &aArr)
     {
         AssertMsgFailedReturnVoid (("No conversion!\n"));
@@ -246 +247 @@
 
     template <typename CT, typename QT>
-    static void FromSafeArray (const com::SafeArray <CT *> &aArr, Q3ValueVector <QT *> &aVec)
+    static void FromSafeArray (const com::SafeArray <CT *> &aArr, QVector <QT *> &aVec)
     {
         AssertMsgFailedReturnVoid (("No conversion!\n"));
@@ -254 +255 @@
 
     template <typename T>
-    static void ToSafeArray (const Q3ValueVector <T> &aVec, com::SafeArray <T> &aArr)
+    static void ToSafeArray (const QVector <T> &aVec, com::SafeArray <T> &aArr)
     {
         aArr.reset (aVec.size());
         size_t i = 0;
-        for (typename Q3ValueVector <T>::const_iterator it = aVec.begin();
+        for (typename QVector <T>::const_iterator it = aVec.begin();
              it != aVec.end(); ++ it, ++ i)
             aArr [i] = *it;
@@ -264 +265 @@
 
     template <typename T>
-    static void FromSafeArray (const com::SafeArray <T> &aArr, Q3ValueVector <T> &aVec)
-    {
-        aVec = Q3ValueVector <T> (aArr.size());
+    static void FromSafeArray (const com::SafeArray <T> &aArr, QVector <T> &aVec)
+    {
+        aVec = QVector <T> (aArr.size());
         size_t i = 0;
-        for (typename Q3ValueVector <T>::iterator it = aVec.begin();
+        for (typename QVector <T>::iterator it = aVec.begin();
              it != aVec.end(); ++ it, ++ i)
             *it = aArr [i];
@@ -275 +276 @@
     /* Arrays of strings */
 
-    static void ToSafeArray (const Q3ValueVector <QString> &aVec,
+    static void ToSafeArray (const QVector <QString> &aVec,
                              com::SafeArray <BSTR> &aArr);
     static void FromSafeArray (const com::SafeArray <BSTR> &aArr,
-                               Q3ValueVector <QString> &aVec);
+                               QVector <QString> &aVec);
 
     /* Arrays of interface pointers. Note: we need a separate pair of names
@@ -290 +291 @@
 
     template <class CI, class I>
-    static void ToSafeIfaceArray (const Q3ValueVector <CI> &aVec,
+    static void ToSafeIfaceArray (const QVector <CI> &aVec,
                                   com::SafeIfaceArray <I> &aArr)
     {
         aArr.reset (aVec.size());
         size_t i = 0;
-        for (typename Q3ValueVector <CI>::const_iterator it = aVec.begin();
+        for (typename QVector <CI>::const_iterator it = aVec.begin();
              it != aVec.end(); ++ it, ++ i)
         {
@@ -306 +307 @@
     template <class I, class CI>
     static void FromSafeIfaceArray (const com::SafeIfaceArray <I> &aArr,
-                                    Q3ValueVector <CI> &aVec)
-    {
-        aVec = Q3ValueVector <CI> (aArr.size());
+                                    QVector <CI> &aVec)
+    {
+        aVec = QVector <CI> (aArr.size());
         size_t i = 0;
-        for (typename Q3ValueVector <CI>::iterator it = aVec.begin();
+        for (typename QVector <CI>::iterator it = aVec.begin();
              it != aVec.end(); ++ it, ++ i)
             (*it).attach (aArr [i]);