generated converters uses 'const' for all Object-Type parameters

1 files changed, 8 insertions, 0 deletions

diff --git a/shibokengenerator.cpp b/shibokengenerator.cpp
index b53a9b97f..5fc41a7b2 100644
--- a/shibokengenerator.cpp
+++ b/shibokengenerator.cpp
@@ -240,6 +240,14 @@ QString ShibokenGenerator::writeBaseConversion(QTextStream& s, const AbstractMet
     } else {
         typeName = translateTypeForWrapperMethod(type, context);
     }
+
+
+    // If the type is an Object (and a pointer) remove its constness
+    // (len("const ") == 6) since it is already inserted for everyone
+    // in the generated converter declaration.
+    if ((type->isQObject() || type->isObject()) && typeName.startsWith("const "))
+        typeName.remove(0, 6);
+
     s << "Shiboken::Converter< " << typeName << " >::";
     return typeName;
 }