Put the QPrivateSignal argument in the args array

Fix for QTBUG-59414
woboq · Mar 13, 2017 · d74de78 · d74de78
1 parent 87084cf
commit d74de78
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/generator.cpp b/src/generator.cpp
@@ -1146,8 +1146,7 @@ void Generator::GenerateSignal(const clang::CXXMethodDecl *MD, int Idx)
     for (uint j = 0 ; j < MD->getNumParams(); ++j) {
         if (j) OS_TemplateHeader << ",";
         OS_TemplateHeader << MD->getParamDecl(j)->getType().getAsString(PrintPolicy);
-        if (!(j == MD->getNumParams() - 1 && HasPrivateSignal(MD)))
-            OS_TemplateHeader << " _t" << (j+1);;
+        OS_TemplateHeader << " _t" << (j+1);;
     }
     OS_TemplateHeader << ")";
     std::string This = "this";
@@ -1160,7 +1159,6 @@ void Generator::GenerateSignal(const clang::CXXMethodDecl *MD, int Idx)
     OS_TemplateHeader << "\n{\n";
     bool IsVoid = ReturnType->isVoidType();
     unsigned int NumParam = MD->getNumParams();
-    if (HasPrivateSignal(MD)) NumParam--;
     if (IsVoid && NumParam == 0) {
         OS_TemplateHeader << "    QMetaObject::activate(" << This << ", &staticMetaObject, " << Idx << ", 0);\n";
     } else {