fixed bug that was introduced by refactoring

florianlink · florianlink · commit 856389b84a28 · 2015-01-20T14:07:09.000Z
added ownership handling for QList&lt;SomeObject*&gt;
diff --git a/src/PythonQtConversion.cpp b/src/PythonQtConversion.cpp
@@ -95,7 +95,7 @@ PyObject* PythonQtConv::ConvertQtValueToPython(const PythonQtMethodInfo::Paramet
       listPtr = (QList<void*>*)data;
     }
     if (listPtr) {
-      return ConvertQListOfPointerTypeToPythonList(listPtr, info.innerName);
+      return ConvertQListOfPointerTypeToPythonList(listPtr, info);
     } else {
       return NULL;
     }
@@ -656,7 +656,7 @@ void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& i
              } else {
                ptr = alreadyAllocatedCPPObject;
              }
-             ok = ConvertPythonListToQListOfPointerType(obj, (QList<void*>*)ptr, info.innerName, strict);
+             ok = ConvertPythonListToQListOfPointerType(obj, (QList<void*>*)ptr, info, strict);
              if (ok) {
                return ptr;
              } else {
@@ -1189,7 +1189,7 @@ QVariant PythonQtConv::PyObjToQVariant(PyObject* val, int type)
         if (info.isQList && (info.innerNamePointerCount == 1)) {
           // allocate a default object of the needed type:
           v = QVariant(type, (const void*)NULL);
-          ok = ConvertPythonListToQListOfPointerType(val, (QList<void*>*)v.constData(), info.innerName, true);
+          ok = ConvertPythonListToQListOfPointerType(val, (QList<void*>*)v.constData(), info, true);
           if (!ok) {
             v = QVariant();
           }
@@ -1290,18 +1290,27 @@ PyObject* PythonQtConv::QVariantListToPyObject(const QVariantList& l) {
   return result;
 }
 
-PyObject* PythonQtConv::ConvertQListOfPointerTypeToPythonList(QList<void*>* list, const QByteArray& typeName)
+PyObject* PythonQtConv::ConvertQListOfPointerTypeToPythonList(QList<void*>* list, const PythonQtMethodInfo::ParameterInfo& info)
 {
   PyObject* result = PyTuple_New(list->count());
   int i = 0;
   Q_FOREACH (void* value, *list) {
-    PyTuple_SET_ITEM(result, i, PythonQt::priv()->wrapPtr(value, typeName));
+    PyObject* wrap = PythonQt::priv()->wrapPtr(value, info.innerName);
+    if (wrap) {
+      PythonQtInstanceWrapper* wrapper = (PythonQtInstanceWrapper*)wrap;
+      if (info.passOwnershipToCPP) {
+        wrapper->passOwnershipToCPP();
+      } else if (info.passOwnershipToPython) {
+        wrapper->passOwnershipToPython();
+      }
+    }
+    PyTuple_SET_ITEM(result, i, wrap);
     i++;
   }
   return result;
 }
 
-bool PythonQtConv::ConvertPythonListToQListOfPointerType(PyObject* obj, QList<void*>* list, const QByteArray& type, bool /*strict*/)
+bool PythonQtConv::ConvertPythonListToQListOfPointerType(PyObject* obj, QList<void*>* list, const PythonQtMethodInfo::ParameterInfo& info, bool /*strict*/)
 {
   bool result = false;
   if (PySequence_Check(obj)) {
@@ -1314,9 +1323,16 @@ bool PythonQtConv::ConvertPythonListToQListOfPointerType(PyObject* obj, QList<vo
         if (PyObject_TypeCheck(value, &PythonQtInstanceWrapper_Type)) {
           PythonQtInstanceWrapper* wrap = (PythonQtInstanceWrapper*)value;
           bool ok;
-          void* object = castWrapperTo(wrap, type, ok);
+          void* object = castWrapperTo(wrap, info.innerName, ok);
           Py_XDECREF(value);
           if (ok) {
+            if (object) {
+              if (info.passOwnershipToCPP) {
+                wrap->passOwnershipToCPP();
+              } else if (info.passOwnershipToPython) {
+                wrap->passOwnershipToPython();
+              }
+            }
             list->append(object);
           } else {
             result = false;
diff --git a/src/PythonQtConversion.h b/src/PythonQtConversion.h
@@ -194,9 +194,9 @@ class PYTHONQT_EXPORT PythonQtConv {
   static void* handlePythonToQtAutoConversion(int typeId, PyObject* obj, void* alreadyAllocatedCPPObject);
 
   //! converts the list of pointers of given type to Python
-  static PyObject* ConvertQListOfPointerTypeToPythonList(QList<void*>* list, const QByteArray& type);
+  static PyObject* ConvertQListOfPointerTypeToPythonList(QList<void*>* list, const PythonQtMethodInfo::ParameterInfo& info);
   //! tries to convert the python object to a QList of pointers to \c type objects, returns true on success
-  static bool      ConvertPythonListToQListOfPointerType(PyObject* obj, QList<void*>* list, const QByteArray& type, bool strict);
+  static bool      ConvertPythonListToQListOfPointerType(PyObject* obj, QList<void*>* list, const PythonQtMethodInfo::ParameterInfo& info, bool strict);
 
   //! helper template method for conversion from Python to QVariantMap/Hash
   template <typename Map>
diff --git a/src/PythonQtMethodInfo.cpp b/src/PythonQtMethodInfo.cpp
@@ -130,17 +130,18 @@ void PythonQtMethodInfo::fillParameterInfo(ParameterInfo& type, const QByteArray
       type.passOwnershipToCPP = true;
       name = name.mid(27, len-28);
       len -= 28;
-    }
+    } else
     if (name.startsWith("PythonQtPassOwnershipToPython<")) {
       type.passOwnershipToPython = true;
       name = name.mid(30, len-31);
       len -= 31;
-    }
+    } else
     if (name.startsWith("PythonQtNewOwnerOfThis<")) {
       type.newOwnerOfThis = true;
       name = name.mid(23, len-24);
       len -= 24;
     }
+
     if (strncmp(name.constData(), "const ", 6)==0) {
       name = name.mid(6);
       len -= 6;
diff --git a/src/PythonQtSlot.cpp b/src/PythonQtSlot.cpp
@@ -82,17 +82,21 @@ bool PythonQtCallSlot(PythonQtClassInfo* classInfo, QObject* objectToCall, PyObj
   const PythonQtSlotInfo::ParameterInfo& returnValueParam = params.at(0);
   // set return argument to NULL
   argList[0] = NULL;
-
+  
   bool ok = true;
   bool skipFirst = false;
   PythonQtPassThisOwnershipType passThisOwnership = IgnoreOwnership;
+
   int instanceDecoOffset = 0;
+  // it is important to keep arg1 on this scope, because it is stored in argList[1] and
+  // would go away if it is moved into the if scope
+  void* arg1 = NULL;
   if (info->isInstanceDecorator()) {
     skipFirst = true;
     instanceDecoOffset = 1;
 
     // for decorators on CPP objects, we take the cpp ptr, for QObjects we take the QObject pointer
-    void* arg1 = firstArgument;
+    arg1 = firstArgument;
     if (!arg1) {
       arg1 = objectToCall;
     }
