Fix handling of protected operators

(in this case assignment operators of QEvent-derived classes in Qt6)

Author: usiems

generator/shellheadergenerator.cpp

@@ -222,6 +222,11 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
           // always do a direct call, since we want to call the real virtual function here
           s << "this->";
         }
+        if (fun->originalName() == "operator=") {
+          // make it clear we don't want to call the (automatically generated)
+          // assignment operator of the promoter
+          s << meta_class->qualifiedCppName() << "::";
+        }
         s << fun->originalName() << "(";
         writePromoterArgs(args, s);
         s << "); }" << endl;

generator/shellimplgenerator.cpp

@@ -304,13 +304,13 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
         }
       }
       s << "(";
-      if (scriptFunctionName.startsWith("operator>>")) {
+      if (scriptFunctionName.startsWith("operator>>") && !fun->wasProtected()) {
         s << wrappedObject << " >>" << args.at(0)->argumentName();
-      } else if (scriptFunctionName.startsWith("operator<<")) {
+      } else if (scriptFunctionName.startsWith("operator<<") && !fun->wasProtected()) {
         s << wrappedObject << " <<" << args.at(0)->argumentName();
-      } else if (scriptFunctionName.startsWith("operator[]")) {
+      } else if (scriptFunctionName.startsWith("operator[]") && !fun->wasProtected()) {
         s << wrappedObject << "[" << args.at(0)->argumentName() << "]";
-      } else if (scriptFunctionName.startsWith("operator") && args.size()==1) {
+      } else if (scriptFunctionName.startsWith("operator") && args.size()==1 && !fun->wasProtected()) {
         QString op = scriptFunctionName.mid(8);
         s << wrappedObject << op << " " << args.at(0)->argumentName();
       } else {
@@ -328,7 +328,13 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
             s << " theWrappedObject->";
           }
         }
-        s  << fun->originalName() << "(";
+        if (fun->wasProtected()) {
+          // this is different e.g. for operators
+          s << fun->name() << "(";
+        }
+        else {
+          s << fun->originalName() << "(";
+        }
         for (int i = 0; i < args.size(); ++i) {
           if (i > 0)
             s << ", ";