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/types | |
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/types')
-rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 4 | ||||
-rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 4 | ||||
-rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index ec8ad4ac4d..bd3ddcf0d1 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -1710,7 +1710,7 @@ void QQmlDelegateModelItemMetaType::initializePrototype() QV4::ExecutionEngine *v4 = QV8Engine::getV4(v8Engine); QV4::Scope scope(v4); - QV4::Scoped<QV4::Object> proto(scope, v4->newObject()); + QV4::ScopedObject proto(scope, v4->newObject()); proto->defineAccessorProperty(QStringLiteral("model"), QQmlDelegateModelItem::get_model, 0); proto->defineAccessorProperty(QStringLiteral("groups"), QQmlDelegateModelItem::get_groups, QQmlDelegateModelItem::set_groups); QV4::ScopedString s(scope); @@ -3338,7 +3338,7 @@ QQmlDelegateModelEngineData::QQmlDelegateModelEngineData(QV8Engine *e) QV4::ExecutionEngine *v4 = QV8Engine::getV4(e); QV4::Scope scope(v4); - QV4::Scoped<QV4::Object> proto(scope, v4->newObject()); + QV4::ScopedObject proto(scope, v4->newObject()); proto->defineAccessorProperty(QStringLiteral("index"), QQmlDelegateModelGroupChange::method_get_index, 0); proto->defineAccessorProperty(QStringLiteral("count"), QQmlDelegateModelGroupChange::method_get_count, 0); proto->defineAccessorProperty(QStringLiteral("moveId"), QQmlDelegateModelGroupChange::method_get_moveId, 0); diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index cf9ee747a9..44a64ce71b 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -1180,7 +1180,7 @@ int ListElement::setJsProperty(const ListLayout::Role &role, const QV4::ValueRef QV4::ScopedArrayObject a(scope, d); if (role.type == ListLayout::Role::List) { QV4::Scope scope(a->engine()); - QV4::Scoped<QV4::Object> o(scope); + QV4::ScopedObject o(scope); ListModel *subModel = new ListModel(role.subLayout, 0, -1); int arrayLength = a->getLength(); @@ -2084,7 +2084,7 @@ void QQmlListModel::append(QQmlV4Function *args) QV4::ScopedArrayObject objectArray(scope, (*args)[0]); if (objectArray) { - QV4::Scoped<QV4::Object> argObject(scope); + QV4::ScopedObject argObject(scope); int objectArrayLength = objectArray->getLength(); diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index 7289a476c6..c1a7adf630 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -306,7 +306,7 @@ QV4::ReturnedValue QQuickWorkerScriptEnginePrivate::getWorker(WorkerScript *scri Q_ASSERT(!!w); w->setReadOnly(false); - QV4::Scoped<QV4::Object> api(scope, v4->newObject()); + QV4::ScopedObject api(scope, v4->newObject()); api->put(QV4::ScopedString(scope, v4->newString(QStringLiteral("sendMessage"))), QV4::ScopedValue(scope, workerEngine->sendFunction(script->id))); w->QV4::Object::put(QV4::ScopedString(scope, v4->newString(QStringLiteral("WorkerScript"))), api); @@ -382,7 +382,7 @@ void QQuickWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url) return; script->source = url; - QV4::Scoped<QV4::Object> activation(scope, getWorker(script)); + QV4::ScopedObject activation(scope, getWorker(script)); if (!activation) return; |