Improved template variables to deal with custom types.

When template variable representing a C++ argument (%#) is represents
a custom type it is replaced by the Python argument (%PYARG_#), since
custom types are not converted to C++.

Reviewed by Renato Araújo <renato.filho@openbossa.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/shibokengenerator.cpp b/shibokengenerator.cpp
index 933aca5fa..b0b2aacca 100644
--- a/shibokengenerator.cpp
+++ b/shibokengenerator.cpp
@@ -939,9 +939,13 @@ void ShibokenGenerator::writeCodeSnips(QTextStream& s,
                     }
 
                     if (argReplacement.isEmpty()) {
-                        argReplacement = QString("cpp_arg%1").arg(i - removed);
-                        if (shouldDereferenceArgumentPointer(arg))
-                            argReplacement.prepend("(*").append(')');
+                        if (arg->type()->typeEntry()->isCustom()) {
+                            argReplacement = usePyArgs ? QString("pyargs[%1]").arg(i - removed) : "arg";
+                        } else {
+                            argReplacement = QString("cpp_arg%1").arg(i - removed);
+                            if (shouldDereferenceArgumentPointer(arg))
+                                argReplacement.prepend("(*").append(')');
+                        }
                     }
                 } else {
                     argReplacement = arg->argumentName();