From e4e90923c93adfafb23c81be7359e8df2a500b4f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 13 Sep 2013 21:54:21 +0200 Subject: Convert some methods to use Returned<> Change-Id: I631606cb5ab3b35b72104e70092a5200dd235fbc Reviewed-by: Simon Hausmann --- src/qml/qml/qqmlcontextwrapper.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/qml/qml/qqmlcontextwrapper.cpp') diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp index 50d1f32c10..153743aa58 100644 --- a/src/qml/qml/qqmlcontextwrapper.cpp +++ b/src/qml/qml/qqmlcontextwrapper.cpp @@ -274,8 +274,9 @@ ReturnedValue QmlContextWrapper::get(Managed *m, String *name, bool *hasProperty void QmlContextWrapper::put(Managed *m, String *name, const Value &value) { - QmlContextWrapper *wrapper = m->as(); ExecutionEngine *v4 = m->engine(); + QV4::Scope scope(v4); + QV4::Scoped wrapper(scope, m->as()); if (!wrapper) v4->current->throwTypeError(); @@ -283,7 +284,8 @@ void QmlContextWrapper::put(Managed *m, String *name, const Value &value) if (wrapper && wrapper->readOnly) { QString error = QLatin1String("Invalid write to global property \"") + name->toQString() + QLatin1Char('"'); - v4->current->throwError(Value::fromString(v4->current->engine->newString(error))); + Scoped e(scope, v4->current->engine->newString(error)); + v4->current->throwError(e); } Object::put(m, name, value); -- cgit v1.2.3