libpyside: Introduce helper functions for accessing TypeUserData and meta objects

Add helpers with overloads to reduce reinterpret_cast<> and
increase type safety.

Task-number: PYSIDE-784
Change-Id: I334fd7d149a6730094b062dd0371b9a29379d725
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

5 files changed, 56 insertions, 24 deletions

diff --git a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp
index 0b427c251..4e45cfdcc 100644
--- a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp
+++ b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp
@@ -44,6 +44,7 @@
 
 // pyside
 #include <pyside.h>
+#include <pyside_p.h>
 #include <pysideproperty.h>
 
 // auto generated headers
@@ -126,8 +127,7 @@ int PySide::qmlRegisterType(PyObject *pyObj, const char *uri, int versionMajor,
         return -1;
     }
 
-    QMetaObject *metaObject = reinterpret_cast<QMetaObject *>(
-                ObjectType::getTypeUserData(reinterpret_cast<SbkObjectType *>(pyObj)));
+    const QMetaObject *metaObject = PySide::retrieveMetaObject(pyObjType);
     Q_ASSERT(metaObject);
 
     QQmlPrivate::RegisterType type;
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp
index 18bec1001..856e5b92c 100644
--- a/sources/pyside2/libpyside/pyside.cpp
+++ b/sources/pyside2/libpyside/pyside.cpp
@@ -192,9 +192,7 @@ void destroyQCoreApplication()
 
 std::size_t getSizeOfQObject(SbkObjectType* type)
 {
-    using namespace Shiboken::ObjectType;
-    TypeUserData* userData = reinterpret_cast<TypeUserData*>(getTypeUserData(reinterpret_cast<SbkObjectType*>(type)));
-    return userData->cppObjSize;
+    return retrieveTypeUserData(type)->cppObjSize;
 }
 
 void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base, std::size_t cppObjSize)
@@ -214,6 +212,36 @@ void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base, std::si
     PyObject_SetAttrString(reinterpret_cast<PyObject*>(type), "staticMetaObject", pyMetaObject);
 }
 
+TypeUserData *retrieveTypeUserData(SbkObjectType *sbkTypeObj)
+{
+    return reinterpret_cast<TypeUserData *>(Shiboken::ObjectType::getTypeUserData(sbkTypeObj));
+}
+
+TypeUserData *retrieveTypeUserData(PyTypeObject *pyTypeObj)
+{
+    return retrieveTypeUserData(reinterpret_cast<SbkObjectType *>(pyTypeObj));
+}
+
+TypeUserData *retrieveTypeUserData(PyObject *pyObj)
+{
+    auto pyTypeObj = PyType_Check(pyObj)
+        ? reinterpret_cast<PyTypeObject *>(pyObj) : Py_TYPE(pyObj);
+    return retrieveTypeUserData(pyTypeObj);
+}
+
+DynamicQMetaObject *retrieveMetaObject(PyTypeObject *pyTypeObj)
+{
+    TypeUserData *userData = retrieveTypeUserData(pyTypeObj);
+    return userData ? &(userData->mo) : nullptr;
+}
+
+DynamicQMetaObject *retrieveMetaObject(PyObject *pyObj)
+{
+    auto pyTypeObj = PyType_Check(pyObj)
+        ? reinterpret_cast<PyTypeObject *>(pyObj) : Py_TYPE(pyObj);
+    return retrieveMetaObject(pyTypeObj);
+}
+
 void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base)
 {
     initDynamicMetaObject(type, base, 0);
@@ -226,26 +254,22 @@ void initQObjectSubType(SbkObjectType *type, PyObject *args, PyObject * /* kwds
 
     PyObject* bases = PyTuple_GET_ITEM(args, 1);
     int numBases = PyTuple_GET_SIZE(bases);
-    DynamicQMetaObject *baseMo = nullptr;
-    SbkObjectType* qobjBase = 0;
+
+    TypeUserData *userData = nullptr;
 
     for (int i = 0; i < numBases; ++i) {
         PyTypeObject* base = reinterpret_cast<PyTypeObject*>(PyTuple_GET_ITEM(bases, i));
         if (PyType_IsSubtype(base, qObjType)) {
-            void *typeUserData = Shiboken::ObjectType::getTypeUserData(reinterpret_cast<SbkObjectType*>(base));
-            baseMo = &(reinterpret_cast<TypeUserData *>(typeUserData)->mo);
-            qobjBase = reinterpret_cast<SbkObjectType*>(base);
-            baseMo->update();
+            userData = retrieveTypeUserData(base);
             break;
         }
     }
-    if (!baseMo) {
+    if (!userData) {
         qWarning("Sub class of QObject not inheriting QObject!? Crash will happen when using %s.", className.constData());
         return;
     }
-
-    TypeUserData* userData = reinterpret_cast<TypeUserData*>(Shiboken::ObjectType::getTypeUserData(qobjBase));
-    initDynamicMetaObject(type, baseMo, userData->cppObjSize);
+    userData->mo.update();
+    initDynamicMetaObject(type, &userData->mo, userData->cppObjSize);
 }
 
 PyObject* getMetaDataFromQObject(QObject* cppSelf, PyObject* self, PyObject* name)
diff --git a/sources/pyside2/libpyside/pyside_p.h b/sources/pyside2/libpyside/pyside_p.h
index e3039ed0b..66a37fc7a 100644
--- a/sources/pyside2/libpyside/pyside_p.h
+++ b/sources/pyside2/libpyside/pyside_p.h
@@ -40,8 +40,12 @@
 #ifndef PYSIDE_P_H
 #define PYSIDE_P_H
 
+#include <pysidemacros.h>
+
 #include <dynamicqmetaobject.h>
 
+struct SbkObjectType;
+
 namespace PySide
 {
 
@@ -55,6 +59,13 @@ struct TypeUserData
     std::size_t cppObjSize;
 };
 
+TypeUserData *retrieveTypeUserData(SbkObjectType *sbkTypeObj);
+TypeUserData *retrieveTypeUserData(PyTypeObject *pyTypeObj);
+TypeUserData *retrieveTypeUserData(PyObject *pyObj);
+// For QML
+PYSIDE_API DynamicQMetaObject *retrieveMetaObject(PyTypeObject *pyTypeObj);
+PYSIDE_API DynamicQMetaObject *retrieveMetaObject(PyObject *pyObj);
+
 } //namespace PySide
 
 #endif // PYSIDE_P_H
diff --git a/sources/pyside2/libpyside/pysideclassinfo.cpp b/sources/pyside2/libpyside/pysideclassinfo.cpp
index e3a437438..88b2b89f5 100644
--- a/sources/pyside2/libpyside/pysideclassinfo.cpp
+++ b/sources/pyside2/libpyside/pysideclassinfo.cpp
@@ -97,8 +97,7 @@ PyObject *classCall(PyObject *self, PyObject *args, PyObject * /* kw */)
         return 0;
     }
 
-    PyObject* klass;
-    klass = PyTuple_GetItem(args, 0);
+    PyObject *klass = PyTuple_GetItem(args, 0);
     bool validClass = false;
 
     // This will sometimes segfault if you mistakenly use it on a function declaration
@@ -107,10 +106,10 @@ PyObject *classCall(PyObject *self, PyObject *args, PyObject * /* kw */)
         return 0;
     }
 
-    if (Shiboken::ObjectType::checkType(reinterpret_cast<PyTypeObject*>(klass))) {
-        if (void *userData = Shiboken::ObjectType::getTypeUserData(reinterpret_cast<SbkObjectType*>(klass))) {
-            PySide::DynamicQMetaObject &mo = reinterpret_cast<PySide::TypeUserData *>(userData)->mo;
-            mo.addInfo(PySide::ClassInfo::getMap(data));
+    PyTypeObject *klassType = reinterpret_cast<PyTypeObject*>(klass);
+    if (Shiboken::ObjectType::checkType(klassType)) {
+        if (PySide::DynamicQMetaObject *mo = PySide::retrieveMetaObject(klassType)) {
+            mo->addInfo(PySide::ClassInfo::getMap(data));
             pData->m_alreadyWrapped = true;
             validClass = true;
         }
diff --git a/sources/pyside2/libpyside/signalmanager.cpp b/sources/pyside2/libpyside/signalmanager.cpp
index 07160d989..f505fde5a 100644
--- a/sources/pyside2/libpyside/signalmanager.cpp
+++ b/sources/pyside2/libpyside/signalmanager.cpp
@@ -609,9 +609,7 @@ const QMetaObject* SignalManager::retrieveMetaObject(PyObject *self)
         mo = reinterpret_cast<DynamicQMetaObject*>(PyCObject_AsVoidPtr(pyMo));
 #endif
     } else {
-        void *userData = Shiboken::Object::getTypeUserData(reinterpret_cast<SbkObject*>(self));
-        Q_ASSERT(userData);
-        mo = &(reinterpret_cast<TypeUserData *>(userData)->mo);
+        mo = PySide::retrieveMetaObject(self);
     }
 
     mo->update();