Changeset 9401 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox4/include/COMDefs.h (modified) (11 diffs)
• Frontends/VirtualBox4/include/COMWrappers.xsl (modified) (5 diffs)
• Frontends/VirtualBox4/src/COMDefs.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)

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]);

trunk/src/VBox/Frontends/VirtualBox4/include/COMWrappers.xsl

@@ -11 +11 @@
 
 /*
-     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
@@ -238 +238 @@
       (//param[@safearray='yes' and not(../@internal='yes') and @type=current()/@name])
     ">
-      <xsl:text>typedef Q3ValueVector &lt;C</xsl:text>
+      <xsl:text>typedef QVector &lt;C</xsl:text>
       <xsl:value-of select="substring(@name,2)"/>
       <xsl:text>&gt; C</xsl:text>
@@ -1154 +1154 @@
     <xsl:otherwise>
       <xsl:if test="../@safearray">
-        <xsl:text>Q3ValueVector &lt;</xsl:text>
+        <xsl:text>QVector &lt;</xsl:text>
       </xsl:if>
       <xsl:choose>
@@ -1555 +1555 @@
           <xsl:if test="(name()='attribute' and $isSetter) or
                         (name()='param' and @dir='in')">
-            <!-- convert Q3ValueVector to SafeArray -->
+            <!-- convert QVector to SafeArray -->
             <xsl:choose>
               <!-- interface types need special treatment here -->
@@ -1581 +1581 @@
           <xsl:if test="(name()='attribute' and not($isSetter)) or
                         (name()='param' and (@dir='out' or @dir='return'))">
-            <!-- convert SafeArray to Q3ValueVector -->
+            <!-- convert SafeArray to QVector -->
             <xsl:choose>
               <!-- interface types need special treatment here -->

trunk/src/VBox/Frontends/VirtualBox4/src/COMDefs.cpp

@@ -6 +6 @@
 
 /*
- * 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
@@ -27 +27 @@
 #else /* !defined (VBOX_WITH_XPCOM) */
 
-#include <qobject.h>
+/* Qt includes */
+#include <QObject>
 #include <qsocketnotifier.h>
 
@@ -64 +65 @@
         mEventQ = eq;
         mNotifier = new QSocketNotifier (mEventQ->GetEventQueueSelectFD(),
-                                         QSocketNotifier::Read, this,
-                                         "XPCOMEventQSocketNotifier");
+                                         QSocketNotifier::Read, this);
         QObject::connect (mNotifier, SIGNAL (activated (int)),
                           this, SLOT (processEvents()));
@@ -187 +187 @@
 
 /* static */
-void COMBase::ToSafeArray (const Q3ValueVector <QString> &aVec,
+void COMBase::ToSafeArray (const QVector <QString> &aVec,
                            com::SafeArray <BSTR> &aArr)
 {
     aArr.reset (aVec.size());
     size_t i = 0;
-    for (Q3ValueVector <QString>::const_iterator it = aVec.begin();
+    for (QVector <QString>::const_iterator it = aVec.begin();
          it != aVec.end(); ++ it, ++ i)
-        aArr [i] = SysAllocString ((const OLECHAR *) (*it).ucs2());
+        aArr [i] = SysAllocString ((const OLECHAR *) (*it).utf16());
 }
 
 /* static */
 void COMBase::FromSafeArray (const com::SafeArray <BSTR> &aArr,
-                             Q3ValueVector <QString> &aVec)
-{
-    aVec = Q3ValueVector <QString> (aArr.size());
+                             QVector <QString> &aVec)
+{
+    aVec = QVector <QString> (aArr.size());
     size_t i = 0;
-    for (Q3ValueVector <QString>::iterator it = aVec.begin();
+    for (QVector <QString>::iterator it = aVec.begin();
          it != aVec.end(); ++ it, ++ i)
-        *it = QString::fromUcs2 (aArr [i]);
+        *it = QString::fromUtf16 (aArr [i]);
 }
 

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

@@ -38 +38 @@
  *     of the Main API)
  *
- * 6. src/VBox/Installer/win32/VirtualBox_TypeLib.xsl =>
+ * 6. src/VBox/Frontends/VirtualBox4/include/COMWrappers.xsl =>
+ *    out/<platform>/obj/src/VBox/Frontends/VirtualBox4/VirtualBox/include/COMWrappers.h
+ *    (smart Qt-based C++ wrapper classes for COM interfaces
+ *     of the Main API)
+ *
+ * 7. src/VBox/Installer/win32/VirtualBox_TypeLib.xsl =>
  *    out/<platform>/obj/src/VBox/Installer/win32/VirtualBox_TypeLib.wxi
  *    (Main API TypeLib block for the WiX installer)