diff options
| author | renatofilho <renato.filho@openbossa.org> | 2010-10-15 19:01:58 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:07:21 -0300 |
| commit | c1ef5a79d14b598e7b0027be2922b23a78e57c02 (patch) | |
| tree | facae7f75e2a8d086fde9dc708ab0d2df5997cc5 /generator | |
| parent | 894d7c725bc103919d38a6a491852e8cfc255d7d (diff) | |
Fixed namespace lookup during the class generation.
fixes bug #414.
Reviewer: Hugo Parente Lima <hugo.pl@gmail.com>
Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/cppgenerator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp index 1ad7a2d16..79cabeadf 100644 --- a/generator/cppgenerator.cpp +++ b/generator/cppgenerator.cpp @@ -533,7 +533,7 @@ void CppGenerator::writeVirtualMethodNative(QTextStream &s, const AbstractMetaFu s << INDENT << THREAD_STATE_SAVER_VAR ".save();" << endl; } - s << INDENT << "return this->" << func->implementingClass()->qualifiedCppName() << "::"; + s << INDENT << "return this->::" << func->implementingClass()->qualifiedCppName() << "::"; writeFunctionCall(s, func, Generator::VirtualCall); } } @@ -2041,7 +2041,7 @@ void CppGenerator::writeMethodCall(QTextStream& s, const AbstractMetaFunction* f if (!func->isStatic()) mc << CPP_SELF_VAR "->"; if (!func->isAbstract()) - mc << func->ownerClass()->qualifiedCppName() << "::"; + mc << "::" << func->ownerClass()->qualifiedCppName() << "::"; mc << func->originalName(); #else if (!func->isStatic()) { @@ -2050,7 +2050,7 @@ void CppGenerator::writeMethodCall(QTextStream& s, const AbstractMetaFunction* f mc << CPP_SELF_VAR << (func->isProtected() ? ")" : "") << "->"; } if (!func->isAbstract()) - mc << (func->isProtected() ? wrapperName(func->ownerClass()) : func->ownerClass()->qualifiedCppName()) << "::"; + mc << (func->isProtected() ? wrapperName(func->ownerClass()) : "::" + func->ownerClass()->qualifiedCppName()) << "::"; mc << func->originalName() << (func->isProtected() ? "_protected" : ""); #endif } else { @@ -3077,7 +3077,7 @@ void CppGenerator::writeSignalInitialization(QTextStream& s, const AbstractMetaC if ((cppSignature != originalSignature) && !knowTypes.contains(originalSignature)) { knowTypes << originalSignature; - s << INDENT << "Shiboken::TypeResolver::createValueTypeResolver<" + s << INDENT << "Shiboken::TypeResolver::createValueTypeResolver<" << cppSignature << " >" << "(\"" << originalSignature << "\");\n"; } |