jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Increment reference for functions used on QtCore.Property.

Browse source 
Fix bug #899.

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Renato Filho 2011-07-11 18:55:54 -03:00 • committed by Hugo Parente Lima
commit dc5ef0b998
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libpyside/pysideproperty.cpp
View file

@ -169,6 +169,7 @@ int qpropertyTpInit(PyObject* self, PyObject* args, PyObject* kwds)
return 0; return 0;
} }
pData->typeName = PySide::Signal::getTypeName(type); pData->typeName = PySide::Signal::getTypeName(type);
if (!pData->typeName) if (!pData->typeName)
@ -176,17 +177,38 @@ int qpropertyTpInit(PyObject* self, PyObject* args, PyObject* kwds)
else if (pData->constant && (pData->fset || pData->notify)) else if (pData->constant && (pData->fset || pData->notify))
PyErr_SetString(PyExc_TypeError, "A constant property cannot have a WRITE method or a NOTIFY signal."); PyErr_SetString(PyExc_TypeError, "A constant property cannot have a WRITE method or a NOTIFY signal.");
return PyErr_Occurred() ? -1 : 1; if (!PyErr_Occurred()) {
Py_XINCREF(pData->fget);
Py_XINCREF(pData->fset);
Py_XINCREF(pData->freset);
Py_XINCREF(pData->fdel);
Py_XINCREF(pData->notify);
return 1;
} else {
pData->fget = 0;
pData->fset = 0;
pData->freset = 0;
pData->fdel = 0;
pData->notify = 0;
return -1;
}
} }
void qpropertyFree(void *self) void qpropertyFree(void *self)
{ {
PyObject *pySelf = reinterpret_cast<PyObject*>(self); PyObject *pySelf = reinterpret_cast<PyObject*>(self);
PySideProperty *data = reinterpret_cast<PySideProperty*>(self); PySideProperty *data = reinterpret_cast<PySideProperty*>(self);
PySidePropertyPrivate* pData = data->d;
free(data->d->typeName); Py_XDECREF(pData->fget);
free(data->d->doc); Py_XDECREF(pData->fset);
free(data->d->notifySignature); Py_XDECREF(pData->freset);
Py_XDECREF(pData->fdel);
Py_XDECREF(pData->notify);
free(pData->typeName);
free(pData->doc);
free(pData->notifySignature);
delete data->d; delete data->d;
pySelf->ob_type->tp_base->tp_free(self); pySelf->ob_type->tp_base->tp_free(self);
} }