diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-06 16:11:23 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-07 18:33:09 +0200 |
| commit | 598e69f5ffb2edf00b632bf4f631ffe0b0d2b97a (patch) | |
| tree | 7e061f2d92a44fe90685223d94c987f7b655f2f9 /src/qml/qml/qqmltypewrapper.cpp | |
| parent | 4591504267d4c0c0804592c812ed964ee783eceb (diff) | |
Get rid of QV8QObjectWrapper:setProperty and SetProperty
Fold it all into QV4::QObjectWrapper::setQmlProperty and remove
a lot of otherwise unused code.
Change-Id: Ic28233fa7d4df898ff39ac065044319e01d47b88
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmltypewrapper.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypewrapper.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp index b3b1dedf07..a41e3c439a 100644 --- a/src/qml/qml/qqmltypewrapper.cpp +++ b/src/qml/qml/qqmltypewrapper.cpp @@ -241,8 +241,7 @@ void QmlTypeWrapper::put(Managed *m, ExecutionContext *ctx, String *name, const QObject *object = w->object; QObject *ao = qmlAttachedPropertiesObjectById(type->attachedPropertiesId(), object); if (ao) - v8engine->qobjectWrapper()->setProperty(ao, propertystring, context, value, - QV4::QObjectWrapper::IgnoreRevision); + QV4::QObjectWrapper::setQmlProperty(ctx, context, ao, name, QV4::QObjectWrapper::IgnoreRevision, value); } else if (type && type->isSingleton()) { QQmlEngine *e = v8engine->engine(); QQmlType::SingletonInstanceInfo *siinfo = type->singletonInstanceInfo(); @@ -250,8 +249,7 @@ void QmlTypeWrapper::put(Managed *m, ExecutionContext *ctx, String *name, const QObject *qobjectSingleton = siinfo->qobjectApi(e); if (qobjectSingleton) { - v8engine->qobjectWrapper()->setProperty(qobjectSingleton, propertystring, context, value, - QV4::QObjectWrapper::IgnoreRevision); + QV4::QObjectWrapper::setQmlProperty(ctx, context, qobjectSingleton, name, QV4::QObjectWrapper::IgnoreRevision, value); } else if (!siinfo->scriptApi(e).isUndefined()) { QV4::Object *apiprivate = QJSValuePrivate::get(siinfo->scriptApi(e))->value.asObject(); if (!apiprivate) { |