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>

5 files changed, 8 insertions, 8 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);
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index 37cbba0f02..4f67a1dd28 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -163,7 +163,7 @@ QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
     DeleteWatcher watcher(this);
 
     QV4::ExecutionEngine *v4 = QV8Engine::getV4(ep->v8engine());
-    QV4::ValueScope scope(v4);
+    QV4::Scope scope(v4);
     QV4::ScopedValue result(scope, QV4::Value::undefinedValue());
     QV4::ExecutionContext *ctx = v4->current;
     try {
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index bf74ff6452..f8c2590a20 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -927,7 +927,7 @@ int QQmlVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a)
 
                 QQmlVMEMetaData::MethodData *data = metaData->methodData() + id;
 
-                QV4::ValueScope scope(function->engine());
+                QV4::Scope scope(function->engine());
                 QV4::ScopedCallData callData(scope, data->parameterCount);
                 callData->thisObject = ep->v8engine()->global();
 
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 19619400f7..52e959f896 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -1461,7 +1461,7 @@ const QByteArray &QQmlXMLHttpRequest::rawResponseBody() const
 void QQmlXMLHttpRequest::dispatchCallback(const Value &me)
 {
     ExecutionContext *ctx = v4->current;
-    QV4::ValueScope scope(v4);
+    QV4::Scope scope(v4);
     try {
         Object *o = me.asObject();
         if (!o)
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index b82d58ba0b..33447c3134 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -443,7 +443,7 @@ void QV8Engine::initializeGlobal()
 
 void QV8Engine::freezeObject(const QV4::Value &value)
 {
-    QV4::ValueScope scope(m_v4Engine);
+    QV4::Scope scope(m_v4Engine);
     QV4::ScopedCallData callData(scope, 1);
     callData->args[0] = value;
     callData->thisObject = QV4::Value::fromObject(m_v4Engine->globalObject);