From e34d19b113b6460560de61e5ba40068f91b991ef Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima Date: Thu, 29 Apr 2010 09:02:02 -0300 Subject: Use qualified C++ names on multiple inheritance helper functions. --- cppgenerator.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'cppgenerator.cpp') diff --git a/cppgenerator.cpp b/cppgenerator.cpp index 08a597d66..21994fa9d 100644 --- a/cppgenerator.cpp +++ b/cppgenerator.cpp @@ -1656,13 +1656,14 @@ void CppGenerator::writeMethodCall(QTextStream& s, const AbstractMetaFunction* f QStringList CppGenerator::getAncestorMultipleInheritance(const AbstractMetaClass* metaClass) { QStringList result; - if (!metaClass->baseClassNames().isEmpty()) { - foreach (QString base, metaClass->baseClassNames()) { - result.append(QString("((size_t) static_cast(class_ptr)) - base").arg(base)); - result.append(QString("((size_t) static_cast((%2*)((void*)class_ptr))) - base").arg(base).arg(metaClass->name())); - } - foreach (const AbstractMetaClass* pClass, getBaseClasses(metaClass)) - result.append(getAncestorMultipleInheritance(pClass)); + AbstractMetaClassList baseClases = getBaseClasses(metaClass); + if (!baseClases.isEmpty()) { + foreach (const AbstractMetaClass* baseClass, baseClases) { + result.append(QString("((size_t) static_cast(class_ptr)) - base").arg(baseClass->qualifiedCppName())); + result.append(QString("((size_t) static_cast((%2*)((void*)class_ptr))) - base").arg(baseClass->qualifiedCppName()).arg(metaClass->qualifiedCppName())); + } + foreach (const AbstractMetaClass* baseClass, baseClases) + result.append(getAncestorMultipleInheritance(baseClass)); } return result; } -- cgit v1.2.3