support meta type based converters for pointer return values as well (e.g. QList<QInputEventMethod::Attribute>*), since wrapper generates * from const& return values

florianlink · florianlink · commit f59400fc0c50 · 2014-09-24T15:18:43.000Z
diff --git a/src/PythonQtConversion.cpp b/src/PythonQtConversion.cpp
@@ -105,7 +105,7 @@ PyObject* PythonQtConv::ConvertQtValueToPython(const PythonQtMethodInfo::Paramet
     // if a converter is registered, we use is:
     PythonQtConvertMetaTypeToPythonCB* converter = _metaTypeToPythonConverters.value(info.typeId);
     if (converter) {
-      return (*converter)(data, info.typeId);
+      return (*converter)(info.pointerCount==0?data:*((void**)data), info.typeId);
     }
   }
 
diff --git a/src/PythonQtMethodInfo.cpp b/src/PythonQtMethodInfo.cpp
@@ -152,7 +152,7 @@ void PythonQtMethodInfo::fillParameterInfo(ParameterInfo& type, const QByteArray
     }
 
     type.typeId = nameToType(name);
-    if ((type.pointerCount == 0) && type.typeId == Unknown) {
+    if (type.typeId == Unknown) {
       type.typeId = QMetaType::type(name.constData());
 #if( QT_VERSION >= QT_VERSION_CHECK(5,0,0) )
       if (type.typeId == QMetaType::UnknownType) {

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ PyObject* PythonQtConv::ConvertQtValueToPython(const PythonQtMethodInfo::Paramet`
`105`	`105`	`// if a converter is registered, we use is:`
`106`	`106`	`PythonQtConvertMetaTypeToPythonCB* converter = _metaTypeToPythonConverters.value(info.typeId);`
`107`	`107`	`if (converter) {`
`108`		`- return (*converter)(data, info.typeId);`
	`108`	`+ return (converter)(info.pointerCount==0?data:((void**)data), info.typeId);`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ void PythonQtMethodInfo::fillParameterInfo(ParameterInfo& type, const QByteArray`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`type.typeId = nameToType(name);`
`155`		`- if ((type.pointerCount == 0) && type.typeId == Unknown) {`
	`155`	`+ if (type.typeId == Unknown) {`
`156`	`156`	`type.typeId = QMetaType::type(name.constData());`
`157`	`157`	`#if( QT_VERSION >= QT_VERSION_CHECK(5,0,0) )`
`158`	`158`	`if (type.typeId == QMetaType::UnknownType) {`