aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/libpyside/pysideslot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside6/libpyside/pysideslot.cpp')
-rw-r--r--sources/pyside6/libpyside/pysideslot.cpp158
1 files changed, 72 insertions, 86 deletions
diff --git a/sources/pyside6/libpyside/pysideslot.cpp b/sources/pyside6/libpyside/pysideslot.cpp
index cd81a9a39..fa7e89f42 100644
--- a/sources/pyside6/libpyside/pysideslot.cpp
+++ b/sources/pyside6/libpyside/pysideslot.cpp
@@ -1,45 +1,9 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt for Python.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "dynamicqmetaobject_p.h"
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
#include "pysidesignal_p.h"
#include "pysideslot_p.h"
+#include "pysidestaticstrings.h"
#include <shiboken.h>
@@ -54,56 +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 *PySideSlotTypeF()
+static PyTypeObject *PySideSlot_TypeF()
{
- static PyTypeObject *type = reinterpret_cast<PyTypeObject *>(
- 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;
}
@@ -125,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();
@@ -133,12 +113,13 @@ int slotTpInit(PyObject *self, PyObject *args, PyObject *kw)
PyObject *slotCall(PyObject *self, PyObject *args, PyObject * /* kw */)
{
- static PyObject *pySlotName = nullptr;
- PyObject *callback;
- callback = PyTuple_GetItem(args, 0);
+ PyObject *callback = nullptr;
+
+ if (!PyArg_UnpackTuple(args, "Slot.__call__", 1, 1, &callback))
+ return nullptr;
Py_INCREF(callback);
- if (Py_TYPE(callback)->tp_call != nullptr) {
+ if (PyCallable_Check(callback)) {
PySideSlot *data = reinterpret_cast<PySideSlot *>(self);
if (!data->slotData)
@@ -147,32 +128,27 @@ PyObject *slotCall(PyObject *self, PyObject *args, PyObject * /* kw */)
if (data->slotData->name.isEmpty()) {
// PYSIDE-198: Use PyObject_GetAttr instead of PepFunction_GetName to support Nuitka.
AutoDecRef funcName(PyObject_GetAttr(callback, PyMagicName::name()));
- data->slotData->name = String::toCString(funcName);
+ 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 + ')';
- if (!pySlotName)
- pySlotName = String::fromCString(PYSIDE_SLOT_LIST_ATTR);
-
- 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;
data->slotData = nullptr;
- return callback;
}
return callback;
}
@@ -181,17 +157,27 @@ 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)->typing.Callable[...,typing.Optional[str]]",
+ "PySide6.QtCore.Slot(self,*types:type,name:str=nullptr,result:type=nullptr)",
+ "PySide6.QtCore.Slot.__call__(self,function:typing.Callable)->typing.Any",
nullptr}; // Sentinel
void init(PyObject *module)
{
- if (InitSignatureStrings(PySideSlotTypeF(), Slot_SignatureStrings) < 0)
+ if (InitSignatureStrings(PySideSlot_TypeF(), Slot_SignatureStrings) < 0)
return;
- Py_INCREF(PySideSlotTypeF());
- PyModule_AddObject(module, "Slot", reinterpret_cast<PyObject *>(PySideSlotTypeF()));
+ Py_INCREF(PySideSlot_TypeF());
+ PyModule_AddObject(module, "Slot", reinterpret_cast<PyObject *>(PySideSlot_TypeF()));
}
} // namespace PySide::Slot
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 19:08:42 +0000