[Backport generator] Complete/fix scope for enum class values

(cherry picked from commit MeVisLab/pythonqt@f88bbbb)

Author: usiems

generator/shellgenerator.cpp

@@ -125,6 +125,18 @@ void ShellGenerator::writeTypeInfo(QTextStream &s, const AbstractMetaType *type,
         s << ' ';
 }
 
+namespace {
+  AbstractMetaEnum* findEnumTypeOfClass(const AbstractMetaClass* implementor, const QString& enumName)
+  {
+    for (AbstractMetaEnum* enumType : implementor->enums()) {
+      if (enumType->name() == enumName) {
+        return enumType;
+      }
+    }
+    return nullptr;
+  }
+}
+
 
 void ShellGenerator::writeFunctionArguments(QTextStream &s,
                                             const AbstractMetaFunction *meta_function,
@@ -170,8 +182,20 @@ void ShellGenerator::writeFunctionArguments(QTextStream &s,
               qualifier =  ((EnumTypeEntry *)arg->type()->typeEntry())->qualifier();
             } else if (arg->type()->typeEntry()->isFlags() && expr.indexOf("::") < 0) {
               qualifier = ((FlagsTypeEntry *)arg->type()->typeEntry())->originator()->qualifier();
+            } else if (_currentScope) {
+              int pos = expr.indexOf("::");
+              if (pos > 0) {
+                QString typeName = expr.left(pos);
+                AbstractMetaEnum* enumType = findEnumTypeOfClass(_currentScope, typeName);
+                if (enumType && enumType->typeEntry()->isEnumClass()) {
+                  // prepend original class name, otherwise the new enum type from the wrapper will be used,
+                  // which is not compatible
+                  qualifier = _currentScope->name();
+                }
+              }
             }
-            if (!qualifier.isEmpty()) {
+
+            if (!qualifier.isEmpty() && !expr.startsWith("{")) {
               s << qualifier << "::";
             }
           }
@@ -399,6 +423,13 @@ void ShellGenerator::writeInclude(QTextStream &stream, const Include &inc)
   stream << endl;
 }
 
+const AbstractMetaClass* ShellGenerator::setCurrentScope(const AbstractMetaClass* scope)
+{
+  const AbstractMetaClass* previousScope = _currentScope;
+  _currentScope = scope;
+  return previousScope;
+}
+
 /*!
 Returns true if the given function \a fun is operator>>() or
 operator<<() that streams from/to a Q{Data,Text}Stream, false

generator/shellgenerator.h

@@ -98,8 +98,14 @@ class ShellGenerator : public Generator
 
     static void writeInclude(QTextStream &stream, const Include &inc);
 
+    // this scope is used in writeFunctionArguments
+    const AbstractMetaClass* setCurrentScope(const AbstractMetaClass* scope);
+    const AbstractMetaClass* currentScope() const { return _currentScope; }
+
  protected:
-    PriGenerator *priGenerator;
+    PriGenerator* priGenerator{};
+
+    const AbstractMetaClass* _currentScope{};
 
 };
 

generator/shellheadergenerator.cpp

@@ -100,6 +100,7 @@ static bool field_lessThan(const AbstractMetaField* a, const AbstractMetaField*
 
 void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_class)
 {
+  setCurrentScope(meta_class);
   QString builtIn = ShellGenerator::isBuiltIn(meta_class->name()) ? "_builtin" : "";
   QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri";
   priGenerator->addHeader(pro_file_name, fileNameForClass(meta_class));
@@ -447,7 +448,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
 
   s << "#endif // " << include_block << endl;
 
-
+  setCurrentScope(nullptr);
 }
 
 void ShellHeaderGenerator::writePromoterArgs(AbstractMetaArgumentList& args, QTextStream& s)

generator/shellimplgenerator.cpp

@@ -70,6 +70,8 @@ static void writeHelperCode(QTextStream &, const AbstractMetaClass *)
 
 void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class)
 {
+  setCurrentScope(meta_class);
+
   QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":"";
   QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri";
   priGenerator->addSource(pro_file_name, fileNameForClass(meta_class));
@@ -360,6 +362,8 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
   if (meta_class->qualifiedCppName().contains("Ssl")) {
     s << "#endif"  << endl;
   }
+
+  setCurrentScope(nullptr);
 }
 
 void ShellImplGenerator::writeInjectedCode(QTextStream &s, const AbstractMetaClass *meta_class)