aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4jsonobject.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-05-09 14:32:59 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2014-07-22 13:49:18 +0200
commit133ea9d0f1c2dc73b916f5993616a1dd88be98a1 (patch)
treee004c53ba4f201c537a7ddf40be7787f54d64801 /src/qml/jsruntime/qv4jsonobject.cpp
parent0fd24cf96e79bea3fb625563ddd3ce6f1ca8bd4b (diff)
Convert more objects to the new constructor scheme
Change-Id: I31b2a1ba4a93f0d4bde68eeb94f13e7224c0cd7b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject.cpp')
-rw-r--r--src/qml/jsruntime/qv4jsonobject.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp
index dc8bd7ac1c..2cbb72e15f 100644
--- a/src/qml/jsruntime/qv4jsonobject.cpp
+++ b/src/qml/jsruntime/qv4jsonobject.cpp
@@ -883,14 +883,14 @@ QString Stringify::JA(ArrayObject *a)
}
-JsonObject::JsonObject(InternalClass *ic)
- : Object(ic)
+JsonObject::Data::Data(InternalClass *ic)
+ : Object::Data(ic)
{
Scope scope(ic->engine);
- ScopedObject protectThis(scope, this);
+ ScopedObject o(scope, this);
- defineDefaultProperty(QStringLiteral("parse"), method_parse, 2);
- defineDefaultProperty(QStringLiteral("stringify"), method_stringify, 3);
+ o->defineDefaultProperty(QStringLiteral("parse"), method_parse, 2);
+ o->defineDefaultProperty(QStringLiteral("stringify"), method_stringify, 3);
}