aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlvaluetypewrapper.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-06-22 00:09:24 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-06-22 21:54:09 +0200
commit522c91f41f857bf2b52881d0bea2e07468516a42 (patch)
treec2ed837e615e6495723abd5dce0b0dba681d8b99 /src/qml/qml/qqmlvaluetypewrapper.cpp
parent4af39f1d8e2371ea5d913493b23eabffc1fb22c6 (diff)
Remove context parameter from Manged::put.
Change-Id: Ib99e726ffbb20463d45a8444b4fbdfe32cd6dbef Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvaluetypewrapper.cpp')
-rw-r--r--src/qml/qml/qqmlvaluetypewrapper.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 268cdb30f9..388025dbc4 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -308,11 +308,12 @@ Value QmlValueTypeWrapper::get(Managed *m, String *name, bool *hasProperty)
#undef VALUE_TYPE_ACCESSOR
}
-void QmlValueTypeWrapper::put(Managed *m, ExecutionContext *ctx, String *name, const Value &value)
+void QmlValueTypeWrapper::put(Managed *m, String *name, const Value &value)
{
QmlValueTypeWrapper *r = m->as<QmlValueTypeWrapper>();
+ ExecutionEngine *v4 = m->engine();
if (!r)
- ctx->throwTypeError();
+ v4->current->throwTypeError();
QByteArray propName = name->toQString().toUtf8();
if (r->objectType == QmlValueTypeWrapper::Reference) {
@@ -335,7 +336,7 @@ void QmlValueTypeWrapper::put(Managed *m, ExecutionContext *ctx, String *name, c
if (!f->bindingKeyFlag) {
// assigning a JS function to a non-var-property is not allowed.
QString error = QLatin1String("Cannot assign JavaScript function to value-type property");
- ctx->throwError(r->v8->toString(error));
+ v4->current->throwError(r->v8->toString(error));
}
QQmlContextData *context = r->v8->callingContext();
@@ -349,7 +350,6 @@ void QmlValueTypeWrapper::put(Managed *m, ExecutionContext *ctx, String *name, c
cacheData.valueTypeCoreIndex = index;
cacheData.valueTypePropType = p.userType();
- QV4::ExecutionEngine *v4 = ctx->engine;
QV4::ExecutionEngine::StackFrame frame = v4->currentStackFrame();
newBinding = new QQmlBinding(value, reference->object, context,