diff options
Diffstat (limited to 'PySide/QtCore/typesystem_core.xml')
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index 186be106a..e64006c0e 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -1519,8 +1519,8 @@ <add-function signature="toPyObject()" return-type="PyObject*"> <inject-code class="target" position="beginning"> uint typeId = %CPPSELF.userType(); - if (typeId == qMetaTypeId<PyObjectHolder>()) { - %PYARG_0 = %CPPSELF.value<PyObjectHolder>(); + if (typeId == qMetaTypeId<PyQt_PyObject>()) { + %PYARG_0 = %CPPSELF.value<PyQt_PyObject>(); } else if (typeId == QVariant::String) { %PYARG_0 = %CONVERTTOPYTHON[QString](%CPPSELF.toString()); } else { @@ -1534,9 +1534,9 @@ if (%CPPSELF.isNull()) { %PYARG_0 = Py_None; Py_INCREF(Py_None); - } else if (%CPPSELF.userType() == qMetaTypeId<PyObjectHolder>()) { + } else if (%CPPSELF.userType() == qMetaTypeId<PyQt_PyObject>()) { // emulate PyQt4 behaviour - PyObject* obj = %CPPSELF.value<PyObjectHolder>(); + PyObject* obj = %CPPSELF.value<PyQt_PyObject>(); if (PySequence_Check(obj)) %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE]("QVariantList"); } @@ -1546,8 +1546,8 @@ </modify-function> <modify-function signature="toList()const"> <inject-code class="target" position="beginning"> - if (%CPPSELF.userType() == qMetaTypeId<PyObjectHolder>()) { - PyObject* val = %CPPSELF.value<PyObjectHolder>(); + if (%CPPSELF.userType() == qMetaTypeId<PyQt_PyObject>()) { + PyObject* val = %CPPSELF.value<PyQt_PyObject>(); if (PySequence_Check(val)) { %PYARG_0 = val; Py_INCREF(val); |