diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-15 11:36:57 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-23 08:07:32 +0100 |
commit | 002a5d4303b3b182ae4abc4a752c49787c1c2821 (patch) | |
tree | 69c7666ed1061c7acacee1d76597c06405459c80 /src/qml/jsruntime/qv4jsonobject_p.h | |
parent | fddc75e862032163af36d2282051758647b62d15 (diff) |
Get rid of most uses of ValueRef
Instead pass a const Value & into the functions
With our new inheritance structure, we can get rid of ValueRef
and instead simply pass a pointer to a Value again. Pointers to
Values are safe to use again now, as they are now guaranteed to
be in a place where the GC knows about them.
Change-Id: I44c606fde764db3993b8128fd6fb781d3a298e53
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4jsonobject_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject_p.h b/src/qml/jsruntime/qv4jsonobject_p.h index 32d890c488..c257c51762 100644 --- a/src/qml/jsruntime/qv4jsonobject_p.h +++ b/src/qml/jsruntime/qv4jsonobject_p.h @@ -65,7 +65,7 @@ public: static ReturnedValue fromJsonObject(ExecutionEngine *engine, const QJsonObject &object); static ReturnedValue fromJsonArray(ExecutionEngine *engine, const QJsonArray &array); - static inline QJsonValue toJsonValue(const QV4::ValueRef value) + static inline QJsonValue toJsonValue(const QV4::Value &value) { V4ObjectSet visitedObjects; return toJsonValue(value, visitedObjects); } static inline QJsonObject toJsonObject(QV4::Object *o) { V4ObjectSet visitedObjects; return toJsonObject(o, visitedObjects); } @@ -73,7 +73,7 @@ public: { V4ObjectSet visitedObjects; return toJsonArray(a, visitedObjects); } private: - static QJsonValue toJsonValue(const QV4::ValueRef value, V4ObjectSet &visitedObjects); + static QJsonValue toJsonValue(const QV4::Value &value, V4ObjectSet &visitedObjects); static QJsonObject toJsonObject(Object *o, V4ObjectSet &visitedObjects); static QJsonArray toJsonArray(ArrayObject *a, V4ObjectSet &visitedObjects); |