Fixed argument conversion writer and type translator to handle references to object-types.

1 files changed, 7 insertions, 5 deletions

diff --git a/cppgenerator.cpp b/cppgenerator.cpp
index bda6a26e6..b35defab3 100644
--- a/cppgenerator.cpp
+++ b/cppgenerator.cpp
@@ -753,20 +753,22 @@ void CppGenerator::writeArgumentConversion(QTextStream& s,
                                            QString argName, QString pyArgName,
                                            const AbstractMetaClass* context)
 {
-    if (argType->typeEntry()->isCustom())
+    const TypeEntry* type = argType->typeEntry();
+
+    if (type->isCustom())
         return;
 
     QString typeName;
-    QString baseTypeName = argType->typeEntry()->name();
-    bool isWrappedCppClass = argType->typeEntry()->isValue() || argType->typeEntry()->isObject();
+    QString baseTypeName = type->name();
+    bool isWrappedCppClass = type->isValue() || type->isObject();
     if (isWrappedCppClass)
         typeName = baseTypeName + '*';
     else
         typeName = translateTypeForWrapperMethod(argType, context);
 
-    if (argType->typeEntry()->isContainer()) {
+    if (type->isContainer() || type->isPrimitive()) {
         if (typeName.startsWith("const "))
-            typeName.remove(0, 6);
+            typeName.remove(0, sizeof("const ") / sizeof(char) - 1);
         if (typeName.endsWith("&"))
             typeName.chop(1);
     }