removed extra incref on PyObject* that are returned from slots. The ref-count needs to be increased by slots returning a PyObject (or by returning a new PyObject, which already has its initial ref count)

florianlink · florianlink · commit 9619e2497679 · 2015-04-22T08:07:45.000Z
diff --git a/src/PythonQt.cpp b/src/PythonQt.cpp
@@ -519,9 +519,9 @@ PyObject* PythonQtPrivate::wrapPtr(void* ptr, const QByteArray& name, bool passO
     if (!info) {
       // maybe it is a PyObject, which we can return directly
       if (name == "PyObject") {
-        PyObject* p = (PyObject*)ptr;
-        Py_INCREF(p);
-        return p;
+        // do not increment its ref-count, it is the job of the slot returning the value
+        // to ensure an extra ref on return.
+        return (PyObject*)ptr;
       }
 
       // we do not know the metaobject yet, but we might know it by its name:
diff --git a/src/PythonQt.h b/src/PythonQt.h
@@ -75,7 +75,7 @@ typedef void* PythonQtPolymorphicHandlerCB(const void *ptr, const char **class_n
 
 typedef void PythonQtShellSetInstanceWrapperCB(void* object, PythonQtInstanceWrapper* wrapper);
 
-template<class T> void PythonQtSetInstanceWrapperOnShell(void* object, PythonQtInstanceWrapper* wrapper) { 
+template<class T> void PythonQtSetInstanceWrapperOnShell(void* object, PythonQtInstanceWrapper* wrapper) {
   (reinterpret_cast<T*>(object))->_wrapper = wrapper;
 }
 
@@ -133,7 +133,7 @@ class PythonQtNewOwnerOfThis
 
 //! returns the offset that needs to be added to upcast an object of type T1 to T2
 template<class T1, class T2> int PythonQtUpcastingOffset() {
-  return ((reinterpret_cast<char*>(static_cast<T2*>(reinterpret_cast<T1*>(0x100)))) 
+  return ((reinterpret_cast<char*>(static_cast<T2*>(reinterpret_cast<T1*>(0x100))))
           - (reinterpret_cast<char*>(reinterpret_cast<T1*>(0x100))));
 }
 
@@ -396,9 +396,9 @@ class PYTHONQT_EXPORT PythonQt : public QObject {
   //! returns the found callable object or NULL
   //! @return new reference
   PythonQtObjectPtr lookupCallable(PyObject* object, const QString& name);
-  
+
   //! returns the return type of the method of a wrapped c++ object referenced by \c objectname
-  QString getReturnTypeOfWrappedMethod(PyObject* module, const QString& objectname);  
+  QString getReturnTypeOfWrappedMethod(PyObject* module, const QString& objectname);
   //! returns the return type of the method \c methodName of a wrapped c++ type referenced by \c typeName
   QString getReturnTypeOfWrappedMethod(const QString& typeName, const QString& methodName);
   //@}
@@ -533,7 +533,7 @@ class PYTHONQT_EXPORT PythonQt : public QObject {
   //! The error is currently just output to the python stderr, future version might implement better trace printing
   bool handleError();
 
-  //! return \a true if \a handleError() has been called and an error occured.
+  //! return \a true if \a handleError() has been called and an error occurred.
   bool hadError()const;
 
   //! reset error flag. After calling this, hadError() will return false.
@@ -584,9 +584,9 @@ class PYTHONQT_EXPORT PythonQt : public QObject {
 
 private:
   void initPythonQtModule(bool redirectStdOut, const QByteArray& pythonQtModuleName);
-  
+
   QString getReturnTypeOfWrappedMethodHelper(const PythonQtObjectPtr& variableObject, const QString& methodName, const QString& context);
-  
+
   PyObject* getObjectByType(const QString& typeName);
 
   //! callback for stdout redirection, emits pythonStdOut signal
@@ -729,10 +729,10 @@ class PYTHONQT_EXPORT PythonQtPrivate : public QObject {
 
   //! returns the profiling callback, which may be NULL
   PythonQt::ProfilingCB* profilingCB() const { return _profilingCB; }
-  
+
   //! determines the signature of the given callable object (similar as pydoc)
   QString getSignature(PyObject* object);
-  
+
   //! returns true if the object is a method descriptor (same as inspect.ismethoddescriptor() in inspect.py)
   bool isMethodDescriptor(PyObject* object) const;
 
