diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-11-12 13:32:41 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-15 13:16:08 +0100 |
commit | 42674114127436564cf4598d54f671d46c1427b5 (patch) | |
tree | 58db5d1efa04cf6e87e83666684a7fa177c9d0f7 /src/qml/jsruntime/qv4objectproto.cpp | |
parent | 7cc5fb2b53616ed2ca2b525262457fb44e2b5355 (diff) |
Change signature of defineOwnProperty to take an engine instead of a context
Change-Id: Ib0d558d17162a205974c6f2f0daf8af5b0b9547b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectproto.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index ba3ef9bf4f..a23be99b0a 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -190,7 +190,7 @@ ReturnedValue ObjectPrototype::method_defineProperty(CallContext *ctx) if (scope.engine->hasException) return Encode::undefined(); - if (!O->__defineOwnProperty__(ctx, name.getPointer(), pd, attrs)) + if (!O->__defineOwnProperty__(scope.engine, name.getPointer(), pd, attrs)) return ctx->engine()->throwTypeError(); return O.asReturnedValue(); @@ -227,9 +227,9 @@ ReturnedValue ObjectPrototype::method_defineProperties(CallContext *ctx) return Encode::undefined(); bool ok; if (name) - ok = O->__defineOwnProperty__(ctx, name.getPointer(), n, nattrs); + ok = O->__defineOwnProperty__(scope.engine, name.getPointer(), n, nattrs); else - ok = O->__defineOwnProperty__(ctx, index, n, nattrs); + ok = O->__defineOwnProperty__(scope.engine, index, n, nattrs); if (!ok) return ctx->engine()->throwTypeError(); } @@ -495,7 +495,7 @@ ReturnedValue ObjectPrototype::method_defineGetter(CallContext *ctx) Property pd; pd.value = f; pd.set = Primitive::emptyValue(); - o->__defineOwnProperty__(ctx, prop.getPointer(), pd, Attr_Accessor); + o->__defineOwnProperty__(scope.engine, prop.getPointer(), pd, Attr_Accessor); return Encode::undefined(); } @@ -523,7 +523,7 @@ ReturnedValue ObjectPrototype::method_defineSetter(CallContext *ctx) Property pd; pd.value = Primitive::emptyValue(); pd.set = f; - o->__defineOwnProperty__(ctx, prop.getPointer(), pd, Attr_Accessor); + o->__defineOwnProperty__(scope.engine, prop.getPointer(), pd, Attr_Accessor); return Encode::undefined(); } @@ -647,24 +647,24 @@ ReturnedValue ObjectPrototype::fromPropertyDescriptor(ExecutionContext *ctx, con if (attrs.isData()) { pd.value = desc->value; s = engine->newString(QStringLiteral("value")); - o->__defineOwnProperty__(ctx, s.getPointer(), pd, Attr_Data); + o->__defineOwnProperty__(scope.engine, s.getPointer(), pd, Attr_Data); pd.value = Primitive::fromBoolean(attrs.isWritable()); s = engine->newString(QStringLiteral("writable")); - o->__defineOwnProperty__(ctx, s.getPointer(), pd, Attr_Data); + o->__defineOwnProperty__(scope.engine, s.getPointer(), pd, Attr_Data); } else { pd.value = desc->getter() ? desc->getter()->asReturnedValue() : Encode::undefined(); s = engine->newString(QStringLiteral("get")); - o->__defineOwnProperty__(ctx, s.getPointer(), pd, Attr_Data); + o->__defineOwnProperty__(scope.engine, s.getPointer(), pd, Attr_Data); pd.value = desc->setter() ? desc->setter()->asReturnedValue() : Encode::undefined(); s = engine->newString(QStringLiteral("set")); - o->__defineOwnProperty__(ctx, s.getPointer(), pd, Attr_Data); + o->__defineOwnProperty__(scope.engine, s.getPointer(), pd, Attr_Data); } pd.value = Primitive::fromBoolean(attrs.isEnumerable()); s = engine->newString(QStringLiteral("enumerable")); - o->__defineOwnProperty__(ctx, s.getPointer(), pd, Attr_Data); + o->__defineOwnProperty__(scope.engine, s.getPointer(), pd, Attr_Data); pd.value = Primitive::fromBoolean(attrs.isConfigurable()); s = engine->newString(QStringLiteral("configurable")); - o->__defineOwnProperty__(ctx, s.getPointer(), pd, Attr_Data); + o->__defineOwnProperty__(scope.engine, s.getPointer(), pd, Attr_Data); return o.asReturnedValue(); } |