diff options
Diffstat (limited to 'sources/pyside6')
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtcore.cpp | 8 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/dynamicqmetaobject.cpp | 2 | ||||
| -rw-r--r-- | sources/pyside6/libpysideremoteobjects/pysidedynamicclass.cpp | 12 |
3 files changed, 12 insertions, 10 deletions
diff --git a/sources/pyside6/PySide6/glue/qtcore.cpp b/sources/pyside6/PySide6/glue/qtcore.cpp index 8e2061091..7fe6e9902 100644 --- a/sources/pyside6/PySide6/glue/qtcore.cpp +++ b/sources/pyside6/PySide6/glue/qtcore.cpp @@ -1049,8 +1049,8 @@ if (msec == 0) { // %FUNCTION_NAME() - disable generation of c++ function call Shiboken::AutoDecRef emptyTuple(PyTuple_New(0)); auto *timerType = Shiboken::SbkType<QTimer>(); - auto newFunc = reinterpret_cast<newfunc>(PepType_GetSlot(timerType, Py_tp_new)); - auto initFunc = reinterpret_cast<initproc>(PepType_GetSlot(timerType, Py_tp_init)); + auto newFunc = reinterpret_cast<newfunc>(PyType_GetSlot(timerType, Py_tp_new)); + auto initFunc = reinterpret_cast<initproc>(PyType_GetSlot(timerType, Py_tp_init)); auto *pyTimer = newFunc(Shiboken::SbkType<QTimer>(), emptyTuple, nullptr); initFunc(pyTimer, emptyTuple, nullptr); @@ -1084,8 +1084,8 @@ if (msec == 0) { } else { Shiboken::AutoDecRef emptyTuple(PyTuple_New(0)); auto *timerType = Shiboken::SbkType<QTimer>(); - auto newFunc = reinterpret_cast<newfunc>(PepType_GetSlot(timerType, Py_tp_new)); - auto initFunc = reinterpret_cast<initproc>(PepType_GetSlot(timerType, Py_tp_init)); + auto newFunc = reinterpret_cast<newfunc>(PyType_GetSlot(timerType, Py_tp_new)); + auto initFunc = reinterpret_cast<initproc>(PyType_GetSlot(timerType, Py_tp_init)); auto *pyTimer = newFunc(Shiboken::SbkType<QTimer>(), emptyTuple, nullptr); initFunc(pyTimer, emptyTuple, nullptr); diff --git a/sources/pyside6/libpyside/dynamicqmetaobject.cpp b/sources/pyside6/libpyside/dynamicqmetaobject.cpp index ace83a17c..f3878b6e1 100644 --- a/sources/pyside6/libpyside/dynamicqmetaobject.cpp +++ b/sources/pyside6/libpyside/dynamicqmetaobject.cpp @@ -667,7 +667,7 @@ void MetaObjectBuilderPrivate::parsePythonType(PyTypeObject *type) const int index = m_baseObject->indexOfProperty(name); if (index == -1) addProperty(name, value); - } else if (PepType_GetSlot(Py_TYPE(value), Py_tp_call) != nullptr) { + } else if (PyType_GetSlot(Py_TYPE(value), Py_tp_call) != nullptr) { // PYSIDE-198: PyFunction_Check does not work with Nuitka. // Register slots. if (PyObject_HasAttr(value, slotAttrName)) { diff --git a/sources/pyside6/libpysideremoteobjects/pysidedynamicclass.cpp b/sources/pyside6/libpysideremoteobjects/pysidedynamicclass.cpp index 8f685713c..d0b2bfb96 100644 --- a/sources/pyside6/libpysideremoteobjects/pysidedynamicclass.cpp +++ b/sources/pyside6/libpysideremoteobjects/pysidedynamicclass.cpp @@ -71,7 +71,8 @@ struct SourceDefs static int tp_init(PyObject *self, PyObject *args, PyObject *kwds) { - static initproc initFunc = reinterpret_cast<initproc>(PepType_GetSlot(getSbkType(), Py_tp_init)); + static initproc initFunc = reinterpret_cast<initproc>(PyType_GetSlot(getSbkType(), + Py_tp_init)); int res = initFunc(self, args, kwds); if (res < 0) { PyErr_Print(); @@ -223,7 +224,7 @@ struct ReplicaDefs static int tp_init(PyObject *self, PyObject *args, PyObject *kwds) { - static initproc initFunc = reinterpret_cast<initproc>(PepType_GetSlot(getSbkType(), + static initproc initFunc = reinterpret_cast<initproc>(PyType_GetSlot(getSbkType(), Py_tp_init)); QRemoteObjectReplica *replica = nullptr; if (PyTuple_Size(args) == 0) { @@ -347,14 +348,15 @@ struct ReplicaDefs static int DynamicType_traverse(PyObject *self, visitproc visit, void *arg) { - auto traverseProc = reinterpret_cast<traverseproc>(PepType_GetSlot(SbkObject_TypeF(), - Py_tp_traverse)); + auto traverseProc = reinterpret_cast<traverseproc>(PyType_GetSlot(SbkObject_TypeF(), + Py_tp_traverse)); return traverseProc(self, visit, arg); } static int DynamicType_clear(PyObject *self) { - auto clearProc = reinterpret_cast<inquiry>(PepType_GetSlot(SbkObject_TypeF(), Py_tp_clear)); + auto clearProc = reinterpret_cast<inquiry>(PyType_GetSlot(SbkObject_TypeF(), + Py_tp_clear)); return clearProc(self); } |
