diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-02-02 14:41:52 -0300 |
|---|---|---|
| committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-02-02 14:49:38 -0200 |
| commit | ebcb5006507381455feb59fb109c437f99169cb8 (patch) | |
| tree | 27f672e877be6e43e1c699535ee2f82fd55c0953 /shibokengenerator.cpp | |
| parent | 8fb11ea5ff063f23785ac4ce7e1f3187ae0aa774 (diff) | |
Fixes ShibokenGenerator::injectedCodeCallsCppFunction.
The function now recognises uses like "... new %TYPE(..." on code
injections as calls to the C++ function.
Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Diffstat (limited to 'shibokengenerator.cpp')
| -rw-r--r-- | shibokengenerator.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/shibokengenerator.cpp b/shibokengenerator.cpp index 83ccbc33c..6c0ab8fd2 100644 --- a/shibokengenerator.cpp +++ b/shibokengenerator.cpp @@ -1019,8 +1019,10 @@ bool ShibokenGenerator::injectedCodeCallsCppFunction(const AbstractMetaFunction* CodeSnipList snips = func->injectedCodeSnips(CodeSnip::Any, TypeSystem::TargetLangCode); foreach (CodeSnip snip, snips) { if (snip.code().contains("%FUNCTION_NAME(") || snip.code().contains(funcCall) - || (func->isConstructor() && func->ownerClass()->isPolymorphic() - && snip.code().contains(wrappedCtorCall))) + || (func->isConstructor() + && (func->ownerClass()->isPolymorphic() && snip.code().contains(wrappedCtorCall)) + || snip.code().contains("new %TYPE(")) + ) return true; } return false; |