Changeset 13959 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 7, 2008 12:59:48 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed support for safe arrays of enums (affected XPCOM platforms).

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• COMDefs.h (modified) (2 diffs)
• COMWrappers.xsl (modified) (2 diffs)

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

@@ -291 +291 @@
 
     template <typename QE, typename CE>
-    static void ToSafeArray (const QVector <QE> &aVec,
+    static void ToSafeArray (const QValueVector <QE> &aVec,
                              com::SafeIfaceArray <CE> &aArr)
     {
@@ -301 +301 @@
     template <typename CE, typename QE>
     static void FromSafeArray (const com::SafeIfaceArray <CE> &aArr,
-                               QVector <QE> &aVec)
+                               QValueVector <QE> &aVec)
     {
         aVec.resize (static_cast <int> (aArr.size()));

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

@@ -1779 +1779 @@
   )"/>
 
+  <xsl:variable name="is_enum" select="(
+    (ancestor::library/enum[@name=current()/@type]) or
+    (ancestor::library/if[@target=$self_target]/enum[@name=current()/@type])
+  )"/>
+
   <xsl:choose>
     <xsl:when test="$when='pre-call'">
@@ -1793 +1798 @@
               <xsl:value-of select="@type"/>
               <xsl:text>&gt; </xsl:text>
+            </xsl:when>
+            <!-- enums need the _T prefix -->
+            <xsl:when test="$is_enum">
+              <xsl:text>    com::SafeArray &lt;</xsl:text>
+              <xsl:value-of select="@type"/>
+              <xsl:text>_T&gt; </xsl:text>
             </xsl:when>
             <!-- GUID is special too -->