improved handling of qualified virtual calls

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

Author: florianlink

generator/abstractmetalang.cpp

@@ -696,18 +696,6 @@ QString AbstractMetaFunction::targetLangSignature(bool minimal) const
 
     // Attributes...
     if (!minimal) {
-#if 0 // jambi
-        if (isPublic()) s += "public ";
-        else if (isProtected()) s += "protected ";
-        else if (isPrivate()) s += "private ";
-
-//     if (isNative()) s += "native ";
-//     else
-        if (isFinalInTargetLang()) s += "final ";
-        else if (isAbstract()) s += "abstract ";
-
-        if (isStatic()) s += "static ";
-#endif
         // Return type
         if (type())
             s += type()->name() + " ";

generator/shellheadergenerator.cpp

@@ -199,30 +199,32 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c
 
     foreach(AbstractMetaFunction* fun, promoteFunctions) {
       // normal promoter
-      if (fun->isStatic()) {
-        s << "static ";
-      }
-      s << "inline ";
-      writeFunctionSignature(s, fun, 0, "promoted_",
-        Option(IncludeDefaultExpression | OriginalName | UnderscoreSpaces | ProtectedEnumAsInts));
-      s << " { ";
-      QString scriptFunctionName = fun->originalName();
-      AbstractMetaArgumentList args = fun->arguments();
-      if (fun->type()) {
-        s << "return ";
+      if (fun->wasProtected()) {
+        if (fun->isStatic()) {
+          s << "static ";
+        }
+        s << "inline ";
+        writeFunctionSignature(s, fun, 0, "promoted_",
+          Option(IncludeDefaultExpression | OriginalName | UnderscoreSpaces | ProtectedEnumAsInts));
+        s << " { ";
+        QString scriptFunctionName = fun->originalName();
+        AbstractMetaArgumentList args = fun->arguments();
+        if (fun->type()) {
+          s << "return ";
+        }
+        // always do a direct call, since we want to call the real virtual function here
+        s << "this->";
+        s << fun->originalName() << "(";
+        writePromoterArgs(args, s);
+        s << "); }" << endl;
       }
-      // always do a direct call, since we want to call the real virtual function here
-      s << "this->";
-      s << fun->originalName() << "(";
-      writePromoterArgs(args, s);
-      s << "); }" << endl;
     }
 
     foreach(AbstractMetaFunction* fun, promoteFunctions) {
       // qualified promoter for virtual functions
       if (fun->isVirtual()) {
         s << "inline ";
-        writeFunctionSignature(s, fun, 0, "py_qualified_",
+        writeFunctionSignature(s, fun, 0, "py_q_",
           Option(IncludeDefaultExpression | OriginalName | UnderscoreSpaces | ProtectedEnumAsInts));
         s << " { ";
         QString scriptFunctionName = fun->originalName();
@@ -361,7 +363,7 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c
     if (function->isVirtual()) {
       // qualified version that calls the promoter/the qualified version
       s << "   ";
-      writeFunctionSignature(s, function, 0, "py_qualified_",
+      writeFunctionSignature(s, function, 0, "py_q_",
         Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
       s << "{  ";
 
@@ -375,7 +377,7 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c
           s << "&";
         }
       }
-      s << "(((" << promoterClassName(meta_class) << "*)theWrappedObject)->py_qualified_";
+      s << "(((" << promoterClassName(meta_class) << "*)theWrappedObject)->py_q_";
       s << function->originalName() << "(";
       for (int i = 0; i < args.size(); ++i) {
         if (i > 0)

generator/shellimplgenerator.cpp

@@ -294,7 +294,8 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
             s << meta_class->qualifiedCppName() << "::";
           }
         } else {
-          if (fun->wasProtected() || (fun->isVirtual() && meta_class->typeEntry()->shouldCreatePromoter())) {
+          if (fun->wasProtected()) {
+            //|| (fun->isVirtual() && meta_class->typeEntry()->shouldCreatePromoter())) {
             s << " (("  << promoterClassName(meta_class) << "*)theWrappedObject)->promoted_";
           } else {
             s << " theWrappedObject->";