summaryrefslogtreecommitdiffstats
path: root/generator
diff options
context:
space:
mode:
authorrenatofilho <renato.filho@openbossa.org>2010-10-15 19:01:58 -0300
committerrenatofilho <renato.filho@openbossa.org>2010-10-15 19:12:24 -0300
commit9078b47fcc5fec2d80a242e8a8f494b5b4c4efd1 (patch)
tree6a99d67a22e3754e164861faf82e555856e754ff /generator
parentb548f03130cdd2aa7bdcb4bf00f5da8240fc78ee (diff)
downloadshiboken-9078b47fcc5fec2d80a242e8a8f494b5b4c4efd1.tar.gz
shiboken-9078b47fcc5fec2d80a242e8a8f494b5b4c4efd1.tar.xz
shiboken-9078b47fcc5fec2d80a242e8a8f494b5b4c4efd1.zip
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.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 1ad7a2d1..79cabead 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";
}