libpyside: Remove some C-style casts

Replace by C++ casts.

Change-Id: I8f4fe35a4e1529be307728258acf302e1eb9dfe5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

9 files changed, 28 insertions, 25 deletions

diff --git a/libpyside/dynamicqmetaobject.cpp b/libpyside/dynamicqmetaobject.cpp
index 483d7555..616f435e 100644
--- a/libpyside/dynamicqmetaobject.cpp
+++ b/libpyside/dynamicqmetaobject.cpp
@@ -411,7 +411,7 @@ DynamicQMetaObject::DynamicQMetaObject(const char* className, const QMetaObject*
 
 DynamicQMetaObject::~DynamicQMetaObject()
 {
-    free((char *)(d.stringdata));
+    free(reinterpret_cast<char *>(const_cast<QByteArrayData *>(d.stringdata)));
     free(const_cast<uint*>(d.data));
     delete m_d;
 }
@@ -805,7 +805,8 @@ void DynamicQMetaObject::DynamicQMetaObjectPrivate::updateMetaObject(QMetaObject
 
     // Create the m_metadata string.
     int size = blobSize(strings);
-    char *blob = reinterpret_cast<char *>(realloc((char*)metaObj->d.stringdata, size));
+    char *blob =
+        reinterpret_cast<char *>(realloc(reinterpret_cast<char *>(const_cast<QByteArrayData *>(metaObj->d.stringdata)), size));
     writeStringData(blob, strings);
 
     metaObj->d.stringdata = reinterpret_cast<const QByteArrayData *>(blob);
diff --git a/libpyside/pyside.cpp b/libpyside/pyside.cpp
index a00f19f6..59934286 100644
--- a/libpyside/pyside.cpp
+++ b/libpyside/pyside.cpp
@@ -279,8 +279,9 @@ PyObject* getMetaDataFromQObject(QObject* cppSelf, PyObject* self, PyObject* nam
                     } else {
                         PySideMetaFunction* func = MetaFunction::newObject(cppSelf, i);
                         if (func) {
-                            PyObject_SetAttr(self, name, (PyObject*)func);
-                            return (PyObject*)func;
+                            PyObject *result = reinterpret_cast<PyObject *>(func);
+                            PyObject_SetAttr(self, name, result);
+                            return result;
                         }
                     }
                 }
@@ -341,7 +342,7 @@ static const char invalidatePropertyName[] = "_PySideInvalidatePtr";
 
 PyObject* getWrapperForQObject(QObject* cppSelf, SbkObjectType* sbk_type)
 {
-    PyObject* pyOut = (PyObject*)Shiboken::BindingManager::instance().retrieveWrapper(cppSelf);
+    PyObject* pyOut = reinterpret_cast<PyObject *>(Shiboken::BindingManager::instance().retrieveWrapper(cppSelf));
     if (pyOut) {
         Py_INCREF(pyOut);
         return pyOut;
@@ -354,7 +355,7 @@ PyObject* getWrapperForQObject(QObject* cppSelf, SbkObjectType* sbk_type)
     if (!existing.isValid()) {
         QSharedPointer<any_t> shared_with_del((any_t*)cppSelf, invalidatePtr);
         cppSelf->setProperty(invalidatePropertyName, QVariant::fromValue(shared_with_del));
-        pyOut = (PyObject*)Shiboken::BindingManager::instance().retrieveWrapper(cppSelf);
+        pyOut = reinterpret_cast<PyObject *>(Shiboken::BindingManager::instance().retrieveWrapper(cppSelf));
         if (pyOut) {
             Py_INCREF(pyOut);
             return pyOut;
diff --git a/libpyside/pysideclassinfo.cpp b/libpyside/pysideclassinfo.cpp
index eeb4c33a..a80ed9c5 100644
--- a/libpyside/pysideclassinfo.cpp
+++ b/libpyside/pysideclassinfo.cpp
@@ -157,7 +157,7 @@ static PyObject *classInfoTpNew(PyTypeObject *subtype, PyObject * /* args */, Py
 
     me->d->m_alreadyWrapped = false;
 
-    return (PyObject*) me;
+    return reinterpret_cast<PyObject *>(me);
 }
 
 int classInfoTpInit(PyObject* self, PyObject* args, PyObject* kwds)
@@ -210,7 +210,7 @@ void init(PyObject* module)
         return;
 
     Py_INCREF(&PySideClassInfoType);
-    PyModule_AddObject(module, CLASSINFO_CLASS_NAME, ((PyObject*)&PySideClassInfoType));
+    PyModule_AddObject(module, CLASSINFO_CLASS_NAME, reinterpret_cast<PyObject *>(&PySideClassInfoType));
 }
 
 bool checkType(PyObject* pyObj)
diff --git a/libpyside/pysideconversions.h b/libpyside/pysideconversions.h
index fc5c26c5..ed8002fa 100644
--- a/libpyside/pysideconversions.h
+++ b/libpyside/pysideconversions.h
@@ -91,7 +91,7 @@ struct QtDictConverter
     static inline QtDict toCpp(PyObject* pyobj)
     {
         if (PyObject_TypeCheck(pyobj, Shiboken::SbkType<QtDict>()))
-            return *reinterpret_cast<QtDict*>(Shiboken::Object::cppPointer((SbkObject*)pyobj, Shiboken::SbkType<QtDict>()));
+            return *reinterpret_cast<QtDict *>(Shiboken::Object::cppPointer(reinterpret_cast<SbkObject *>(pyobj), Shiboken::SbkType<QtDict>()));
 
         QtDict result;
 
@@ -168,7 +168,7 @@ struct QtMultiMapConverter
     static inline MultiMap toCpp(PyObject* pyObj)
     {
         if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<MultiMap>()))
-            return *reinterpret_cast<MultiMap*>(Shiboken::Object::cppPointer((SbkObject*)pyObj, Shiboken::SbkType<MultiMap>()));
+            return *reinterpret_cast<MultiMap *>(Shiboken::Object::cppPointer(reinterpret_cast<SbkObject *>(pyObj), Shiboken::SbkType<MultiMap>()));
 
         MultiMap result;
 
@@ -217,7 +217,7 @@ struct QSequenceConverter
     static T toCpp(PyObject* pyobj)
     {
         if (PyObject_TypeCheck(pyobj, Shiboken::SbkType<T>()))
-            return *reinterpret_cast<T*>(Shiboken::Object::cppPointer((SbkObject*)pyobj, Shiboken::SbkType<T>()));
+            return *reinterpret_cast<T *>(Shiboken::Object::cppPointer(reinterpret_cast<SbkObject *>(pyobj), Shiboken::SbkType<T>()));
 
         Shiboken::AutoDecRef fastSequence(PySequence_Fast(pyobj, "Invalid sequence object"));
         T result;
diff --git a/libpyside/pysidemetafunction.cpp b/libpyside/pysidemetafunction.cpp
index 1c0694ea..543569c8 100644
--- a/libpyside/pysidemetafunction.cpp
+++ b/libpyside/pysidemetafunction.cpp
@@ -133,7 +133,7 @@ void init(PyObject* module)
     if (PyType_Ready(&PySideMetaFunctionType) < 0)
         return;
 
-    PyModule_AddObject(module, "MetaFunction", ((PyObject*)&PySideMetaFunctionType));
+    PyModule_AddObject(module, "MetaFunction", reinterpret_cast<PyObject *>(&PySideMetaFunctionType));
 }
 
 PySideMetaFunction* newObject(QObject* source, int methodIndex)
@@ -196,7 +196,7 @@ bool call(QObject* self, int methodIndex, PyObject* args, PyObject** retVal)
                                                   "registered on meta type: %s", typeName.data());
                     break;
                 }
-                methValues[i] = QVariant(typeId, (void*) 0);
+                methValues[i] = QVariant(typeId, static_cast<const void *>(0));
             }
             methArgs[i] = methValues[i].data();
             if (i == 0) // Don't do this for return type
diff --git a/libpyside/pysideproperty.cpp b/libpyside/pysideproperty.cpp
index 3c335d6f..9bdbf387 100644
--- a/libpyside/pysideproperty.cpp
+++ b/libpyside/pysideproperty.cpp
@@ -181,7 +181,7 @@ static PyObject *qpropertyTpNew(PyTypeObject *subtype, PyObject * /* args */, Py
     pData->designable = true;
     pData->scriptable = true;
     pData->stored = true;
-    return (PyObject*) me;
+    return reinterpret_cast<PyObject *>(me);
 }
 
 int qpropertyTpInit(PyObject* self, PyObject* args, PyObject* kwds)
@@ -359,7 +359,7 @@ void init(PyObject* module)
         return;
 
     Py_INCREF(&PySidePropertyType);
-    PyModule_AddObject(module, QPROPERTY_CLASS_NAME, ((PyObject*)&PySidePropertyType));
+    PyModule_AddObject(module, QPROPERTY_CLASS_NAME, reinterpret_cast<PyObject *>(&PySidePropertyType));
 }
 
 bool checkType(PyObject* pyObj)
diff --git a/libpyside/pysidesignal.cpp b/libpyside/pysidesignal.cpp
index e0aba2f3..174442e8 100644
--- a/libpyside/pysidesignal.cpp
+++ b/libpyside/pysidesignal.cpp
@@ -566,7 +566,7 @@ void init(PyObject* module)
         return;
 
     Py_INCREF(&PySideSignalType);
-    PyModule_AddObject(module, SIGNAL_CLASS_NAME, ((PyObject*)&PySideSignalType));
+    PyModule_AddObject(module, SIGNAL_CLASS_NAME, reinterpret_cast<PyObject *>(&PySideSignalType));
 
     if (PyType_Ready(&PySideSignalInstanceType) < 0)
         return;
@@ -591,7 +591,7 @@ void updateSourceObject(PyObject* source)
 
     while (PyDict_Next(objType->tp_dict, &pos, &key, &value)) {
         if (PyObject_TypeCheck(value, &PySideSignalType)) {
-            Shiboken::AutoDecRef signalInstance((PyObject*)PyObject_New(PySideSignalInstance, &PySideSignalInstanceType));
+            Shiboken::AutoDecRef signalInstance(reinterpret_cast<PyObject *>(PyObject_New(PySideSignalInstance, &PySideSignalInstanceType)));
             instanceInitialize(signalInstance.cast<PySideSignalInstance*>(), key, reinterpret_cast<PySideSignal*>(value), source, 0);
             PyObject_SetAttr(source, key, signalInstance);
         }
@@ -859,7 +859,7 @@ void registerSignals(SbkObjectType* pyObj, const QMetaObject* metaObject)
             appendSignature(self, strdup(j->constData()));
 
         _addSignalToWrapper(pyObj, it.key(), self);
-        Py_DECREF((PyObject*) self);
+        Py_DECREF(reinterpret_cast<PyObject *>(self));
     }
 }
 
@@ -928,9 +928,10 @@ QString getCallbackSignature(const char* signal, QObject* receiver, PyObject* ca
         useSelf = isMethod;
         numArgs = objCode->co_flags & CO_VARARGS ? -1 : objCode->co_argcount;
     } else if (PyCFunction_Check(callback)) {
-        functionName = ((PyCFunctionObject*)callback)->m_ml->ml_name;
-        useSelf = ((PyCFunctionObject*)callback)->m_self;
-        int flags = ((PyCFunctionObject*)callback)->m_ml->ml_flags;
+        const PyCFunctionObject *funcObj = reinterpret_cast<const PyCFunctionObject *>(callback);
+        functionName = funcObj->m_ml->ml_name;
+        useSelf = funcObj->m_self;
+        const int flags = funcObj->m_ml->ml_flags;
 
         if (receiver) {
             //Search for signature on metaobject
diff --git a/libpyside/pysideslot.cpp b/libpyside/pysideslot.cpp
index db33dd0d..c562e41e 100644
--- a/libpyside/pysideslot.cpp
+++ b/libpyside/pysideslot.cpp
@@ -213,7 +213,7 @@ void init(PyObject* module)
         return;
 
     Py_INCREF(&PySideSlotType);
-    PyModule_AddObject(module, SLOT_DEC_NAME, ((PyObject*)&PySideSlotType));
+    PyModule_AddObject(module, SLOT_DEC_NAME, reinterpret_cast<PyObject *>(&PySideSlotType));
 }
 
 } // namespace Slot
diff --git a/libpyside/pysideweakref.cpp b/libpyside/pysideweakref.cpp
index 3223d06b..dfbf9e90 100644
--- a/libpyside/pysideweakref.cpp
+++ b/libpyside/pysideweakref.cpp
@@ -102,7 +102,7 @@ static PyTypeObject PySideCallableObjectType = {
 
 static PyObject *CallableObject_call(PyObject *callable_object, PyObject *args, PyObject * /* kw */)
 {
-    PySideCallableObject* obj = (PySideCallableObject*)(callable_object);
+    PySideCallableObject* obj = reinterpret_cast<PySideCallableObject *>(callable_object);
     obj->weakref_func(obj->user_data);
 
     Py_XDECREF(PyTuple_GET_ITEM(args, 0)); //kill weak ref object
@@ -126,7 +126,7 @@ PyObject* create(PyObject* obj, PySideWeakRefFunction func, void* userData)
     if (!callable || PyErr_Occurred())
         return 0;
 
-    PyObject* weak = PyWeakref_NewRef(obj, (PyObject*)callable);
+    PyObject* weak = PyWeakref_NewRef(obj, reinterpret_cast<PyObject *>(callable));
     if (!weak || PyErr_Occurred())
         return 0;
 
@@ -134,7 +134,7 @@ PyObject* create(PyObject* obj, PySideWeakRefFunction func, void* userData)
     callable->user_data = userData;
     Py_DECREF(callable); // PYSIDE-79: after decref the callable is undefined (theoretically)
 
-    return (PyObject*)weak;
+    return reinterpret_cast<PyObject *>(weak);
 }
 
 } }  //namespace