diff options
Diffstat (limited to 'src/qml/qml/qqmlpropertyresolver.cpp')
-rw-r--r-- | src/qml/qml/qqmlpropertyresolver.cpp | 55 |
1 files changed, 9 insertions, 46 deletions
diff --git a/src/qml/qml/qqmlpropertyresolver.cpp b/src/qml/qml/qqmlpropertyresolver.cpp index 396f2876b9..0217f7b7b5 100644 --- a/src/qml/qml/qqmlpropertyresolver.cpp +++ b/src/qml/qml/qqmlpropertyresolver.cpp @@ -1,53 +1,18 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the tools applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qqmlpropertyresolver_p.h" #include <private/qqmlcontextdata_p.h> +#include <private/qqmlsignalnames_p.h> QT_BEGIN_NAMESPACE -QQmlPropertyData *QQmlPropertyResolver::property(const QString &name, bool *notInRevision, +const QQmlPropertyData *QQmlPropertyResolver::property(const QString &name, bool *notInRevision, RevisionCheck check) const { if (notInRevision) *notInRevision = false; - QQmlPropertyData *d = cache->property(name, nullptr, nullptr); + const QQmlPropertyData *d = cache->property(name, nullptr, nullptr); // Find the first property while (d && d->isFunction()) @@ -62,11 +27,11 @@ QQmlPropertyData *QQmlPropertyResolver::property(const QString &name, bool *notI } -QQmlPropertyData *QQmlPropertyResolver::signal(const QString &name, bool *notInRevision) const +const QQmlPropertyData *QQmlPropertyResolver::signal(const QString &name, bool *notInRevision) const { if (notInRevision) *notInRevision = false; - QQmlPropertyData *d = cache->property(name, nullptr, nullptr); + const QQmlPropertyData *d = cache->property(name, nullptr, nullptr); if (notInRevision) *notInRevision = false; while (d && !(d->isFunction())) @@ -79,10 +44,8 @@ QQmlPropertyData *QQmlPropertyResolver::signal(const QString &name, bool *notInR return d; } - if (name.endsWith(QLatin1String("Changed"))) { - QString propName = name.mid(0, name.length() - static_cast<int>(strlen("Changed"))); - - d = property(propName, notInRevision); + if (auto propName = QQmlSignalNames::changedSignalNameToPropertyName(name)) { + d = property(*propName, notInRevision); if (d) return cache->signal(d->notifyIndex()); } |