diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-12-01 16:13:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-20 07:39:55 +0100 |
| commit | d3a6412c66f62aa045f2856b0bf0ede4af10a984 (patch) | |
| tree | 9de9776a0301fc6176d58df84f60c6b6ea4fcb75 /src/qml/jsruntime/qv4jsonobject.cpp | |
| parent | 3dade3b66c886b935e95bb106fa7252320c127b3 (diff) | |
Remove most of the places where getPointer() is used
This is no longer required, and simply uglifies the code
Change-Id: Iba91a1d7735ebe23a43437f137a488423b6eb743
Reviewed-by: Simon Hausmann <simon.hausmann@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 8bcb2e4708..6b38c79d55 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -284,7 +284,7 @@ bool JsonParser::parseMember(Object *o) if (idx < UINT_MAX) { o->putIndexed(idx, val); } else { - o->insertMember(s.getPointer(), val); + o->insertMember(s, val); } END; @@ -705,7 +705,7 @@ QString Stringify::Str(const QString &key, ValueRef v) ScopedObject o(scope, value); if (o) { ScopedString s(scope, ctx->d()->engine->newString(QStringLiteral("toJSON"))); - Scoped<FunctionObject> toJSON(scope, o->get(s.getPointer())); + Scoped<FunctionObject> toJSON(scope, o->get(s)); if (!!toJSON) { ScopedCallData callData(scope, 1); callData->thisObject = value; @@ -808,7 +808,7 @@ QString Stringify::JO(Object *o) for (int i = 0; i < propertyList.size(); ++i) { bool exists; s = propertyList.at(i); - ScopedValue v(scope, o->get(s.getPointer(), &exists)); + ScopedValue v(scope, o->get(s, &exists)); if (!exists) continue; QString member = makeMember(s->toQString(), v); @@ -1002,7 +1002,7 @@ QV4::ReturnedValue JsonObject::fromJsonObject(ExecutionEngine *engine, const QJs ScopedValue v(scope); for (QJsonObject::const_iterator it = object.begin(); it != object.end(); ++it) { v = fromJsonValue(engine, it.value()); - o->put((s = engine->newString(it.key())).getPointer(), v); + o->put((s = engine->newString(it.key())), v); } return o.asReturnedValue(); } |