diff options
| author | Christian Tismer <tismer@stackless.com> | 2022-01-17 13:20:46 +0100 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2022-02-03 18:18:04 +0100 |
| commit | 5a487a6f9f9861fc14458c770e61c66a63019184 (patch) | |
| tree | 9af8ca3015ae585905a14bb5597f6309472c7b63 /sources/pyside6/PySide6 | |
| parent | ac1dbba1798bc72cf4e71142ec6f647b8b6ae25d (diff) | |
PyPySide: Rename interface functions and classes to simplify debugging
The names of certain interface functions are not always
following a simple scheme. Especially it is not easy
to see immediately if we are dealing with a method
of SbkObjectType or SbkObject
Do a few renamings to simplify debugging and make the code
easier to understand. When a function is used in a type spec
and there is no other important reason, it should be named
like
{Py_<tpname>: reinterpret_cast<void *>(<TypeName>_<tpname>)},
Rename also all type functions ending on "TypeF()" to end
in "_TypeF()". This is not always the case.
Examples:
SbkObjectTpNew -> SbkObject_tp_new
SbkObjecttypeTpNew -> SbkObjectType_tp_new
PyClassPropertyTypeF -> PyClassProperty_TypeF
Task-number: PYSIDE-535
Change-Id: Icbd118852f2ee732b55d944ed57c7a8ef7d26139
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6')
4 files changed, 10 insertions, 10 deletions
diff --git a/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp b/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp index 5aa9fde1a..039c4ef25 100644 --- a/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp +++ b/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp @@ -165,7 +165,7 @@ static PyType_Spec QtQml_VolatileBoolType_spec = { QtQml_VolatileBoolType_slots, }; -PyTypeObject *QtQml_VolatileBoolTypeF(void) +PyTypeObject *QtQml_VolatileBool_TypeF(void) { static auto *type = SbkType_FromSpec(&QtQml_VolatileBoolType_spec); return type; @@ -178,13 +178,13 @@ static const char *VolatileBool_SignatureStrings[] = { void initQtQmlVolatileBool(PyObject *module) { - if (InitSignatureStrings(QtQml_VolatileBoolTypeF(), VolatileBool_SignatureStrings) < 0) { + if (InitSignatureStrings(QtQml_VolatileBool_TypeF(), VolatileBool_SignatureStrings) < 0) { PyErr_Print(); qWarning() << "Error initializing VolatileBool type."; return; } - Py_INCREF(QtQml_VolatileBoolTypeF()); - PyModule_AddObject(module, PepType_GetNameStr(QtQml_VolatileBoolTypeF()), - reinterpret_cast<PyObject *>(QtQml_VolatileBoolTypeF())); + Py_INCREF(QtQml_VolatileBool_TypeF()); + PyModule_AddObject(module, PepType_GetNameStr(QtQml_VolatileBool_TypeF()), + reinterpret_cast<PyObject *>(QtQml_VolatileBool_TypeF())); } diff --git a/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.h b/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.h index c67172563..eef66cba3 100644 --- a/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.h +++ b/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.h @@ -42,9 +42,9 @@ #include <sbkpython.h> -PyTypeObject *QtQml_VolatileBoolTypeF(void); +PyTypeObject *QtQml_VolatileBool_TypeF(void); -#define VolatileBool_Check(op) (Py_TYPE(op) == QtQml_VolatileBoolTypeF()) +#define VolatileBool_Check(op) (Py_TYPE(op) == QtQml_VolatileBool_TypeF()) void initQtQmlVolatileBool(PyObject *module); diff --git a/sources/pyside6/PySide6/glue/qtcore.cpp b/sources/pyside6/PySide6/glue/qtcore.cpp index 040de9a95..fbe36efe1 100644 --- a/sources/pyside6/PySide6/glue/qtcore.cpp +++ b/sources/pyside6/PySide6/glue/qtcore.cpp @@ -932,7 +932,7 @@ timerType->tp_init(pyTimer, emptyTuple, nullptr); QTimer * timer = %CONVERTTOCPP[QTimer *](pyTimer); timer->setSingleShot(true); -if (PyObject_TypeCheck(%2, PySideSignalInstanceTypeF())) { +if (PyObject_TypeCheck(%2, PySideSignalInstance_TypeF())) { PySideSignalInstance *signalInstance = reinterpret_cast<PySideSignalInstance *>(%2); Shiboken::AutoDecRef signalSignature(Shiboken::String::fromFormat("2%s", PySide::Signal::getSignature(signalInstance))); Shiboken::AutoDecRef result( diff --git a/sources/pyside6/PySide6/glue/qtstatemachine.cpp b/sources/pyside6/PySide6/glue/qtstatemachine.cpp index 16b096b5d..de3c630ea 100644 --- a/sources/pyside6/PySide6/glue/qtstatemachine.cpp +++ b/sources/pyside6/PySide6/glue/qtstatemachine.cpp @@ -42,7 +42,7 @@ ********************************************************************/ // @snippet qsignaltransition -if (PyObject_TypeCheck(%1, PySideSignalInstanceTypeF())) { +if (PyObject_TypeCheck(%1, PySideSignalInstance_TypeF())) { auto *signalInstance = reinterpret_cast<PySideSignalInstance *>(%PYARG_1); PyObject *dataSource = PySide::Signal::getObject(signalInstance); Shiboken::AutoDecRef obType(PyObject_Type(dataSource)); @@ -75,7 +75,7 @@ if (PySide::SignalManager::registerMetaMethod(%1, signalName.constData(), // since it refers to a name very tied to the generator implementation. // Check bug #362 for more information on this // http://bugs.openbossa.org/show_bug.cgi?id=362 -if (!PyObject_TypeCheck(%1, PySideSignalInstanceTypeF())) +if (!PyObject_TypeCheck(%1, PySideSignalInstance_TypeF())) goto Sbk_%TYPEFunc_%FUNCTION_NAME_TypeError; PySideSignalInstance *signalInstance = reinterpret_cast<PySideSignalInstance *>(%1); auto sender = %CONVERTTOCPP[QObject *](PySide::Signal::getObject(signalInstance)); |