Adapt the ValueTypeProvider interface and port its types

The ValueTypeProvider system allows non-QML modules to add new basic
QML types. It needs to be changed when porting away from QQmlVmeVariant
as underlying type of properties.

Change-Id: I2b52d7e6f578647a39832896c28553404b9a679f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h
index 8ed044d2c9..c19f7dab64 100644
--- a/src/qml/qml/qqmlglobal_p.h
+++ b/src/qml/qml/qqmlglobal_p.h
@@ -224,7 +224,7 @@ public:
 
     const QMetaObject *metaObjectForMetaType(int);
 
-    bool initValueType(int, void *, size_t);
+    bool initValueType(int, QVariant&);
     bool destroyValueType(int, void *, size_t);
 
     QVariant createValueType(int, int, const void *[]);
@@ -235,14 +235,14 @@ public:
     QVariant createVariantFromString(int, const QString &, bool *);
     QVariant createVariantFromJsObject(int, QQmlV4Handle, QV4::ExecutionEngine *, bool*);
 
-    bool equalValueType(int, const void *, const void *, size_t);
+    bool equalValueType(int, const void *, const QVariant&);
     bool storeValueType(int, const void *, void *, size_t);
-    bool readValueType(int, const void *, size_t, int, void *);
-    bool writeValueType(int, const void *, void *, size_t);
+    bool readValueType(const QVariant&, void *, int);
+    bool writeValueType(int, const void *, QVariant&);
 
 private:
     virtual const QMetaObject *getMetaObjectForMetaType(int);
-    virtual bool init(int, void *, size_t);
+    virtual bool init(int, QVariant&);
     virtual bool destroy(int, void *, size_t);
 
     virtual bool create(int, int, const void *[], QVariant *);
@@ -253,10 +253,10 @@ private:
     virtual bool variantFromString(int, const QString &, QVariant *);
     virtual bool variantFromJsObject(int, QQmlV4Handle, QV4::ExecutionEngine *, QVariant *);
 
-    virtual bool equal(int, const void *, const void *, size_t);
+    virtual bool equal(int, const void *, const QVariant&);
     virtual bool store(int, const void *, void *, size_t);
-    virtual bool read(int, const void *, size_t, int, void *);
-    virtual bool write(int, const void *, void *, size_t);
+    virtual bool read(const QVariant&, void *, int);
+    virtual bool write(int, const void *, QVariant&);
 
     friend Q_QML_PRIVATE_EXPORT void QQml_addValueTypeProvider(QQmlValueTypeProvider *);
     friend Q_QML_PRIVATE_EXPORT void QQml_removeValueTypeProvider(QQmlValueTypeProvider *);