aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/libpyside/pysideweakref.cpp
diff options
context:
space:
mode:
authorChristian Tismer <[email protected]>2022-01-17 13:20:46 +0100
committerChristian Tismer <[email protected]>2022-02-03 18:18:04 +0100
commit5a487a6f9f9861fc14458c770e61c66a63019184 (patch)
tree9af8ca3015ae585905a14bb5597f6309472c7b63 /sources/pyside6/libpyside/pysideweakref.cpp
parentac1dbba1798bc72cf4e71142ec6f647b8b6ae25d (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 <[email protected]>
Diffstat (limited to 'sources/pyside6/libpyside/pysideweakref.cpp')
-rw-r--r--sources/pyside6/libpyside/pysideweakref.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/sources/pyside6/libpyside/pysideweakref.cpp b/sources/pyside6/libpyside/pysideweakref.cpp
index ef34826f2..03086a486 100644
--- a/sources/pyside6/libpyside/pysideweakref.cpp
+++ b/sources/pyside6/libpyside/pysideweakref.cpp
@@ -65,7 +65,7 @@ static PyType_Spec PySideCallableObjectType_spec = {
};
-static PyTypeObject *PySideCallableObjectTypeF()
+static PyTypeObject *PySideCallableObject_TypeF()
{
static auto *type = SbkType_FromSpec(&PySideCallableObjectType_spec);
return type;
@@ -87,12 +87,12 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData)
if (obj == Py_None)
return nullptr;
- if (Py_TYPE(PySideCallableObjectTypeF()) == nullptr) {
- Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type;
- PyType_Ready(PySideCallableObjectTypeF());
+ if (Py_TYPE(PySideCallableObject_TypeF()) == nullptr) {
+ Py_TYPE(PySideCallableObject_TypeF()) = &PyType_Type;
+ PyType_Ready(PySideCallableObject_TypeF());
}
- PyTypeObject *type = PySideCallableObjectTypeF();
+ PyTypeObject *type = PySideCallableObject_TypeF();
PySideCallableObject *callable = PyObject_New(PySideCallableObject, type);
if (!callable || PyErr_Occurred())
return nullptr;