diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-05-07 16:14:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:13 +0200 |
| commit | 57f08e59fcc289742fe88ee45b82b52b26dbf945 (patch) | |
| tree | cda5e6d37741c99a6e461846bacb60dfbcb8ad4f /src/qml/jsruntime/qv4jsonobject.cpp | |
| parent | 2c7c791e3f0d801a8c1051b7da7b53cb4e50a017 (diff) | |
Get rid of all uses of ObjectRef
Change-Id: I705e2362dcda542f56826dadec6b0a6f15848788
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4jsonobject.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index 752d647072..dc8bd7ac1c 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -81,7 +81,7 @@ private: ReturnedValue parseObject(); ReturnedValue parseArray(); - bool parseMember(ObjectRef o); + bool parseMember(Object *o); bool parseString(QString *string); bool parseValue(ValueRef val); bool parseNumber(ValueRef val); @@ -268,7 +268,7 @@ ReturnedValue JsonParser::parseObject() /* member = string name-separator value */ -bool JsonParser::parseMember(ObjectRef o) +bool JsonParser::parseMember(Object *o) { BEGIN << "parseMember"; Scope scope(context); @@ -657,7 +657,7 @@ struct Stringify QString Str(const QString &key, ValueRef v); QString JA(ArrayObject *a); - QString JO(ObjectRef o); + QString JO(Object *o); QString makeMember(const QString &key, ValueRef v); }; @@ -780,9 +780,9 @@ QString Stringify::makeMember(const QString &key, ValueRef v) return QString(); } -QString Stringify::JO(ObjectRef o) +QString Stringify::JO(Object *o) { - if (stack.contains(o.getPointer())) { + if (stack.contains(o)) { ctx->throwTypeError(); return QString(); } @@ -790,7 +790,7 @@ QString Stringify::JO(ObjectRef o) Scope scope(ctx); QString result; - stack.push(o.getPointer()); + stack.push(o); QString stepback = indent; indent += gap; @@ -1013,7 +1013,7 @@ QV4::ReturnedValue JsonObject::fromJsonObject(ExecutionEngine *engine, const QJs return o.asReturnedValue(); } -QJsonObject JsonObject::toJsonObject(ObjectRef o, V4ObjectSet &visitedObjects) +QJsonObject JsonObject::toJsonObject(Object *o, V4ObjectSet &visitedObjects) { QJsonObject result; if (!o || o->asFunctionObject()) |