aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/libpyside/pysideweakref.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <[email protected]>2021-03-11 10:42:36 +0100
committerFriedemann Kleint <[email protected]>2021-03-11 15:19:42 +0100
commit146b3cb79c3f0927df3d7c5d9fdc9c67b976051d (patch)
treec2debab92f118f1da0fd4af05a3e72dc254c938a /sources/pyside6/libpyside/pysideweakref.cpp
parent7d602dc46163be603e87b1ef4f8db7b1ab87c1f6 (diff)
libpyside: Fix some clang analzyer warnings
- Use nullptr - Initialize variables - Remove else after return - Remove C-style casts - Avoid constructing QString from const char * - Use emit for signals Change-Id: I6ba8cad51f4b2a22f94996d1a9d8c3ae87c35099 Reviewed-by: Christian Tismer <[email protected]>
Diffstat (limited to 'sources/pyside6/libpyside/pysideweakref.cpp')
-rw-r--r--sources/pyside6/libpyside/pysideweakref.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/sources/pyside6/libpyside/pysideweakref.cpp b/sources/pyside6/libpyside/pysideweakref.cpp
index cd90634bd..bf37bbab7 100644
--- a/sources/pyside6/libpyside/pysideweakref.cpp
+++ b/sources/pyside6/libpyside/pysideweakref.cpp
@@ -52,9 +52,9 @@ typedef struct {
static PyObject *CallableObject_call(PyObject *callable_object, PyObject *args, PyObject *kw);
static PyType_Slot PySideCallableObjectType_slots[] = {
- {Py_tp_call, (void *)CallableObject_call},
- {Py_tp_dealloc, (void *)Sbk_object_dealloc},
- {0, 0}
+ {Py_tp_call, reinterpret_cast<void *>(CallableObject_call)},
+ {Py_tp_dealloc, reinterpret_cast<void *>(Sbk_object_dealloc)},
+ {0, nullptr}
};
static PyType_Spec PySideCallableObjectType_spec = {
"1:PySide.Callable",
@@ -86,10 +86,9 @@ namespace PySide { namespace WeakRef {
PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData)
{
if (obj == Py_None)
- return 0;
+ return nullptr;
- if (Py_TYPE(PySideCallableObjectTypeF()) == 0)
- {
+ if (Py_TYPE(PySideCallableObjectTypeF()) == nullptr) {
Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type;
PyType_Ready(PySideCallableObjectTypeF());
}
@@ -97,11 +96,11 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData)
PyTypeObject *type = PySideCallableObjectTypeF();
PySideCallableObject *callable = PyObject_New(PySideCallableObject, type);
if (!callable || PyErr_Occurred())
- return 0;
+ return nullptr;
PyObject *weak = PyWeakref_NewRef(obj, reinterpret_cast<PyObject *>(callable));
if (!weak || PyErr_Occurred())
- return 0;
+ return nullptr;
callable->weakref_func = func;
callable->user_data = userData;