libpyside: Port DynamicQMetaObject to QMetaObjectBuilder

Qt 5 introduces a new class QMetaObjectBuilder for generating dynamic
meta objects for use cases like QML. It provides an API to add methods,
properties and info and a factory method toMetaObject() to obtain
a QMetaObject snapshot reflecting the changes.

Replace the DynamicQMetaObject aggregated by TypeUserData by a class
MetaObjectBuilder wrapping a QMetaObjectBuilder with dirty-handling.

The code to create the binary data of the QMetaObject can then be
removed.

For plain Qt objects, the wrapped base meta object will be returned
(which fixes the bug).

Task-number: PYSIDE-784
Change-Id: Id8a54570aff36c75fe0f3bf2d297a12d02cd773a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 18 insertions, 20 deletions

diff --git a/sources/pyside2/libpyside/dynamicqmetaobject.h b/sources/pyside2/libpyside/dynamicqmetaobject.h
index e68c7dd50..1fbe73ea4 100644
--- a/sources/pyside2/libpyside/dynamicqmetaobject.h
+++ b/sources/pyside2/libpyside/dynamicqmetaobject.h
@@ -45,39 +45,37 @@
 #include <QtCore/QMetaObject>
 #include <QtCore/QMetaMethod>
 
+class MetaObjectBuilderPrivate;
+
 namespace PySide
 {
 
-class DynamicQMetaObject : public QMetaObject
+class MetaObjectBuilder
 {
-    Q_DISABLE_COPY(DynamicQMetaObject)
+    Q_DISABLE_COPY(MetaObjectBuilder)
 public:
-    DynamicQMetaObject(const char* className, const QMetaObject* metaObject);
-    DynamicQMetaObject(PyTypeObject* type, const QMetaObject* metaobject);
-    ~DynamicQMetaObject();
+    MetaObjectBuilder(const char *className, const QMetaObject *metaObject);
 
+    MetaObjectBuilder(PyTypeObject *type, const QMetaObject *metaObject);
+    ~MetaObjectBuilder();
 
-    int addMethod(QMetaMethod::MethodType mtype, const char* signature, const char* type);
-    void removeMethod(QMetaMethod::MethodType mtype, uint index);
-    int addSignal(const char* signal, const char* type = 0);
-    int addSlot(const char* slot, const char* type = 0);
-    int addProperty(const char* property, PyObject* data);
-    void addInfo(const char* key, const char* value);
+    int indexOfMethod(QMetaMethod::MethodType mtype, const QByteArray &signature) const;
+    int indexOfProperty(const QByteArray &name) const;
+    int addSlot(const char *signature);
+    int addSlot(const char *signature, const char *type);
+    int addSignal(const char *signature);
+    void removeMethod(QMetaMethod::MethodType mtype, int index);
+    int addProperty(const char *property, PyObject *data);
+    void addInfo(const char *key, const char *value);
     void addInfo(const QMap<QByteArray, QByteArray> &info);
 
-    void removeSignal(uint idex);
-    void removeSlot(uint index);
-    void removeProperty(uint index);
+    void removeProperty(int index);
 
-    const QMetaObject* update() const;
+    const QMetaObject *update();
 
 private:
-    class DynamicQMetaObjectPrivate;
-    DynamicQMetaObjectPrivate* m_d;
-
-    void parsePythonType(PyTypeObject *type);
+    MetaObjectBuilderPrivate *m_d;
 };
 
-
 }
 #endif