diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-08-28 15:37:45 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-09-05 07:52:47 +0200 |
| commit | a1d389570f78d5bd1fb73cd58678498461555f8e (patch) | |
| tree | 8bca3d128de9813ba392ff09fe930455f3b59c9e /sources/pyside6/libpyside/pysideslot.cpp | |
| parent | 89fd464e6c56deb29d60ef295dbfbbe3b70f0303 (diff) | |
libpyside: Refactor passing slot data between @Slot and MetaObjectBuilder
The slot data required for MetaObjectBuilder were stored in a PyList
set as an attribute on a method. This required concatenating return
type and signature, converting the resulting string to CPython in the
@Slot code and converting it back to QByteArray in MetaObjectBuilder.
To simplify this, introduce a small C++ struct storing the QByteArrays
and store a list of them as a PyCapsule (encapsulating a void *ptr)
which is used as the attribute value.
Task-number: PYSIDE-748
Change-Id: I7f4075f5e828fe543d01e5dfbdc7087905cd004f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside/pysideslot.cpp')
| -rw-r--r-- | sources/pyside6/libpyside/pysideslot.cpp | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/sources/pyside6/libpyside/pysideslot.cpp b/sources/pyside6/libpyside/pysideslot.cpp index 32f629ade..720ce3324 100644 --- a/sources/pyside6/libpyside/pysideslot.cpp +++ b/sources/pyside6/libpyside/pysideslot.cpp @@ -29,6 +29,11 @@ typedef struct extern "C" { +static void slotDataListDestructor(PyObject *o) +{ + delete PySide::Slot::dataListFromCapsule(o); +} + static int slotTpInit(PyObject *, PyObject *, PyObject *); static PyObject *slotCall(PyObject *, PyObject *, PyObject *); @@ -114,22 +119,20 @@ PyObject *slotCall(PyObject *self, PyObject *args, PyObject * /* kw */) data->slotData->name = funcName.isNull() ? "<no name>" : String::toCString(funcName); } const QByteArray returnType = QMetaObject::normalizedType(data->slotData->resultType); - const QByteArray signature = - returnType + ' ' + data->slotData->name + '(' + data->slotData->args + ')'; + const QByteArray signature = data->slotData->name + '(' + data->slotData->args + ')'; - PyObject *pySignature = String::fromCString(signature); - PyObject *signatureList = nullptr; PyObject *pySlotName = PySide::PySideMagicName::slot_list_attr(); + PySide::Slot::DataList *entryList = nullptr; if (PyObject_HasAttr(callback, pySlotName)) { - signatureList = PyObject_GetAttr(callback, pySlotName); + auto *capsule = PyObject_GetAttr(callback, pySlotName); + entryList = PySide::Slot::dataListFromCapsule(capsule); } else { - signatureList = PyList_New(0); - PyObject_SetAttr(callback, pySlotName, signatureList); - Py_DECREF(signatureList); + entryList = new PySide::Slot::DataList{}; + auto *capsule = PyCapsule_New(entryList, nullptr /* name */, slotDataListDestructor); + Py_INCREF(capsule); + PyObject_SetAttr(callback, pySlotName, capsule); } - - PyList_Append(signatureList, pySignature); - Py_DECREF(pySignature); + entryList->append({signature, returnType}); //clear data delete data->slotData; @@ -142,6 +145,15 @@ PyObject *slotCall(PyObject *self, PyObject *args, PyObject * /* kw */) namespace PySide::Slot { +DataList *dataListFromCapsule(PyObject *capsule) +{ + if (capsule != nullptr && PyCapsule_CheckExact(capsule) != 0) { + if (void *v = PyCapsule_GetPointer(capsule, nullptr)) + return reinterpret_cast<DataList *>(v); + } + return nullptr; +} + static const char *Slot_SignatureStrings[] = { "PySide6.QtCore.Slot(self,*types:type,name:str=nullptr,result:type=nullptr)", "PySide6.QtCore.Slot.__call__(self,function:typing.Callable)->typing.Any", |