Improve enum assertions generation.

Make it possible to use enums that are not part of some class and make use
of the class name in the gst-style output if the enum belongs to a class.

1 files changed, 8 insertions, 2 deletions

diff --git a/codegen/generator.cpp b/codegen/generator.cpp
index 3b4a527..6987763 100644
--- a/codegen/generator.cpp
+++ b/codegen/generator.cpp
@@ -106,13 +106,19 @@ void CodeGen::printEnumAssertions(QTextStream& outStream, const Enum & enumDef)
 
     foreach(const QByteArray & value, enumDef.values) {
         outStream << "    BOOST_STATIC_ASSERT(static_cast<int>(";
-        outStream << enumDef.options["class"] << "::" << value;
+        if (enumDef.options.contains("class") && !enumDef.options["class"].isEmpty()) {
+            outStream << enumDef.options["class"] << "::";
+        }
+        outStream << value;
         outStream << ") == static_cast<int>(";
 
         if (enumDef.options.contains("prefix")) {
             outStream << enumDef.options["prefix"];
         } else {
-            outStream << (enumDef.options["namespace"] == "QGst" ? "GST_TYPE_" : "G_TYPE_");
+            outStream << (enumDef.options["namespace"] == "QGst" ? "GST_" : "G_");
+            if (enumDef.options.contains("class") && !enumDef.options["class"].isEmpty()) {
+                outStream << toGstStyle(enumDef.options["class"]) << "_";
+            }
         }
 
         if (enumDef.options.contains(value)) {