aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4jsonobject.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-01-15 21:28:01 +0100
committerLars Knoll <lars.knoll@digia.com>2015-01-23 12:30:35 +0100
commit3dbf4e9a6979802fff55e2f5e6aa54a14280e128 (patch)
tree2bd9090f4bcf01e9c9e43c0d52fcbf80295ca6c0 /src/qml/jsruntime/qv4jsonobject.cpp
parent3f3652e43fc001df728ef00403b18d3202e2726a (diff)
Cleanups
Remove duplicated methods. Remove some mostly unused methods, and simplify some others. Change-Id: I605b249e54417bb32c3dfc8e22f2c8b6b684a1e1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject.cpp')
-rw-r--r--src/qml/jsruntime/qv4jsonobject.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp
index 1423c4ac6a..724a2e0d7b 100644
--- a/src/qml/jsruntime/qv4jsonobject.cpp
+++ b/src/qml/jsruntime/qv4jsonobject.cpp
@@ -213,7 +213,7 @@ ReturnedValue JsonParser::parse(QJsonParseError *error)
END;
error->offset = 0;
error->error = QJsonParseError::NoError;
- return v.asReturnedValue();
+ return v->asReturnedValue();
}
/*
@@ -726,7 +726,7 @@ QString Stringify::Str(const QString &key, const Value &v)
value = replacerFunction->call(callData);
}
- o = value.asReturnedValue();
+ o = value->asReturnedValue();
if (o) {
if (NumberObject *n = o->asNumberObject())
value = n->value();
@@ -748,7 +748,7 @@ QString Stringify::Str(const QString &key, const Value &v)
return std::isfinite(d) ? value->toQString() : QStringLiteral("null");
}
- o = value.asReturnedValue();
+ o = value->asReturnedValue();
if (o) {
if (!o->asFunctionObject()) {
if (o->asArrayObject()) {
@@ -904,7 +904,7 @@ ReturnedValue JsonObject::method_parse(CallContext *ctx)
return ctx->engine()->throwSyntaxError(QStringLiteral("JSON.parse: Parse error"));
}
- return result.asReturnedValue();
+ return result->asReturnedValue();
}
ReturnedValue JsonObject::method_stringify(CallContext *ctx)