From 2e4e0d4e91c561986a96a08b0dbee53984811155 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 22 Dec 2010 19:46:49 -0300 Subject: Fixed signal register function. Use translated type name as type, and exclude const from containers. Reviewer: Lauro Moura Hugo Parente Lima --- generator/cppgenerator.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'generator') 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()); } } -- cgit v1.2.3