6 files changed, 15 insertions, 16 deletions
diff --git a/sources/shiboken6/libshiboken/basewrapper.cpp b/sources/shiboken6/libshiboken/basewrapper.cpp
index 51c4b918d..4b19a2679 100644
--- a/sources/shiboken6/libshiboken/basewrapper.cpp
+++ b/sources/shiboken6/libshiboken/basewrapper.cpp
@@ -1499,7 +1499,7 @@ bool isValid(PyObject *pyObj)
         return true;
     }
 
-    auto priv = reinterpret_cast<SbkObject *>(pyObj)->d;
+    auto *priv = reinterpret_cast<SbkObject *>(pyObj)->d;
 
     if (!priv->cppObjectCreated && isUserType(pyObj)) {
         PyErr_Format(PyExc_RuntimeError, "'__init__' method of object's base class (%s) not called.",
diff --git a/sources/shiboken6/libshiboken/helper.h b/sources/shiboken6/libshiboken/helper.h
index 63f76cb52..ccd80b2db 100644
--- a/sources/shiboken6/libshiboken/helper.h
+++ b/sources/shiboken6/libshiboken/helper.h
@@ -58,8 +58,7 @@ class ArrayPointer
         ArrayPointer &operator=(const ArrayPointer &) = delete;
         ArrayPointer &operator=(ArrayPointer &&) = delete;
 
-
-        explicit ArrayPointer(Py_ssize_t size) { data = new T[size]; }
+        explicit ArrayPointer(Py_ssize_t size) : data(new T[size]) {}
         T &operator[](Py_ssize_t pos) { return data[pos]; }
         operator T *() const { return data; }
         ~ArrayPointer() { delete[] data; }
diff --git a/sources/shiboken6/libshiboken/sbkconverter.cpp b/sources/shiboken6/libshiboken/sbkconverter.cpp
index 982b8e10b..f97ad5f3c 100644
--- a/sources/shiboken6/libshiboken/sbkconverter.cpp
+++ b/sources/shiboken6/libshiboken/sbkconverter.cpp
@@ -760,8 +760,8 @@ bool checkDictTypes(PyTypeObject *keyType, PyTypeObject *valueType, PyObject *py
     if (!PyDict_Check(pyIn))
         return false;
 
-    PyObject *key;
-    PyObject *value;
+    PyObject *key{};
+    PyObject *value{};
     Py_ssize_t pos = 0;
     while (PyDict_Next(pyIn, &pos, &key, &value)) {
         if (!PyObject_TypeCheck(key, keyType))
@@ -807,8 +807,8 @@ bool convertibleDictTypes(const SbkConverter *keyConverter, bool keyCheckExact,
     assert(pyIn);
     if (!PyDict_Check(pyIn))
         return false;
-    PyObject *key;
-    PyObject *value;
+    PyObject *key{};
+    PyObject *value{};
     Py_ssize_t pos = 0;
     while (PyDict_Next(pyIn, &pos, &key, &value)) {
         if (keyCheckExact) {
@@ -836,8 +836,8 @@ bool convertibleMultiDictTypes(const SbkConverter *keyConverter, bool keyCheckEx
     assert(pyIn);
     if (!PyDict_Check(pyIn))
         return false;
-    PyObject *key;
-    PyObject *values;
+    PyObject *key{};
+    PyObject *values{};
     Py_ssize_t pos = 0;
     while (PyDict_Next(pyIn, &pos, &key, &values)) {
         if (keyCheckExact) {
@@ -904,7 +904,7 @@ SpecificConverter::SpecificConverter(const char *typeName)
     m_converter = getConverter(typeName);
     if (!m_converter)
         return;
-    const Py_ssize_t len = strlen(typeName);
+    const auto len = strlen(typeName);
     char lastChar = typeName[len -1];
     if (lastChar == '&') {
         m_type = ReferenceConversion;
diff --git a/sources/shiboken6/libshiboken/sbkenum.cpp b/sources/shiboken6/libshiboken/sbkenum.cpp
index 12e6aed4a..212fcec86 100644
--- a/sources/shiboken6/libshiboken/sbkenum.cpp
+++ b/sources/shiboken6/libshiboken/sbkenum.cpp
@@ -224,7 +224,7 @@ bool checkType(PyTypeObject *pyTypeObj)
     init_enum();
 
     static PyTypeObject *meta = getPyEnumMeta();
-    return Py_TYPE(pyTypeObj) == reinterpret_cast<PyTypeObject *>(meta);
+    return Py_TYPE(pyTypeObj) == meta;
 }
 
 PyObject *getEnumItemFromValue(PyTypeObject *enumType, EnumValueType itemValue)
diff --git a/sources/shiboken6/libshiboken/sbkstring.cpp b/sources/shiboken6/libshiboken/sbkstring.cpp
index 6053772cf..d2570f48e 100644
--- a/sources/shiboken6/libshiboken/sbkstring.cpp
+++ b/sources/shiboken6/libshiboken/sbkstring.cpp
@@ -23,7 +23,7 @@ bool checkIterableArgument(PyObject *obj)
 static PyObject *initPathLike()
 {
     PyObject *PathLike{};
-    auto osmodule = PyImport_ImportModule("os");
+    auto *osmodule = PyImport_ImportModule("os");
     if (osmodule == nullptr
         || (PathLike = PyObject_GetAttrString(osmodule, "PathLike")) == nullptr) {
         PyErr_Print();
diff --git a/sources/shiboken6/libshiboken/signature/signature.cpp b/sources/shiboken6/libshiboken/signature/signature.cpp
index afd19e486..c3dee51ad 100644
--- a/sources/shiboken6/libshiboken/signature/signature.cpp
+++ b/sources/shiboken6/libshiboken/signature/signature.cpp
@@ -174,7 +174,7 @@ PyObject *GetSignature_Function(PyObject *obfunc, PyObject *modifier)
         Py_RETURN_NONE;
 
     int flags = PyCFunction_GetFlags(obfunc);
-    PyObject *func_kind;
+    PyObject *func_kind{};
     if (PyModule_Check(obtype_mod.object()))
         func_kind = PyName::function();
     else if (flags & METH_CLASS)
@@ -258,7 +258,7 @@ PyObject *get_signature_intern(PyObject *ob, PyObject *modifier)
 
 static PyObject *get_signature(PyObject * /* self */, PyObject *args)
 {
-    PyObject *ob;
+    PyObject *ob{};
     PyObject *modifier = nullptr;
 
     if (!PyArg_ParseTuple(args, "O|O", &ob, &modifier))
@@ -731,14 +731,14 @@ static PyObject *adjustFuncName(const char *func_name)
     // Finally, generate the correct path expression.
     char _buf[250 + 1] = {};
     if (prop_name) {
-        auto _prop_name = String::toCString(prop_name);
+        const auto *_prop_name = String::toCString(prop_name);
         if (is_class_prop)
             snprintf(_buf, sizeof(_buf), "%s.__dict__['%s'].fset", _path, _prop_name);
         else
             snprintf(_buf, sizeof(_buf), "%s.%s.fset", _path, _prop_name);
     }
     else {
-        auto _name = String::toCString(name);
+        const auto *_name = String::toCString(name);
         snprintf(_buf, sizeof(_buf), "%s.%s", _path, _name);
     }
     return String::fromCString(_buf);