aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsapi
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-11 14:47:34 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-18 13:13:23 +0200
commitd6837e9ca301e7b6c792e3d24db14fb7bab2db60 (patch)
treeb0afdc2e224d8f28ec6f9fb516d0ad2cb63c4908 /src/qml/jsapi
parent002e6105f61269f1474de878ccdb26205e5b226e (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/jsapi')
-rw-r--r--src/qml/jsapi/qjsvalue.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index 96e318fafb..7325cf8035 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -506,7 +506,7 @@ QJSValue QJSValue::call(const QJSValueList &args)
ExecutionEngine *engine = d->engine;
assert(engine);
- ValueScope scope(engine);
+ Scope scope(engine);
ScopedCallData callData(scope, args.length());
callData->thisObject = Value::fromObject(engine->globalObject);
for (int i = 0; i < args.size(); ++i) {
@@ -557,7 +557,7 @@ QJSValue QJSValue::callWithInstance(const QJSValue &instance, const QJSValueList
ExecutionEngine *engine = d->engine;
assert(engine);
- ValueScope scope(engine);
+ Scope scope(engine);
if (!instance.d->checkEngine(engine)) {
qWarning("QJSValue::call() failed: cannot call function with thisObject created in a different engine");
@@ -613,7 +613,7 @@ QJSValue QJSValue::callAsConstructor(const QJSValueList &args)
ExecutionEngine *engine = d->engine;
assert(engine);
- ValueScope scope(engine);
+ Scope scope(engine);
ScopedCallData callData(scope, args.size());
for (int i = 0; i < args.size(); ++i) {
if (!args.at(i).d->checkEngine(engine)) {