diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-03-15 16:18:52 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:15:17 -0300 |
commit | 663722bb984b9ea03714036f9c1b6f91f4a5931a (patch) | |
tree | 2ac07ec529ab3a7718f12eb82cd521774dcd9836 | |
parent | 6423d561db86debe83247f2581b05d9e7f10a57e (diff) |
Fix bug 706 - "dataChanged signal raise an incorrect TypeError"
Now we directly call qRegisterType for all types.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r-- | generator/cppgenerator.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp index a8bb9ce18..52a2abff5 100644 --- a/generator/cppgenerator.cpp +++ b/generator/cppgenerator.cpp @@ -3499,8 +3499,18 @@ void CppGenerator::writeInitQtMetaTypeFunctionBody(QTextStream& s, const Abstrac const QString className = metaClass->qualifiedCppName(); if (!metaClass->isNamespace()) { // Qt metatypes are registered only on their first use, so we do this now. - const char* star = metaClass->typeEntry()->isObject() ? "*" : ""; - s << INDENT << "PySide::initQtMetaType< ::" << className << star << " >();" << endl; + const char* star = "*"; + if (!metaClass->typeEntry()->isObject()) { + // check if there's a empty ctor + foreach (AbstractMetaFunction* func, metaClass->functions()) { + if (func->isConstructor() && !func->arguments().count()) { + star = ""; + break; + } + } + } + + s << INDENT << "qRegisterMetaType< ::" << className << star << " >(\"" << className << star << "\");" << endl; } foreach (AbstractMetaEnum* metaEnum, metaClass->enums()) { if (!metaEnum->isPrivate() && !metaEnum->isAnonymous()) { |