diff options
| author | Oleg Shparber <trollixx@gmail.com> | 2014-12-31 10:40:16 -0800 |
|---|---|---|
| committer | Oleg Shparber <trollixx@gmail.com> | 2015-01-03 23:29:51 +0100 |
| commit | 4a9ed3de7d92809cf575f245f55d4f422b4983c3 (patch) | |
| tree | df242fa9aa2895cf451096d2384e8f04ce1d0c70 /src/qml/qml | |
| parent | 21d481c209692ec73ab6b6bc43e6977fc2f8c2fc (diff) | |
Use QV4::ScopedArrayObject typedef instead of actual type
Change-Id: I975536745ac6c264aca074f84d223fbec7682d3d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmllocale.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index bc7b651c93..ce6b956fe6 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -493,7 +493,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::CallContext *ctx) QList<Qt::DayOfWeek> days = locale->weekdays(); - QV4::Scoped<QV4::ArrayObject> result(scope, ctx->d()->engine->newArrayObject()); + QV4::ScopedArrayObject result(scope, ctx->d()->engine->newArrayObject()); result->arrayReserve(days.size()); for (int i = 0; i < days.size(); ++i) { int day = days.at(i); @@ -514,7 +514,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_uiLanguages(QV4::CallContext *ctx) return QV4::Encode::undefined(); QStringList langs = locale->uiLanguages(); - QV4::Scoped<QV4::ArrayObject> result(scope, ctx->d()->engine->newArrayObject()); + QV4::ScopedArrayObject result(scope, ctx->d()->engine->newArrayObject()); result->arrayReserve(langs.size()); QV4::ScopedValue v(scope); for (int i = 0; i < langs.size(); ++i) diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 68dabfb203..8d032d9834 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -926,7 +926,7 @@ ReturnedValue QtObject::method_createQmlObject(CallContext *ctx) Scope scope(v4); QString errorstr = QLatin1String("Qt.createQmlObject(): failed to create object: "); - QV4::Scoped<ArrayObject> qmlerrors(scope, v4->newArrayObject()); + QV4::ScopedArrayObject qmlerrors(scope, v4->newArrayObject()); QV4::ScopedObject qmlerror(scope); QV4::ScopedString s(scope); QV4::ScopedValue v(scope); diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 81e4c71149..fa9fb6c41d 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -309,7 +309,7 @@ QVariant QV8Engine::objectToVariant(QV4::ExecutionEngine *e, QV4::Object *o, V8O static QV4::ReturnedValue arrayFromVariantList(QV4::ExecutionEngine *e, const QVariantList &list) { QV4::Scope scope(e); - QV4::Scoped<QV4::ArrayObject> a(scope, e->newArrayObject()); + QV4::ScopedArrayObject a(scope, e->newArrayObject()); int len = list.count(); a->arrayReserve(len); QV4::ScopedValue v(scope); @@ -431,7 +431,7 @@ QV4::ReturnedValue QV8Engine::fromVariant(QV4::ExecutionEngine *e, const QVarian // XXX Can this be made more by using Array as a prototype and implementing // directly against QList<QObject*>? const QList<QObject *> &list = *(QList<QObject *>*)ptr; - QV4::Scoped<QV4::ArrayObject> a(scope, e->newArrayObject()); + QV4::ScopedArrayObject a(scope, e->newArrayObject()); a->arrayReserve(list.count()); QV4::ScopedValue v(scope); for (int ii = 0; ii < list.count(); ++ii) @@ -591,7 +591,7 @@ QV4::ReturnedValue QV8Engine::global() QV4::ReturnedValue QV8Engine::variantListToJS(const QVariantList &lst) { QV4::Scope scope(m_v4Engine); - QV4::Scoped<QV4::ArrayObject> a(scope, m_v4Engine->newArrayObject()); + QV4::ScopedArrayObject a(scope, m_v4Engine->newArrayObject()); a->arrayReserve(lst.size()); QV4::ScopedValue v(scope); for (int i = 0; i < lst.size(); i++) |