Updated the code injection writer to replace "%TYPE" and "%0" by the

proper values when they are used in a constructor code injection.

1 files changed, 7 insertions, 1 deletions

diff --git a/shibokengenerator.cpp b/shibokengenerator.cpp
index 411c59b37..f5d5b5046 100644
--- a/shibokengenerator.cpp
+++ b/shibokengenerator.cpp
@@ -893,7 +893,10 @@ void ShibokenGenerator::writeCodeSnips(QTextStream& s,
             }
 
             // replace template variable for return variable name
-            code.replace("%0", retvalVariableName());
+            if (func->isConstructor())
+                code.replace("%0", "cptr");
+            else
+                code.replace("%0", retvalVariableName());
 
             // replace template variable for self Python object
             QString pySelf;
@@ -1005,6 +1008,9 @@ void ShibokenGenerator::writeCodeSnips(QTextStream& s,
             }
 #endif
 
+            if (func->isConstructor() && shouldGenerateCppWrapper(func->ownerClass()))
+                code.replace("%TYPE", wrapperName(func->ownerClass()));
+
             replaceTemplateVariables(code, func);
         }