aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@openbossa.org>2010-12-22 19:46:49 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:12:50 -0300
commit2e4e0d4e91c561986a96a08b0dbee53984811155 (patch)
treecdb5e432131b087d00c26734d77776177c902086
parent6b1c034faef6a78f7e0681f55203a0fd9774d12d (diff)
Fixed signal register function.
Use translated type name as type, and exclude const from containers. Reviewer: Lauro Moura <lauro.neto@openbossa.org> Hugo Parente Lima <hugo.pl@gmail.com>
-rw-r--r--generator/cppgenerator.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 6e92cd648..4d24416f8 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -3052,8 +3052,11 @@ void CppGenerator::writeSignalInitialization(QTextStream& s, const AbstractMetaC
if ((cppSignature != originalSignature) && !knowTypes.contains(originalSignature)) {
knowTypes << originalSignature;
+ Options opt = NoOption;
+ if (type->isContainer())
+ opt = ExcludeConst;
s << INDENT << "Shiboken::TypeResolver::createValueTypeResolver<"
- << cppSignature << " >"
+ << translateType(type, metaClass, opt) << " >"
<< "(\"" << skipNamespace(originalSignature) << "\"); // " << type->cppSignature() << "\n";
}
signature += skipNamespace(type->originalTypeDescription());
@@ -3682,7 +3685,7 @@ void CppGenerator::finishGeneration()
if (func->isSignal()) {
foreach (AbstractMetaArgument* arg, func->arguments()) {
if (arg->type()->isContainer()) {
- QString value = translateType(arg->type(), metaClass);
+ QString value = translateType(arg->type(), metaClass, ExcludeConst);
typeResolvers << QMetaObject::normalizedType(value.toAscii().constData());
}
}