1 files changed, 55 insertions, 35 deletions

diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp
index b4f7d8771..6e4a3efd4 100644
--- a/sources/pyside2/libpyside/pyside.cpp
+++ b/sources/pyside2/libpyside/pyside.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "pyside.h"
+#include "pyside_p.h"
 #include "signalmanager.h"
 #include "pysideclassinfo_p.h"
 #include "pysideproperty_p.h"
@@ -51,23 +52,24 @@
 #include "destroylistener.h"
 
 #include <autodecref.h>
-#include <qapp_macro.h>
 #include <basewrapper.h>
+#include <bindingmanager.h>
+#include <gilstate.h>
 #include <sbkconverter.h>
 #include <sbkstring.h>
-#include <gilstate.h>
-#include <bindingmanager.h>
+#include <qapp_macro.h>
+
+#include <QtCore/QByteArray>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QStack>
+
 #include <algorithm>
-#include <typeinfo>
 #include <cstring>
 #include <cctype>
-#include <QByteArray>
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
-#include <QFileInfo>
-#include <QSharedPointer>
-#include <QStack>
+#include <typeinfo>
 
 static QStack<PySide::CleanupFunction> cleanupFunctionList;
 static void* qobjectNextAddr;
@@ -188,29 +190,21 @@ void destroyQCoreApplication()
     MakeSingletonQAppWrapper(NULL);
 }
 
-struct TypeUserData {
-    TypeUserData(PyTypeObject* type, const QMetaObject* metaobject) : mo(type, metaobject) {}
-    DynamicQMetaObject mo;
-    std::size_t cppObjSize;
-};
-
 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, 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);
-    userData->cppObjSize = cppObjSize;
+    auto userData =
+        new TypeUserData(reinterpret_cast<PyTypeObject*>(type), base, cppObjSize);
     userData->mo.update();
     Shiboken::ObjectType::setTypeUserData(type, userData, Shiboken::callCppDestructor<TypeUserData>);
 
     //initialize staticQMetaObject property
-    void* metaObjectPtr = &userData->mo;
+    void *metaObjectPtr = const_cast<QMetaObject *>(userData->mo.update());
     static SbkConverter* converter = Shiboken::Conversions::getConverter("QMetaObject");
     if (!converter)
         return;
@@ -218,6 +212,36 @@ void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base, const s
     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);
+}
+
+const QMetaObject *retrieveMetaObject(PyTypeObject *pyTypeObj)
+{
+    TypeUserData *userData = retrieveTypeUserData(pyTypeObj);
+    return userData ? userData->mo.update() : nullptr;
+}
+
+const QMetaObject *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);
@@ -230,25 +254,21 @@ void initQObjectSubType(SbkObjectType *type, PyObject *args, PyObject * /* kwds
 
     PyObject* bases = PyTuple_GET_ITEM(args, 1);
     int numBases = PyTuple_GET_SIZE(bases);
-    QMetaObject* baseMo = 0;
-    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)) {
-            baseMo = reinterpret_cast<QMetaObject*>(Shiboken::ObjectType::getTypeUserData(reinterpret_cast<SbkObjectType*>(base)));
-            qobjBase = reinterpret_cast<SbkObjectType*>(base);
-            reinterpret_cast<DynamicQMetaObject*>(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);
+    initDynamicMetaObject(type, userData->mo.update(), userData->cppObjSize);
 }
 
 PyObject* getMetaDataFromQObject(QObject* cppSelf, PyObject* self, PyObject* name)
@@ -299,7 +319,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;
@@ -366,7 +386,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) {