libpyside: Fix remaining clang-tidy warnings

- Remove else after return/continue/break; unindent code
  or simplify return conditions
- Use isEmpty() to check for empty containers
- Fix C-style casts
- Pass std::size_t by value instead of const ref

Change-Id: Ic997d7c39720c1cd3698c4d750e9cfc1f1654788
Reviewed-by: Christian Tismer <tismer@stackless.com>

9 files changed, 48 insertions, 52 deletions

diff --git a/sources/pyside2/libpyside/dynamicqmetaobject.cpp b/sources/pyside2/libpyside/dynamicqmetaobject.cpp
index af2f416c6..4cc915be7 100644
--- a/sources/pyside2/libpyside/dynamicqmetaobject.cpp
+++ b/sources/pyside2/libpyside/dynamicqmetaobject.cpp
@@ -172,8 +172,8 @@ static int blobSize(QLinkedList<QByteArray> &strings)
 static int aggregateParameterCount(const QList<MethodData> &methods)
 {
    int sum = 0;
-   for (int i = 0; i < methods.size(); ++i)
-      sum += methods.at(i).parameterCount() * 2 + 1; // nb_param*2 (type and names) +1 for return type
+   for (const auto &method : methods)
+      sum += method.parameterCount() * 2 + 1; // nb_param*2 (type and names) +1 for return type
    return sum;
 }
 
@@ -425,9 +425,8 @@ int DynamicQMetaObject::addMethod(QMetaMethod::MethodType mtype, const char* sig
     for (; it != m_d->m_methods.end(); ++it) {
         if ((it->signature() == signature) && (it->methodType() == mtype))
             return m_d->m_methodOffset + counter;
-        else if (!it->isValid()) {
+        if (!it->isValid())
             index = counter;
-        }
         counter++;
     }
 
@@ -601,9 +600,8 @@ void DynamicQMetaObject::parsePythonType(PyTypeObject *type)
                 || baseType == reinterpret_cast<PyTypeObject *>(SbkObject_TypeF())
                 || baseType == reinterpret_cast<PyTypeObject *>(&PyBaseObject_Type)) {
             continue;
-        } else {
-            basesToCheck.append(baseType);
         }
+        basesToCheck.append(baseType);
     }
 
     // Prepend the actual type that we are parsing.
@@ -776,7 +774,7 @@ void DynamicQMetaObject::DynamicQMetaObjectPrivate::updateMetaObject(QMetaObject
     m_nullIndex = registerString("", strings); // register a null string
 
     // Write class info.
-    if (m_info.size()) {
+    if (!m_info.isEmpty()) {
         if (data[3] == 0)
             data[3] = index;
 
@@ -821,7 +819,7 @@ void DynamicQMetaObject::DynamicQMetaObjectPrivate::updateMetaObject(QMetaObject
         PyErr_Clear();
     }
 
-    if (m_methods.size()) {
+    if (!m_methods.empty()) {
         if (data[5] == 0)
             data[5] = index;
 
@@ -829,7 +827,7 @@ void DynamicQMetaObject::DynamicQMetaObjectPrivate::updateMetaObject(QMetaObject
     }
 
     // Write signal/slots parameters.
-    if (m_methods.size()) {
+    if (!m_methods.empty()) {
        for (it = m_methods.begin(); it != m_methods.end(); ++it) {
           QList<QByteArray> paramTypeNames = it->parameterTypes();
           int paramCount = paramTypeNames.size();
diff --git a/sources/pyside2/libpyside/globalreceiverv2.cpp b/sources/pyside2/libpyside/globalreceiverv2.cpp
index 05565e516..428c12294 100644
--- a/sources/pyside2/libpyside/globalreceiverv2.cpp
+++ b/sources/pyside2/libpyside/globalreceiverv2.cpp
@@ -128,11 +128,11 @@ QByteArray DynamicSlotDataV2::hash() const
 QByteArray DynamicSlotDataV2::hash(PyObject* callback)
 {
     Shiboken::GilState gil;
-    if (PyMethod_Check(callback))
+    if (PyMethod_Check(callback)) {
         return  QByteArray::number((qlonglong)PyObject_Hash(PyMethod_GET_FUNCTION(callback)))
               + QByteArray::number((qlonglong)PyObject_Hash(PyMethod_GET_SELF(callback)));
-    else
-        return QByteArray::number((qlonglong)PyObject_Hash(callback));
+    }
+    return QByteArray::number(qlonglong(PyObject_Hash(callback)));
 }
 
 PyObject* DynamicSlotDataV2::callback()
@@ -251,7 +251,7 @@ void GlobalReceiverV2::incRef(const QObject* link)
 
 void GlobalReceiverV2::decRef(const QObject* link)
 {
-    if (m_refs.size() <= 0)
+    if (m_refs.empty())
         return;
 
 
@@ -268,7 +268,7 @@ void GlobalReceiverV2::decRef(const QObject* link)
         }
     }
 
-    if (m_refs.size() == 0)
+    if (m_refs.empty())
         Py_BEGIN_ALLOW_THREADS
         delete this;
         Py_END_ALLOW_THREADS
@@ -328,9 +328,9 @@ int GlobalReceiverV2::qt_metacall(QMetaObject::Call call, int id, void** args)
     }
 
     if (id == DESTROY_SLOT_ID) {
-        if (m_refs.size() == 0)
+        if (m_refs.empty())
             return -1;
-        QObject *obj = *(QObject**)args[1];
+        QObject *obj = *reinterpret_cast<QObject**>(args[1]);
         incRef(); //keep the object live (safe ref)
         m_refs.removeAll(obj); // remove all refs to this object
         decRef(); //remove the safe ref
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp
index d6f4e5a37..07d93bded 100644
--- a/sources/pyside2/libpyside/pyside.cpp
+++ b/sources/pyside2/libpyside/pyside.cpp
@@ -199,7 +199,7 @@ std::size_t getSizeOfQObject(SbkObjectType* type)
     return userData->cppObjSize;
 }
 
-void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base, const std::size_t& cppObjSize)
+void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base, std::size_t cppObjSize)
 {
     //create DynamicMetaObject based on python type
     TypeUserData* userData = new TypeUserData(reinterpret_cast<PyTypeObject*>(type), base);
@@ -297,7 +297,7 @@ PyObject* getMetaDataFromQObject(QObject* cppSelf, PyObject* self, PyObject* nam
                     }
                 }
             }
-            if (signalList.size() > 0) {
+            if (!signalList.empty()) {
                 PyObject* pySignal = reinterpret_cast<PyObject*>(Signal::newObjectFromMethod(self, signalList));
                 PyObject_SetAttr(self, name, pySignal);
                 return pySignal;
@@ -364,7 +364,7 @@ PyObject* getWrapperForQObject(QObject* cppSelf, SbkObjectType* sbk_type)
     // set and check if it's created after the set call
     QVariant existing = cppSelf->property(invalidatePropertyName);
     if (!existing.isValid()) {
-        QSharedPointer<any_t> shared_with_del((any_t*)cppSelf, invalidatePtr);
+        QSharedPointer<any_t> shared_with_del(reinterpret_cast<any_t*>(cppSelf), invalidatePtr);
         cppSelf->setProperty(invalidatePropertyName, QVariant::fromValue(shared_with_del));
         pyOut = reinterpret_cast<PyObject *>(Shiboken::BindingManager::instance().retrieveWrapper(cppSelf));
         if (pyOut) {
diff --git a/sources/pyside2/libpyside/pyside.h b/sources/pyside2/libpyside/pyside.h
index e2e108ed8..d9ae9dcdf 100644
--- a/sources/pyside2/libpyside/pyside.h
+++ b/sources/pyside2/libpyside/pyside.h
@@ -101,7 +101,8 @@ struct initQtMetaType<T, false> {
 };
 
 PYSIDE_DEPRECATED(PYSIDE_API void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base));
-PYSIDE_API void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base, const std::size_t& cppObjSize);
+PYSIDE_API void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base,
+                                      std::size_t cppObjSize);
 PYSIDE_API void initQObjectSubType(SbkObjectType* type, PyObject* args, PyObject* kwds);
 
 /// Return the size in bytes of a type that inherits QObject.
diff --git a/sources/pyside2/libpyside/pysideclassinfo.cpp b/sources/pyside2/libpyside/pysideclassinfo.cpp
index 24a0c642b..645c03011 100644
--- a/sources/pyside2/libpyside/pysideclassinfo.cpp
+++ b/sources/pyside2/libpyside/pysideclassinfo.cpp
@@ -74,9 +74,8 @@ static PyType_Spec PySideClassInfoType_spec = {
 
 PyTypeObject *PySideClassInfoTypeF(void)
 {
-    static PyTypeObject *type = nullptr;
-    if (!type)
-        type = (PyTypeObject *)PyType_FromSpec(&PySideClassInfoType_spec);
+    static PyTypeObject *type =
+        reinterpret_cast<PyTypeObject *>(PyType_FromSpec(&PySideClassInfoType_spec));
     return type;
 }
 
diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp
index 279e09ec1..1929f999a 100644
--- a/sources/pyside2/libpyside/pysideproperty.cpp
+++ b/sources/pyside2/libpyside/pysideproperty.cpp
@@ -173,7 +173,8 @@ int qpropertyTpInit(PyObject* self, PyObject* args, PyObject* kwds)
                                    "designable", "scriptable", "stored", "user",
                                    "constant", "final", 0};
     if (!PyArg_ParseTupleAndKeywords(args, kwds,
-                                     "O|OOOOsObbbbbb:QtCore.QProperty", (char**) kwlist,
+                                     "O|OOOOsObbbbbb:QtCore.QProperty",
+                                     const_cast<char**>(kwlist),
                                      /*OO*/     &type, &(pData->fget),
                                      /*OOO*/    &(pData->fset), &(pData->freset), &(pData->fdel),
                                      /*s*/      &(pData->doc),
@@ -197,14 +198,13 @@ int qpropertyTpInit(PyObject* self, PyObject* args, PyObject* kwds)
         Py_XINCREF(pData->fdel);
         Py_XINCREF(pData->notify);
         return 1;
-    } else {
-        pData->fget = 0;
-        pData->fset = 0;
-        pData->freset = 0;
-        pData->fdel = 0;
-        pData->notify = 0;
-        return -1;
     }
+    pData->fget = nullptr;
+    pData->fset = nullptr;
+    pData->freset = nullptr;
+    pData->fdel = nullptr;
+    pData->notify = nullptr;
+    return -1;
 }
 
 void qpropertyDeAlloc(PyObject* self)
@@ -225,10 +225,9 @@ PyObject *qPropertyCall(PyObject *self, PyObject *args, PyObject * /* kw */)
 
         Py_INCREF(self);
         return self;
-    } else {
-        PyErr_SetString(PyExc_TypeError, "Invalid property usage.");
-        return 0;
     }
+    PyErr_SetString(PyExc_TypeError, "Invalid property usage.");
+    return nullptr;
 }
 
 PyObject* qPropertySetter(PyObject* self, PyObject* callback)
@@ -242,10 +241,9 @@ PyObject* qPropertySetter(PyObject* self, PyObject* callback)
 
         Py_INCREF(callback);
         return callback;
-    } else {
-        PyErr_SetString(PyExc_TypeError, "Invalid property setter agument.");
-        return 0;
     }
+    PyErr_SetString(PyExc_TypeError, "Invalid property setter agument.");
+    return nullptr;
 }
 
 PyObject* qPropertyGetter(PyObject* self, PyObject* callback)
@@ -259,10 +257,9 @@ PyObject* qPropertyGetter(PyObject* self, PyObject* callback)
 
         Py_INCREF(callback);
         return callback;
-    } else {
-        PyErr_SetString(PyExc_TypeError, "Invalid property getter agument.");
-        return 0;
     }
+    PyErr_SetString(PyExc_TypeError, "Invalid property getter agument.");
+    return nullptr;
 }
 
 static int qpropertyTraverse(PyObject* self, visitproc visit, void* arg)
diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp
index 2d423a634..2d135e557 100644
--- a/sources/pyside2/libpyside/pysidesignal.cpp
+++ b/sources/pyside2/libpyside/pysidesignal.cpp
@@ -412,8 +412,7 @@ PyObject* signalInstanceConnect(PyObject* self, PyObject* args, PyObject* kwds)
         PyObject* result = PyObject_CallObject(pyMethod, tupleArgs);
         if (result == Py_True || result == Py_False)
             return result;
-        else
-            Py_XDECREF(result);
+        Py_XDECREF(result);
     }
     if (!PyErr_Occurred()) // PYSIDE-79: inverse the logic. A Null return needs an error.
         PyErr_Format(PyExc_RuntimeError, "Failed to connect signal %s.", source->d->signature);
@@ -661,9 +660,10 @@ char* getTypeName(PyObject* type)
                 typeName = strdup("PyObject");
         }
         return typeName;
-    } else if (type == Py_None) { // Must be checked before as Shiboken::String::check accepts Py_None
+    }
+    if (type == Py_None) // Must be checked before as Shiboken::String::check accepts Py_None
         return strdup("void");
-    } else if (Shiboken::String::check(type)) {
+    if (Shiboken::String::check(type)) {
         const char *result = Shiboken::String::toCString(type);
         if (!strcmp(result, "qreal"))
             result = sizeof(qreal) == sizeof(double) ? "double" : "float";
@@ -835,7 +835,7 @@ template<typename T>
 static typename T::value_type join(T t, const char* sep)
 {
     typename T::value_type res;
-    if (!t.size())
+    if (t.isEmpty())
         return res;
 
     typename T::const_iterator it = t.begin();
@@ -894,7 +894,7 @@ void registerSignals(SbkObjectType* pyObj, const QMetaObject* metaObject)
         self->signaturesSize = 0;
         self->signatures = 0;
         self->signatureAttributes = 0;
-        self->initialized = 0;
+        self->initialized = false;
         self->homonymousMethod = 0;
 
         // Empty signatures comes first! So they will be the default signal signature
@@ -949,9 +949,9 @@ QStringList getArgsFromSignature(const char* signature, bool* isShortCircuit)
 
     if (isShortCircuit)
         *isShortCircuit = !qsignature.contains(QLatin1Char('('));
-    if (qsignature.contains(QLatin1String("()")) || qsignature.contains(QLatin1String("(void)"))) {
+    if (qsignature.contains(QLatin1String("()")) || qsignature.contains(QLatin1String("(void)")))
         return result;
-    } else if (qsignature.contains(QLatin1Char('('))) {
+    if (qsignature.contains(QLatin1Char('('))) {
         static QRegExp regex(QLatin1String(".+\\((.*)\\)"));
         //get args types
         QString types = qsignature;
@@ -1047,9 +1047,8 @@ QString codeCallbackName(PyObject* callback, const QString& funcName)
         PyObject* self = PyMethod_GET_SELF(callback);
         PyObject* func = PyMethod_GET_FUNCTION(callback);
         return funcName + QString::number(quint64(self), 16) + QString::number(quint64(func), 16);
-    } else {
-        return funcName + QString::number(quint64(callback), 16);
     }
+    return funcName + QString::number(quint64(callback), 16);
 }
 
 } //namespace Signal
diff --git a/sources/pyside2/libpyside/pysideslot.cpp b/sources/pyside2/libpyside/pysideslot.cpp
index fddff54fa..817857053 100644
--- a/sources/pyside2/libpyside/pysideslot.cpp
+++ b/sources/pyside2/libpyside/pysideslot.cpp
@@ -96,8 +96,10 @@ int slotTpInit(PyObject *self, PyObject *args, PyObject *kw)
     if (emptyTuple == 0)
         emptyTuple = PyTuple_New(0);
 
-    if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore." SLOT_DEC_NAME, (char**) kwlist, &argName, &argResult))
+    if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore." SLOT_DEC_NAME,
+                                     const_cast<char**>(kwlist), &argName, &argResult)) {
         return 0;
+    }
 
     PySideSlot *data = reinterpret_cast<PySideSlot*>(self);
     for(Py_ssize_t i = 0, i_max = PyTuple_Size(args); i < i_max; i++) {
diff --git a/sources/pyside2/libpyside/pysideweakref.cpp b/sources/pyside2/libpyside/pysideweakref.cpp
index 906aafd7c..a0b7f4aaa 100644
--- a/sources/pyside2/libpyside/pysideweakref.cpp
+++ b/sources/pyside2/libpyside/pysideweakref.cpp
@@ -65,7 +65,7 @@ static PyType_Spec PySideCallableObjectType_spec = {
 };
 
 
-static PyTypeObject *PySideCallableObjectTypeF(void)
+static PyTypeObject *PySideCallableObjectTypeF()
 {
     static PyTypeObject *type =
         (PyTypeObject *)PyType_FromSpec(&PySideCallableObjectType_spec);