diff options
| -rw-r--r-- | generator/cppgenerator.cpp | 12 | ||||
| -rw-r--r-- | tests/libother/otherderived.h | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp index 48b5e6ca..d3300423 100644 --- a/generator/cppgenerator.cpp +++ b/generator/cppgenerator.cpp @@ -3083,20 +3083,14 @@ void CppGenerator::writeSignalInitialization(QTextStream& s, const AbstractMetaC signature += ", "; AbstractMetaArgument *a = cppSignal->arguments().at(i); AbstractMetaType* type = a->type(); - QString cppSignature = translateType(type, metaClass, Generator::ExcludeConst | Generator::ExcludeReference).trimmed(); - QString originalSignature = translateType(type, metaClass, Generator::OriginalName | Generator::ExcludeConst | Generator::ExcludeReference).trimmed(); - if (cppSignature.contains("*")) - cppSignature = cppSignature.replace("*", "").trimmed(); - - if (originalSignature.contains("*")) - originalSignature = originalSignature.replace("*", "").trimmed(); - + QString cppSignature = QMetaObject::normalizedType(qPrintable(type->cppSignature())); + QString originalSignature = QMetaObject::normalizedType(qPrintable(type->originalTypeDescription())); if ((cppSignature != originalSignature) && !knowTypes.contains(originalSignature)) { knowTypes << originalSignature; s << INDENT << "Shiboken::TypeResolver::createValueTypeResolver<" << cppSignature << " >" - << "(\"" << originalSignature << "\");\n"; + << "(\"" << originalSignature << "\"); // " << type->cppSignature() << "\n"; } signature += type->originalTypeDescription(); } diff --git a/tests/libother/otherderived.h b/tests/libother/otherderived.h index 553b14c1..8685f8c0 100644 --- a/tests/libother/otherderived.h +++ b/tests/libother/otherderived.h @@ -49,7 +49,7 @@ public: // factory method static Abstract* createObject(); - void hideFunction(HideType*) {} ; + void hideFunction(HideType*) {} protected: inline const char* getClassName() { return className(); } |