Changeset 7207 in vbox for trunk/src/VBox/Main/idl/midl.xsl

Timestamp:

Feb 28, 2008 6:43:08 PM (17 years ago)

Author:

vboxsync

Message:

Main: Reworked enums to avoid 1) weird duplication of enum name when referring to enum values in cross-platform code; 2) possible clashes on Win32 due to putting identifiers like Paused or Disabled to the global namespace (via C enums). In the new style, enums are used like this: a) USBDeviceState_T v = USBDeviceState_Busy from cross-platform non-Qt code; b) KUSBDeviceState v = KUSBDeviceState_Busy from Qt code; c) USBDeviceState v = USBDeviceState_Busy from plain Win32 and d) PRUInt32 USBDeviceState v = USBDeviceState::Busy from plain XPCOM.

File:

• trunk/src/VBox/Main/idl/midl.xsl (modified) (2 diffs)

trunk/src/VBox/Main/idl/midl.xsl

@@ -379 +379 @@
     <xsl:for-each select="const">
         <xsl:text>    </xsl:text>
-        <xsl:value-of select="@name"/> = <xsl:value-of select="@value"/>
+        <xsl:value-of select="concat(../@name,'_',@name)"/> = <xsl:value-of select="@value"/>
         <xsl:choose>
             <xsl:when test="position()!=last()"><xsl:text>,&#x0A;</xsl:text></xsl:when>
@@ -392 +392 @@
     <xsl:value-of select="concat('cpp_quote(&quot;#define ', @name, '_T', ' ',
                                  @name, '&quot;)&#x0A;&#x0A;')"/>
-    <xsl:text>cpp_quote("")&#x0A;</xsl:text>
-    <!-- -->
-    <xsl:value-of select="concat('/* cross-platform constants for ', @name, ' */&#x0A;')"/>
-    <xsl:for-each select="const">
-        <xsl:value-of select="concat('cpp_quote(&quot;#define ', ../@name, '_', @name, ' ',
-                                     @name, '&quot;)&#x0A;')"/>
-        <xsl:choose>
-            <xsl:when test="position()=last()"><xsl:text>cpp_quote("")&#x0A;</xsl:text></xsl:when>
-        </xsl:choose>
-    </xsl:for-each>
     <xsl:text>&#x0A;&#x0A;</xsl:text>
 </xsl:template>