diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-24 15:46:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 09:05:38 +0200 |
| commit | 0c22fb091eeb591c49ebe65532609e65eafb59d1 (patch) | |
| tree | 85d47dfa0d7454886b0bbb07aa42970713ece560 /src/qml/qml/v8/qv8engine_p.h | |
| parent | 74807c0725ad6ef6ccd49611bb9f4f994cddf106 (diff) | |
Convert more methods in QV8Engine
Change-Id: I5b059b41842b4a6d9541525b3955d2b64c0011c3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8engine_p.h')
| -rw-r--r-- | src/qml/qml/v8/qv8engine_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index 04f4d5e6be..01f9ae8cc7 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -228,11 +228,11 @@ public: void setExtensionData(int, Deletable *); QV4::ReturnedValue variantListToJS(const QVariantList &lst); - inline QVariantList variantListFromJS(QV4::ArrayObject *array) + inline QVariantList variantListFromJS(QV4::ArrayObjectRef array) { V8ObjectSet visitedObjects; return variantListFromJS(array, visitedObjects); } QV4::ReturnedValue variantMapToJS(const QVariantMap &vmap); - inline QVariantMap variantMapFromJS(QV4::Object *object) + inline QVariantMap variantMapFromJS(QV4::ObjectRef object) { V8ObjectSet visitedObjects; return variantMapFromJS(object, visitedObjects); } QV4::ReturnedValue variantToJS(const QVariant &value); @@ -280,8 +280,8 @@ protected: void initializeGlobal(); private: - QVariantList variantListFromJS(QV4::ArrayObject *array, V8ObjectSet &visitedObjects); - QVariantMap variantMapFromJS(QV4::Object *object, V8ObjectSet &visitedObjects); + QVariantList variantListFromJS(QV4::ArrayObjectRef array, V8ObjectSet &visitedObjects); + QVariantMap variantMapFromJS(QV4::ObjectRef object, V8ObjectSet &visitedObjects); QVariant variantFromJS(const QV4::ValueRef value, V8ObjectSet &visitedObjects); Q_DISABLE_COPY(QV8Engine) |