Changeset 54554 in vbox

Timestamp:

Feb 27, 2015 3:31:20 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6227: Inline enum values for generated COM enums.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (1 diff)
• globals/COMWrappers.xsl (modified) (2 diffs)
• globals/UIDefs.h (modified) (1 diff)
• globals/UIThreadPool.cpp (modified) (1 diff)
• medium/UIMediumDefs.h (modified) (1 diff)
• runtime/UIMachineView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -27 +27 @@
 #include "UIDefs.h"
 #include "UIExtraDataDefs.h"
+
+/* Other VBox includes: */
+#include <iprt/assert.h>
 
 /* Determines if 'Object of type X' can be converted to object of other type.

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

@@ -178 +178 @@
     <xsl:text>#define ___COMEnums_h___&#x0A;&#x0A;</xsl:text>
     <xsl:text>/* GUI includes: */&#x0A;</xsl:text>
-    <xsl:text>#include "COMDefs.h"&#x0A;&#x0A;</xsl:text>
+    <xsl:text>#include "QMetaType"&#x0A;&#x0A;</xsl:text>
 
     <!-- Enumerate all enums: -->
@@ -191 +191 @@
             <xsl:text>    </xsl:text>
             <xsl:value-of select="concat('K',../@name,'_',@name)"/>
-            <xsl:text> = ::</xsl:text>
-            <xsl:value-of select="concat(../@name,'_',@name)"/>
+            <xsl:text> = </xsl:text>
+            <xsl:value-of select="@value"/>
             <xsl:text>,&#x0A;</xsl:text>
         </xsl:for-each>

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -32 +32 @@
 /* Other VBox includes: */
 #include <VBox/log.h>
+#include <VBox/com/defs.h>
 
 /* Defines: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp

@@ -24 +24 @@
 
 /* GUI includes: */
+# include "COMDefs.h"
 # include "UIThreadPool.h"
 # include "UIDefs.h"
+
+/* Other VBox includes: */
+#include <iprt/assert.h>
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDefs.h

@@ -20 +20 @@
 /* COM includes: */
 #include "COMEnums.h"
+
+/* Other VBox includes: */
+#include <VBox/com/defs.h>
 
 /** UIMediumDefs namespace. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -31 +31 @@
 /* COM includes: */
 #include "COMEnums.h"
+
+/* Other VBox includes: */
+#include "VBox/com/ptr.h"
 
 /* Forward declarations: */