changed generator to use int instead of protected enums in shell and wrapper class (clang would not compile the previous approach using friend)

git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@353 ea8d5007-eb21-0410-b261-ccb3ea6e24a9

Author: florianlink

generator/generator.h

@@ -83,12 +83,11 @@ class Generator : public QObject
         NoBlockedSlot            = 0x00100000,
 
         SuperCall                = 0x00200000,
-        // These 2 are added for PythonQt
+        // The following options have been added for PythonQt:
         FirstArgIsWrappedObject  = 0x00400000,
         ConvertReferenceToPtr    = 0x00800000,
         UseIndexedName           = 0x01000000,
-
-        GlobalRefJObject         = 0x00100000,
+        ProtectedEnumAsInts      = 0x02000000,
 
         ForceValueType           = ExcludeReference | ExcludeConst
     };

generator/shellgenerator.cpp

@@ -79,7 +79,16 @@ void ShellGenerator::writeTypeInfo(QTextStream &s, const AbstractMetaType *type,
     } else if (te->isFlags()) {
         s << ((FlagsTypeEntry *) te)->originalName();
     } else {
+      if (type->isEnum() && (options & ProtectedEnumAsInts)) {
+        AbstractMetaEnum* enumType = m_classes.findEnum((EnumTypeEntry *)te);
+        if (enumType && enumType->wasProtected()) {
+          s << "int";
+        } else {
+          s << fixCppTypeName(te->qualifiedCppName());
+        }
+      } else {
         s << fixCppTypeName(te->qualifiedCppName());
+      }
     }
 
     if (type->instantiations().size() > 0

generator/shellgenerator.h

@@ -58,15 +58,15 @@ class ShellGenerator : public Generator
         return "generated_cpp/" + cls->package().replace(".", "_") + "/";
     }
 
-    static void writeTypeInfo(QTextStream &s, const AbstractMetaType *type, Option option = NoOption);
-    static void writeFunctionSignature(QTextStream &s, const AbstractMetaFunction *meta_function,
+    void writeTypeInfo(QTextStream &s, const AbstractMetaType *type, Option option = NoOption);
+    void writeFunctionSignature(QTextStream &s, const AbstractMetaFunction *meta_function,
                                 const AbstractMetaClass *implementor = 0,
                                 const QString &name_prefix = QString(),
                                 Option option = NoOption,
                                 const QString &classname_prefix = QString(),
                                 const QStringList &extra_arguments = QStringList(),
                                 int numArguments = -1);
-    static void writeFunctionArguments(QTextStream &s, const AbstractMetaClass* owner, const AbstractMetaArgumentList &arguments,
+    void writeFunctionArguments(QTextStream &s, const AbstractMetaClass* owner, const AbstractMetaArgumentList &arguments,
                                 Option option = NoOption,
                                 int numArguments = -1);
 

generator/shellheadergenerator.cpp

@@ -162,22 +162,44 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c
     s << "class " << promoterClassName(meta_class)
       << " : public " << meta_class->qualifiedCppName() << endl << "{ public:" << endl;
 
-    s << "friend class " << wrapperClassName(meta_class) << ";" << endl;
-
+    AbstractMetaEnumList enums1 = meta_class->enums();
+    qSort(enums1.begin(), enums1.end(), enum_lessThan);
+    foreach(AbstractMetaEnum* enum1, enums1) {
+      if (enum1->wasProtected()) {
+        s << "enum " << enum1->name() << "{" << endl;
+        bool first = true;
+        QString scope = meta_class->qualifiedCppName();
+        foreach(AbstractMetaEnumValue* value, enum1->values()) {
+          if (first) { first = false; }
+          else { s << ", "; }
+          s << "  " << value->name() << " = " << scope << "::" << value->name();
+        }
+        s << "};" << endl;
+      }
+    }
+    
     foreach(AbstractMetaFunction* fun, promoteFunctions) {
       s << "inline ";
       writeFunctionSignature(s, fun, 0, "promoted_",
-        Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
+        Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
       s << " { ";
       QString scriptFunctionName = fun->originalName();
       AbstractMetaArgumentList args = fun->arguments();
-      if (fun->type())
+      if (fun->type()) {
         s << "return ";
+      }
       s << meta_class->qualifiedCppName() << "::";
       s << fun->originalName() << "(";
       for (int i = 0; i < args.size(); ++i) {
-        if (i > 0)
+        if (i > 0) {
           s << ", ";
+        }
+        if (args.at(i)->type()->isEnum()) {
+          AbstractMetaEnum* enumType = m_classes.findEnum((EnumTypeEntry *)args.at(i)->type()->typeEntry());
+          if (enumType && enumType->wasProtected()) {
+            s << "(" << enumType->typeEntry()->qualifiedCppName() << ")";
+          }
+        }
         s << args.at(i)->argumentName();
       }
       s << "); }" << endl;
@@ -291,7 +313,7 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c
     if (!function->isSlot() || function->isVirtual()) {
       s << "   ";
       writeFunctionSignature(s, function, 0, QString(),
-        Option(ConvertReferenceToPtr | FirstArgIsWrappedObject| IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
+        Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
       s << ";" << endl;
     }
   }

generator/shellimplgenerator.cpp

@@ -200,8 +200,9 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
         s << meta_class->qualifiedCppName() << "::";
         s << fun->originalName() << "(";
         for (int i = 0; i < args.size(); ++i) {
-          if (i > 0)
+          if (i > 0) {
             s << ", ";
+          }
           s << args.at(i)->indexedName();
         }
         s << ");";
@@ -242,7 +243,7 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
       continue;
     }
     writeFunctionSignature(s, fun, meta_class, QString(),
-      Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | OriginalName | ShowStatic | UnderscoreSpaces),
+      Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts),
       "PythonQtWrapper_");
     s << endl << "{" << endl;
     s << "  ";