diff options
| -rw-r--r-- | headergenerator.cpp | 31 | ||||
| -rw-r--r-- | headergenerator.h | 1 |
2 files changed, 0 insertions, 32 deletions
diff --git a/headergenerator.cpp b/headergenerator.cpp index 6b3ec40af..b9d5c2404 100644 --- a/headergenerator.cpp +++ b/headergenerator.cpp @@ -134,38 +134,7 @@ void HeaderGenerator::writeFunction(QTextStream& s, const AbstractMetaFunction* // TODO: when modified an abstract method ceases to be virtual but stays abstract //if (func->isModifiedRemoved() && func->isAbstract()) { //} - - // TODO: APIExtractor: strange that something that is abstract couldn't be considered virtual too. - if (func->isVirtual() && !func->isAbstract() && !func->isConstructor() && - !func->ownerClass()->hasPrivateDestructor() && - func->implementingClass() == func->ownerClass()) { - writeVirtualDispatcher(s, func); - } - } -} - -void HeaderGenerator::writeVirtualDispatcher(QTextStream& s, const AbstractMetaFunction* func) const -{ - QString returnKeyword = func->type() ? QLatin1String("return ") : QString(); - s << INDENT << "static " << signatureForDefaultVirtualMethod(func, "", "_dispatcher") << " {" << endl; - { - Indentation indentation(INDENT); - s << INDENT << returnKeyword; - if (func->isModifiedRemoved() && func->isAbstract()) { - if (func->type() - && (func->type()->isObject() - || func->type()->isQObject() - || func->type()->name() == "void")) - s << "0"; - else - s << functionReturnType(func) << "()"; - } else { - s << "self." << func->implementingClass()->qualifiedCppName() << "::"; - writeFunctionCall(s, func); - } - s << ';' << endl; } - s << INDENT << '}' << endl; } void HeaderGenerator::writeTypeCheckMacro(QTextStream& s, const TypeEntry* type) diff --git a/headergenerator.h b/headergenerator.h index e035b5621..5b26eae2d 100644 --- a/headergenerator.h +++ b/headergenerator.h @@ -41,7 +41,6 @@ private: void writeFunction(QTextStream& s, const AbstractMetaFunction* func) const; void writePureVirtualEmptyImpl(QTextStream& , const AbstractMetaFunction* func) const; void writeDefaultImplementation(QTextStream& s, const AbstractMetaFunction* func) const; - void writeVirtualDispatcher(QTextStream &s, const AbstractMetaFunction *func) const; void writeTypeCheckMacro(QTextStream& s, const TypeEntry* type); void writeExportMacros(QTextStream& s); void writeTypeConverterDecl(QTextStream& s, const TypeEntry* type); |