diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-19 12:55:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
| commit | a9bdc91cefabb3729d0240fce4c01a669be09dbf (patch) | |
| tree | 6f2a2639164ec1a530ccc33bc96bece299df0dbf /src/qml/jsruntime/qv4jsonobject.cpp | |
| parent | 49369e62b50a4f903a5b2fcbfbfbc1f6f2838e8e (diff) | |
Fix some more methods to take ValueRef's
Change-Id: Ia0e30ba98c16e51c9992027c7e5f78d4def8697a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4jsonobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index e3e159233b..f311dfd420 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -81,7 +81,7 @@ private: ReturnedValue parseArray(); bool parseMember(Object *o); bool parseString(QString *string); - bool parseValue(Value *val); + bool parseValue(ValueRef val); bool parseNumber(Value *val); ExecutionContext *context; @@ -313,8 +313,8 @@ ReturnedValue JsonParser::parseArray() } else { uint index = 0; while (1) { - Value val; - if (!parseValue(&val)) + ScopedValue val(scope); + if (!parseValue(val)) return Encode::undefined(); array->arraySet(index, val); QChar token = nextToken(); @@ -343,7 +343,7 @@ value = false / null / true / object / array / number / string */ -bool JsonParser::parseValue(Value *val) +bool JsonParser::parseValue(ValueRef val) { BEGIN << "parse Value" << *json; |