diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-24 10:59:56 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-24 10:59:56 +0000 |
commit | bbbcc44789a2206c85836fc9656389d00ca7e010 (patch) | |
tree | 348eda42a7fd8bf9be05e23922ce6a550454014c /sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | |
parent | 4a6ecfc1b66252e75e75c6de982ef68e057b625e (diff) | |
parent | 2c3cbe854f921068346ee78f7dda841116230ede (diff) |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
-rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index ef7e24e4c..b17878bd0 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -461,16 +461,16 @@ // tp_base does not always point to the first base class, but rather to the first // that has added any python fields or slots to its object layout. // See https://mail.python.org/pipermail/python-list/2009-January/520733.html - if (PepType(type)->tp_bases) { - for (int i = 0; i < PyTuple_GET_SIZE(PepType(type)->tp_bases); ++i) { - const char *derivedName = QVariant_resolveMetaType((PyTypeObject*)PyTuple_GET_ITEM( - PepType(type)->tp_bases, i), typeId); + if (type->tp_bases) { + for (int i = 0; i < PyTuple_GET_SIZE(type->tp_bases); ++i) { + const char *derivedName = QVariant_resolveMetaType(reinterpret_cast<PyTypeObject *>(PyTuple_GET_ITEM( + type->tp_bases, i)), typeId); if (derivedName) return derivedName; } } - else if (PepType(type)->tp_base) { - return QVariant_resolveMetaType(PepType(type)->tp_base, typeId); + else if (type->tp_base) { + return QVariant_resolveMetaType(type->tp_base, typeId); } } *typeId = 0; @@ -592,7 +592,7 @@ </add-conversion> <add-conversion type="PyTypeObject"> const char *typeName; - if (Shiboken::String::checkType(reinterpret_cast<PyTypeObject*>(%in))) + if (Shiboken::String::checkType(reinterpret_cast<PyTypeObject *>(%in))) typeName = "QString"; else if (%in == reinterpret_cast<PyObject*>(&PyFloat_Type)) typeName = "double"; // float is a UserType in QVariant. @@ -601,7 +601,7 @@ else if (Py_TYPE(%in) == SbkObjectType_TypeF()) typeName = Shiboken::ObjectType::getOriginalName((SbkObjectType*)%in); else - typeName = PepType((reinterpret_cast<PyTypeObject*>(%in)))->tp_name; + typeName = reinterpret_cast<PyTypeObject *>(%in)->tp_name; %out = QVariant::nameToType(typeName); </add-conversion> <add-conversion type="PyString" check="Shiboken::String::check(%in)"> @@ -2687,7 +2687,7 @@ if (aux == NULL) { return NULL; } - QByteArray b(PepType(Py_TYPE(%PYSELF))->tp_name); + QByteArray b(Py_TYPE(%PYSELF)->tp_name); #ifdef IS_PY3K %PYARG_0 = PyUnicode_FromFormat("%s(%R)", b.constData(), aux); #else @@ -3241,8 +3241,8 @@ // %FUNCTION_NAME() - disable generation of c++ function call (void) %2; // remove warning about unused variable Shiboken::AutoDecRef emptyTuple(PyTuple_New(0)); - PyObject *pyTimer = PepType(Shiboken::SbkType<QTimer>())->tp_new(Shiboken::SbkType<QTimer>(), emptyTuple, 0); - PepType(Shiboken::SbkType<QTimer>())->tp_init(pyTimer, emptyTuple, 0); + PyObject *pyTimer = reinterpret_cast<PyTypeObject *>(Shiboken::SbkType<QTimer>())->tp_new(Shiboken::SbkType<QTimer>(), emptyTuple, 0); + reinterpret_cast<PyTypeObject *>(Shiboken::SbkType<QTimer>())->tp_init(pyTimer, emptyTuple, 0); QTimer* timer = %CONVERTTOCPP[QTimer*](pyTimer); Shiboken::AutoDecRef result( @@ -3265,8 +3265,8 @@ <inject-code class="target" position="beginning"> // %FUNCTION_NAME() - disable generation of c++ function call Shiboken::AutoDecRef emptyTuple(PyTuple_New(0)); - PyObject *pyTimer = PepType(Shiboken::SbkType<QTimer>())->tp_new(Shiboken::SbkType<QTimer>(), emptyTuple, 0); - PepType(Shiboken::SbkType<QTimer>())->tp_init(pyTimer, emptyTuple, 0); + PyObject *pyTimer = reinterpret_cast<PyTypeObject *>(Shiboken::SbkType<QTimer>())->tp_new(Shiboken::SbkType<QTimer>(), emptyTuple, 0); + reinterpret_cast<PyTypeObject *>(Shiboken::SbkType<QTimer>())->tp_init(pyTimer, emptyTuple, 0); QTimer* timer = %CONVERTTOCPP[QTimer*](pyTimer); timer->setSingleShot(true); |