Use QV4::ScopedObject typedef instead of actual type

Change-Id: I0b68c534ea513a7c230b12114f6b42b069f9864b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

5 files changed, 5 insertions, 5 deletions

diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 8d032d9834..9f659a7976 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -942,7 +942,7 @@ ReturnedValue QtObject::method_createQmlObject(CallContext *ctx)
             }
 
             v = v4->newString(errorstr);
-            Scoped<Object> errorObject(scope, v4->newErrorObject(v));
+            ScopedObject errorObject(scope, v4->newErrorObject(v));
             errorObject->put((s = v4->newString(QStringLiteral("qmlErrors"))), qmlerrors);
             return errorObject.asReturnedValue();
         }
diff --git a/src/qml/qml/v8/qv4domerrors.cpp b/src/qml/qml/v8/qv4domerrors.cpp
index c0ea03f83f..16359285a4 100644
--- a/src/qml/qml/v8/qv4domerrors.cpp
+++ b/src/qml/qml/v8/qv4domerrors.cpp
@@ -41,7 +41,7 @@ using namespace QV4;
 void qt_add_domexceptions(ExecutionEngine *e)
 {
     Scope scope(e);
-    Scoped<Object> domexception(scope, e->newObject());
+    ScopedObject domexception(scope, e->newObject());
     domexception->defineReadonlyProperty(QStringLiteral("INDEX_SIZE_ERR"), Primitive::fromInt32(DOMEXCEPTION_INDEX_SIZE_ERR));
     domexception->defineReadonlyProperty(QStringLiteral("DOMSTRING_SIZE_ERR"), Primitive::fromInt32(DOMEXCEPTION_DOMSTRING_SIZE_ERR));
     domexception->defineReadonlyProperty(QStringLiteral("HIERARCHY_REQUEST_ERR"), Primitive::fromInt32(DOMEXCEPTION_HIERARCHY_REQUEST_ERR));
diff --git a/src/qml/qml/v8/qv4domerrors_p.h b/src/qml/qml/v8/qv4domerrors_p.h
index b68981a492..dfa1675ee6 100644
--- a/src/qml/qml/v8/qv4domerrors_p.h
+++ b/src/qml/qml/v8/qv4domerrors_p.h
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
 
 #define V4THROW_DOM(error, string) { \
     QV4::ScopedValue v(scope, scope.engine->newString(QStringLiteral(string))); \
-    QV4::Scoped<Object> ex(scope, scope.engine->newErrorObject(v)); \
+    QV4::ScopedObject ex(scope, scope.engine->newErrorObject(v)); \
     ex->put(QV4::ScopedString(scope, scope.engine->newIdentifier(QStringLiteral("code"))), QV4::ScopedValue(scope, QV4::Primitive::fromInt32(error))); \
     return ctx->engine()->throwError(ex); \
 }
diff --git a/src/qml/qml/v8/qv4sqlerrors.cpp b/src/qml/qml/v8/qv4sqlerrors.cpp
index 77e2257b3e..795ab5fb47 100644
--- a/src/qml/qml/v8/qv4sqlerrors.cpp
+++ b/src/qml/qml/v8/qv4sqlerrors.cpp
@@ -42,7 +42,7 @@ using namespace QV4;
 void qt_add_sqlexceptions(QV4::ExecutionEngine *engine)
 {
     Scope scope(engine);
-    Scoped<Object> sqlexception(scope, engine->newObject());
+    ScopedObject sqlexception(scope, engine->newObject());
     sqlexception->defineReadonlyProperty(QStringLiteral("UNKNOWN_ERR"), Primitive::fromInt32(SQLEXCEPTION_UNKNOWN_ERR));
     sqlexception->defineReadonlyProperty(QStringLiteral("DATABASE_ERR"), Primitive::fromInt32(SQLEXCEPTION_DATABASE_ERR));
     sqlexception->defineReadonlyProperty(QStringLiteral("VERSION_ERR"), Primitive::fromInt32(SQLEXCEPTION_VERSION_ERR));
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index fa9fb6c41d..7014911d39 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -607,7 +607,7 @@ QV4::ReturnedValue QV8Engine::variantListToJS(const QVariantList &lst)
 QV4::ReturnedValue QV8Engine::variantMapToJS(const QVariantMap &vmap)
 {
     QV4::Scope scope(m_v4Engine);
-    QV4::Scoped<QV4::Object> o(scope, m_v4Engine->newObject());
+    QV4::ScopedObject o(scope, m_v4Engine->newObject());
     QVariantMap::const_iterator it;
     QV4::ScopedString s(scope);
     QV4::ScopedValue v(scope);