diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-22 16:24:33 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-23 11:24:22 +0100 |
| commit | a34622f8098d67c706148eac506460fc65a6401f (patch) | |
| tree | 806d6edc53e8c86191c5c9905e5965e55398d51e /sources/pyside6/libpyside/pyside.cpp | |
| parent | 5b6e13653509b821a36b473bb3a399304fe571a9 (diff) | |
libpyside6: Add a convenience function to convert a PyObject * to a QObject *
Pick-to: 6.2
Task-number: PYSIDE-1709
Change-Id: I137d7fd3ac84f50bb6a799e27e07b7523d943812
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside6/libpyside/pyside.cpp')
| -rw-r--r-- | sources/pyside6/libpyside/pyside.cpp | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp index cba7a4c38..e3e9128c2 100644 --- a/sources/pyside6/libpyside/pyside.cpp +++ b/sources/pyside6/libpyside/pyside.cpp @@ -654,18 +654,44 @@ bool registerInternalQtConf() return isRegistered; } -bool isQObjectDerived(PyTypeObject *pyType, bool raiseError) { - static PyTypeObject *qobjectType = Shiboken::Conversions::getPythonTypeObject("QObject*"); +static PyTypeObject *qobjectType() +{ + static PyTypeObject * const result = Shiboken::Conversions::getPythonTypeObject("QObject*"); + return result; +} - if (!PyType_IsSubtype(pyType, qobjectType)) { - if (raiseError) - PyErr_Format(PyExc_TypeError, "A type inherited from %s expected, got %s.", - qobjectType->tp_name, pyType->tp_name); - return false; +bool isQObjectDerived(PyTypeObject *pyType, bool raiseError) +{ + const bool result = PyType_IsSubtype(pyType, qobjectType()); + if (!result && raiseError) { + PyErr_Format(PyExc_TypeError, "A type inherited from %s expected, got %s.", + qobjectType()->tp_name, pyType->tp_name); } - return true; + return result; } +QObject *convertToQObject(PyObject *object, bool raiseError) +{ + if (object == nullptr) { + if (raiseError) + PyErr_Format(PyExc_TypeError, "None passed for QObject"); + return nullptr; + } + + if (!isQObjectDerived(Py_TYPE(object), raiseError)) + return nullptr; + + auto *sbkObject = reinterpret_cast<SbkObject*>(object); + auto *ptr = Shiboken::Object::cppPointer(sbkObject, qobjectType()); + if (ptr == nullptr) { + if (raiseError) { + PyErr_Format(PyExc_TypeError, "Conversion of %s to QObject failed.", + Py_TYPE(object)->tp_name); + } + return nullptr; + } + return reinterpret_cast<QObject*>(ptr); +} } //namespace PySide |