GIT_REPOSITORIES/LPP/PythonQt Commit - r19:4f416979f8bf

fixed bad reference counting and borrowed references...

florianlink -

r19:4f416979f8bf

parent child

Context file:

r19:4f416979f8bf

Collapse all files

src/PythonQt.cpp +10 -9

             PythonQtClassInfo* PythonQtPrivate::createPythonQtClassInfo(const QMetaObject* meta, const char* cppClassName, const char* package)
             {
               PythonQtClassInfo* info = new PythonQtClassInfo(meta, cppClassName);
-              PythonQtObjectPtr pack = packageByName(package);
+              PyObject* pack = packageByName(package);
               PyObject* pyobj = (PyObject*)createNewPythonQtClassWrapper(info, package);
               PyModule_AddObject(pack, meta?meta->className():cppClassName, pyobj);
               if (package && strncmp(package,"Qt",2)==0) {
+                // since PyModule_AddObject steals the reference, we need a incref once more...
+                Py_INCREF(pyobj);
                 // put all qt objects into Qt as well
-                PythonQtObjectPtr pack = packageByName("Qt");
+                PyModule_AddObject(packageByName("Qt"), meta?meta->className():cppClassName, pyobj);
-                PyModule_AddObject(pack, meta?meta->className():cppClassName, pyobj);
               }
               info->setPythonQtClassWrapper(pyobj);
               return info;
               Py_DECREF(args);
               Py_DECREF(className);
-              //TODO XXX why is this incref needed? It looks like the types get garbage collected somehow?!
-              Py_INCREF((PyObject*)result);
               return result;
             }
             void PythonQt::initPythonQtModule(bool redirectStdOut)
             {
-              _p->_pythonQtModule.setNewRef(Py_InitModule("PythonQt", PythonQtMethods));
+              _p->_pythonQtModule = Py_InitModule("PythonQt", PythonQtMethods);
               if (redirectStdOut) {
                 PythonQtObjectPtr sys;
               }
             }
-            PythonQtObjectPtr PythonQtPrivate::packageByName(const char* name)
+            PyObject* PythonQtPrivate::packageByName(const char* name)
             {
               if (name==NULL || name[0]==0) {
                 return _pythonQtModule;
               }
-              PythonQtObjectPtr v = _packages.value(name);
+              PyObject* v = _packages.value(name);
               if (!v) {
-                v.setNewRef(PyImport_AddModule((QByteArray("PythonQt.") + name).constData()));
+                v = PyImport_AddModule((QByteArray("PythonQt.") + name).constData());
                 _packages.insert(name, v);
+                // AddObject steals the reference, so increment it!
+                Py_INCREF(v);
                 PyModule_AddObject(_pythonQtModule, name, v);
               }
               return v;

src/PythonQt.h +3 -3

               //! create a new class info and python wrapper type
               PythonQtClassInfo* createPythonQtClassInfo(const QMetaObject* meta, const char* cppClassName, const char* package);
-              //! get/create new package module
+              //! get/create new package module (the returned object is a borrowed reference)
-              PythonQtObjectPtr packageByName(const char* name);
+              PyObject* packageByName(const char* name);
               //! get the wrapper for a given pointer (and remove a wrapper of an already destroyed qobject)
               PythonQtInstanceWrapper* findWrapperAndRemoveUnused(void* obj);
               QHash<QByteArray , PythonQtSlotInfo *> _constructorSlots;
               QHash<QByteArray , PythonQtSlotInfo *> _destructorSlots;
-              QHash<QByteArray, PythonQtObjectPtr> _packages;
+              QHash<QByteArray, PyObject*> _packages;
               PythonQtClassInfo* _currentClassInfoForClassWrapperCreation;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages