diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-11 14:47:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:23 +0200 |
| commit | d6837e9ca301e7b6c792e3d24db14fb7bab2db60 (patch) | |
| tree | b0afdc2e224d8f28ec6f9fb516d0ad2cb63c4908 /src/qml/qml/qqmlcomponent.cpp | |
| parent | 002e6105f61269f1474de878ccdb26205e5b226e (diff) | |
Rename QV4::ValueScope to QV4::Scope
The class is going to be used all over the place, so let's
give it a short name :)
Change-Id: If61543cb2c885e7fbb95c8fc4d0e870097c352ed
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 2c9195a0ef..8cea3b6a69 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1207,7 +1207,7 @@ void QQmlComponent::createObject(QQmlV4Function *args) QV8Engine *v8engine = args->engine(); QV4::ExecutionEngine *v4engine = QV8Engine::getV4(v8engine); - QV4::ValueScope scope(v4engine); + QV4::Scope scope(v4engine); QQmlContext *ctxt = creationContext(); if (!ctxt) ctxt = d->engine->rootContext(); @@ -1367,7 +1367,7 @@ void QQmlComponentPrivate::initializeObjectWithInitialProperties(const QV4::Valu QQmlEnginePrivate *ep = QQmlEnginePrivate::get(engine); QV8Engine *v8engine = ep->v8engine(); QV4::ExecutionEngine *v4engine = QV8Engine::getV4(v8engine); - QV4::ValueScope scope(v4engine); + QV4::Scope scope(v4engine); QV4::Value object = QV4::QObjectWrapper::wrap(v4engine, toCreate); Q_ASSERT(object.asObject()); @@ -1472,7 +1472,7 @@ void QmlIncubatorObject::setInitialState(QObject *o) QQmlComponentExtension *e = componentExtension(v8); QV4::ExecutionEngine *v4 = QV8Engine::getV4(v8); - QV4::ValueScope scope(v4); + QV4::Scope scope(v4); QV4::Value f = QV4::Script::evaluate(v4, QString::fromLatin1(INITIALPROPERTIES_SOURCE), qmlGlobal.asObject()); QV4::ScopedCallData callData(scope, 2); @@ -1511,7 +1511,7 @@ void QmlIncubatorObject::statusChanged(Status s) if (QV4::FunctionObject *f = callback.asFunctionObject()) { QV4::ExecutionContext *ctx = f->engine()->current; - QV4::ValueScope scope(ctx); + QV4::Scope scope(ctx); try { QV4::ScopedCallData callData(scope, 1); callData->thisObject = QV4::Value::fromObject(this); |