From 67b8f78faee20b99fbd149c0d240ca760864f86a Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 17 Feb 2021 15:45:26 +0100 Subject: QQmlProperty: use new findAlias target overload Change-Id: If72f0aa2b194dc3fd48ed2679c2229748e5a5001 Reviewed-by: Ulf Hermann --- src/qml/qml/qqmlproperty.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qml/qml/qqmlproperty.cpp') diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 598263e0a3..786063647b 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -805,9 +805,7 @@ void QQmlPropertyPrivate::removeBinding(QObject *o, QQmlPropertyIndex index) { Q_ASSERT(o); - QObject *target; - QQmlPropertyIndex targetIndex; - findAliasTarget(o, index, &target, &targetIndex); + auto [target, targetIndex] = findAliasTarget(o, index); removeOldBinding(target, targetIndex); } @@ -822,7 +820,9 @@ void QQmlPropertyPrivate::removeBinding(const QQmlProperty &that) QQmlAbstractBinding * QQmlPropertyPrivate::binding(QObject *object, QQmlPropertyIndex index) { - findAliasTarget(object, index, &object, &index); + auto aliasTarget = findAliasTarget(object, index); + object = aliasTarget.targetObject; + index = aliasTarget.targetIndex; QQmlData *data = QQmlData::get(object); if (!data) -- cgit v1.2.3