1 files changed, 58 insertions, 36 deletions

diff --git a/sources/pyside6/libpyside/pysideslot.cpp b/sources/pyside6/libpyside/pysideslot.cpp
index 9fdfe489d..fa7e89f42 100644
--- a/sources/pyside6/libpyside/pysideslot.cpp
+++ b/sources/pyside6/libpyside/pysideslot.cpp
@@ -3,6 +3,7 @@
 
 #include "pysidesignal_p.h"
 #include "pysideslot_p.h"
+#include "pysidestaticstrings.h"
 
 #include <shiboken.h>
 
@@ -17,55 +18,69 @@ struct SlotData
     QByteArray name;
     QByteArray args;
     QByteArray resultType;
+    QByteArray tag; // QMetaMethod::tag()
 };
 
-typedef struct
+struct PySideSlot
 {
     PyObject_HEAD
     SlotData *slotData;
-} PySideSlot;
+};
 
 extern "C"
 {
 
+static void slotDataListDestructor(PyObject *o)
+{
+    delete PySide::Slot::dataListFromCapsule(o);
+}
+
 static int slotTpInit(PyObject *, PyObject *, PyObject *);
 static PyObject *slotCall(PyObject *, PyObject *, PyObject *);
 
 // Class Definition -----------------------------------------------
-static PyType_Slot PySideSlotType_slots[] = {
-    {Py_tp_call, reinterpret_cast<void *>(slotCall)},
-    {Py_tp_init, reinterpret_cast<void *>(slotTpInit)},
-    {Py_tp_new, reinterpret_cast<void *>(PyType_GenericNew)},
-    {Py_tp_dealloc, reinterpret_cast<void *>(Sbk_object_dealloc)},
-    {0, nullptr}
-};
-static PyType_Spec PySideSlotType_spec = {
-    "2:PySide6.QtCore.Slot",
-    sizeof(PySideSlot),
-    0,
-    Py_TPFLAGS_DEFAULT,
-    PySideSlotType_slots,
-};
 
+static PyTypeObject *createSlotType()
+{
+    PyType_Slot PySideSlotType_slots[] = {
+        {Py_tp_call, reinterpret_cast<void *>(slotCall)},
+        {Py_tp_init, reinterpret_cast<void *>(slotTpInit)},
+        {Py_tp_new, reinterpret_cast<void *>(PyType_GenericNew)},
+        {Py_tp_dealloc, reinterpret_cast<void *>(Sbk_object_dealloc)},
+        {0, nullptr}
+    };
+
+    PyType_Spec PySideSlotType_spec = {
+        "2:PySide6.QtCore.Slot",
+        sizeof(PySideSlot),
+        0,
+        Py_TPFLAGS_DEFAULT,
+        PySideSlotType_slots,
+    };
+
+    return SbkType_FromSpec(&PySideSlotType_spec);
+}
 
 static PyTypeObject *PySideSlot_TypeF()
 {
-    static auto *type = SbkType_FromSpec(&PySideSlotType_spec);
+    static auto *type = createSlotType();
     return type;
 }
 
 int slotTpInit(PyObject *self, PyObject *args, PyObject *kw)
 {
     static PyObject *emptyTuple = nullptr;
-    static const char *kwlist[] = {"name", "result", nullptr};
+    static const char *kwlist[] = {"name", "result", "tag", nullptr};
     char *argName = nullptr;
     PyObject *argResult = nullptr;
+    char *tag = nullptr;
 
     if (emptyTuple == nullptr)
         emptyTuple = PyTuple_New(0);
 
-    if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore.Slot",
-                                     const_cast<char **>(kwlist), &argName, &argResult)) {
+    if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sOs:QtCore.Slot",
+                                     const_cast<char **>(kwlist),
+                                     &argName, &argResult, &tag)) {
         return -1;
     }
 
@@ -87,6 +102,9 @@ int slotTpInit(PyObject *self, PyObject *args, PyObject *kw)
     if (argName)
         data->slotData->name = argName;
 
+    if (tag)
+        data->slotData->tag = tag;
+
     data->slotData->resultType = argResult
         ? PySide::Signal::getTypeName(argResult) : PySide::Signal::voidType();
 
@@ -95,7 +113,6 @@ int slotTpInit(PyObject *self, PyObject *args, PyObject *kw)
 
 PyObject *slotCall(PyObject *self, PyObject *args, PyObject * /* kw */)
 {
-    static PyObject *pySlotName = nullptr;
     PyObject *callback = nullptr;
 
     if (!PyArg_UnpackTuple(args, "Slot.__call__", 1, 1, &callback))
@@ -114,24 +131,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 + ')';
-
-        if (!pySlotName)
-            pySlotName = String::fromCString(PYSIDE_SLOT_LIST_ATTR);
+        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, data->slotData->tag});
 
         //clear data
         delete data->slotData;
@@ -144,8 +157,17 @@ 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:str=nullptr)",
+    "PySide6.QtCore.Slot(self,*types:type,name:str=nullptr,result:type=nullptr)",
     "PySide6.QtCore.Slot.__call__(self,function:typing.Callable)->typing.Any",
     nullptr}; // Sentinel