diff options
| author | Renato Filho <renato.filho@openbossa.org> | 2010-04-29 11:10:23 -0300 |
|---|---|---|
| committer | Renato Filho <renato.filho@openbossa.org> | 2010-04-29 14:12:56 -0300 |
| commit | fa4b91e8de101ffb63dcfee6ae95a36e5755fb77 (patch) | |
| tree | 31c8befcba370dabeaef9dcc1c41c28849473d45 /shibokengenerator.cpp | |
| parent | 55e4336840093a118da89602b43b91f36a115344 (diff) | |
Fixed refcount leak on virtual functions args.
Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>,
Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'shibokengenerator.cpp')
| -rw-r--r-- | shibokengenerator.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/shibokengenerator.cpp b/shibokengenerator.cpp index 33c5ad653..7032afddd 100644 --- a/shibokengenerator.cpp +++ b/shibokengenerator.cpp @@ -368,15 +368,16 @@ void ShibokenGenerator::writeToCppConversion(QTextStream& s, const AbstractMetaT s << "toCpp(" << argumentName << ')'; } -QString ShibokenGenerator::getFormatUnitString(const AbstractMetaFunction* func) const +QString ShibokenGenerator::getFormatUnitString(const AbstractMetaFunction* func, bool incRef) const { QString result; + const char objType = (incRef ? 'O' : 'S'); foreach (const AbstractMetaArgument* arg, func->arguments()) { if (func->argumentRemoved(arg->argumentIndex() + 1)) continue; if (!func->typeReplaced(arg->argumentIndex() + 1).isEmpty()) { - result += 'O'; + result += objType; } else if (arg->type()->isQObject() || arg->type()->isObject() || arg->type()->isValue() @@ -384,7 +385,7 @@ QString ShibokenGenerator::getFormatUnitString(const AbstractMetaFunction* func) || arg->type()->isEnum() || arg->type()->isFlags() || arg->type()->isReference()) { - result += 'O'; + result += objType; } else if (arg->type()->isPrimitive()) { const PrimitiveTypeEntry* ptype = (const PrimitiveTypeEntry*) arg->type()->typeEntry(); if (ptype->basicAliasedTypeEntry()) @@ -392,7 +393,7 @@ QString ShibokenGenerator::getFormatUnitString(const AbstractMetaFunction* func) if (m_formatUnits.contains(ptype->name())) result += m_formatUnits[ptype->name()]; else - result += 'O'; + result += objType; } else if (isCString(arg->type())) { result += 'z'; } else { |