From b16fbcd4eeb9a5f9195c500e2693cba25a7916d2 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 30 Dec 2016 16:52:59 +0100
Subject: [PATCH] implement getWrapperName to get class name with shiboken
 wrapper

---
 src/Gui/WidgetFactory.cpp | 23 +++++++++++++++++++++--
 src/Gui/WidgetFactory.h   |  1 +
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp
index b2656349f..253e77183 100644
--- a/src/Gui/WidgetFactory.cpp
+++ b/src/Gui/WidgetFactory.cpp
@@ -284,6 +284,22 @@ Py::Object PythonWrapper::fromQWidget(QWidget* widget, const char* className)
 #endif
 }
 
+const char* PythonWrapper::getWrapperName(QObject* obj) const
+{
+#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
+    const QMetaObject* meta = obj->metaObject();
+    while (meta) {
+        const char* typeName = meta->className();
+        PyTypeObject* exactType = Shiboken::Conversions::getPythonTypeObject(typeName);
+        if (exactType)
+            return typeName;
+        meta = meta->superClass();
+    }
+#endif
+
+    return nullptr;
+}
+
 bool PythonWrapper::loadCoreModule()
 {
 #if defined (HAVE_SHIBOKEN2) && (HAVE_PYSIDE2)
@@ -774,7 +790,8 @@ Py::Object UiLoaderPy::load(const Py::Tuple& args)
                 wrap.loadGuiModule();
                 wrap.loadWidgetsModule();
 
-                Py::Object pyWdg = wrap.fromQWidget(widget);
+                const char* typeName = wrap.getWrapperName(widget);
+                Py::Object pyWdg = wrap.fromQWidget(widget, typeName);
                 wrap.createChildrenNameAttributes(*pyWdg, widget);
                 wrap.setParent(*pyWdg, parent);
                 return pyWdg;
@@ -830,7 +847,9 @@ Py::Object UiLoaderPy::createWidget(const Py::Tuple& args)
     }
     wrap.loadGuiModule();
     wrap.loadWidgetsModule();
-    return wrap.fromQWidget(widget);
+
+    const char* typeName = wrap.getWrapperName(widget);
+    return wrap.fromQWidget(widget, typeName);
 }
 
 // ----------------------------------------------------
diff --git a/src/Gui/WidgetFactory.h b/src/Gui/WidgetFactory.h
index 185efe9e9..cec009643 100644
--- a/src/Gui/WidgetFactory.h
+++ b/src/Gui/WidgetFactory.h
@@ -50,6 +50,7 @@ public:
     bool toCString(const Py::Object&, std::string&);
     QObject* toQObject(const Py::Object&);
     Py::Object fromQWidget(QWidget*, const char* className=0);
+    const char* getWrapperName(QObject*) const;
     /*!
       Create a Python wrapper for the icon. The icon must be created on the heap
       and the Python wrapper takes ownership of it.