diff options
author | Oleg Shparber <trollixx@gmail.com> | 2014-12-31 10:37:47 -0800 |
---|---|---|
committer | Oleg Shparber <trollixx@gmail.com> | 2015-01-03 23:29:57 +0100 |
commit | 2fe82c505d09fdf372f1d4c5992a3a0b0dc98f33 (patch) | |
tree | 3961702f98d9f553e4c90e9eb074a8096c48ad05 /src/qml/jsruntime/qv4runtime.cpp | |
parent | 4a9ed3de7d92809cf575f245f55d4f422b4983c3 (diff) |
Use QV4::ScopedObject typedef instead of actual type
Change-Id: I0b68c534ea513a7c230b12114f6b42b069f9864b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4runtime.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index c045655da9..a77604fe5c 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -573,7 +573,7 @@ ReturnedValue Runtime::getElement(ExecutionEngine *engine, const ValueRef object Scope scope(engine); uint idx = index->asArrayIndex(); - Scoped<Object> o(scope, object); + ScopedObject o(scope, object); if (!o) { if (idx < UINT_MAX) { if (String *str = object->asString()) { @@ -638,7 +638,7 @@ void Runtime::setElement(ExecutionEngine *engine, const ValueRef object, const V ReturnedValue Runtime::foreachIterator(ExecutionEngine *engine, const ValueRef in) { Scope scope(engine); - Scoped<Object> o(scope, (Object *)0); + ScopedObject o(scope, (Object *)0); if (!in->isNullOrUndefined()) o = in->toObject(engine); return engine->newForEachIteratorObject(o)->asReturnedValue(); @@ -668,7 +668,7 @@ ReturnedValue Runtime::getProperty(ExecutionEngine *engine, const ValueRef objec Scope scope(engine); ScopedString name(scope, engine->currentContext()->compilationUnit->runtimeStrings[nameIndex]); - Scoped<Object> o(scope, object); + ScopedObject o(scope, object); if (o) return o->get(name); @@ -952,7 +952,7 @@ ReturnedValue Runtime::callProperty(ExecutionEngine *engine, int nameIndex, Call { Scope scope(engine); ScopedString name(scope, engine->currentContext()->compilationUnit->runtimeStrings[nameIndex]); - Scoped<Object> baseObject(scope, callData->thisObject); + ScopedObject baseObject(scope, callData->thisObject); if (!baseObject) { Q_ASSERT(!callData->thisObject.isEmpty()); if (callData->thisObject.isNullOrUndefined()) { @@ -1018,7 +1018,7 @@ ReturnedValue Runtime::constructGlobalLookup(ExecutionEngine *engine, uint index Q_ASSERT(callData->thisObject.isUndefined()); Lookup *l = engine->currentContext()->lookups + index; - Scoped<Object> f(scope, l->globalGetter(l, engine)); + ScopedObject f(scope, l->globalGetter(l, engine)); if (!f) return engine->throwTypeError(); @@ -1059,7 +1059,7 @@ ReturnedValue Runtime::constructProperty(ExecutionEngine *engine, int nameIndex, if (scope.engine->hasException) return Encode::undefined(); - Scoped<Object> f(scope, thisObject->get(name)); + ScopedObject f(scope, thisObject->get(name)); if (!f) return engine->throwTypeError(); @@ -1200,7 +1200,7 @@ ReturnedValue Runtime::objectLiteral(ExecutionEngine *engine, const QV4::Value * { Scope scope(engine); QV4::InternalClass *klass = engine->currentContext()->compilationUnit->runtimeClasses[classId]; - Scoped<Object> o(scope, engine->newObject(klass, engine->objectPrototype.asObject())); + ScopedObject o(scope, engine->newObject(klass, engine->objectPrototype.asObject())); { bool needSparseArray = arrayGetterSetterCountAndFlags >> 30; |