diff options
Diffstat (limited to 'src/qml/qml/qqmlpropertyresolver_p.h')
| -rw-r--r-- | src/qml/qml/qqmlpropertyresolver_p.h | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/src/qml/qml/qqmlpropertyresolver_p.h b/src/qml/qml/qqmlpropertyresolver_p.h index df857f242e..4c9ae4a8af 100644 --- a/src/qml/qml/qqmlpropertyresolver_p.h +++ b/src/qml/qml/qqmlpropertyresolver_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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 #ifndef QQMLPROPERTYRESOLVER_P_H #define QQMLPROPERTYRESOLVER_P_H @@ -59,11 +23,11 @@ QT_BEGIN_NAMESPACE struct Q_QML_EXPORT QQmlPropertyResolver { - QQmlPropertyResolver(const QQmlRefPointer<QQmlPropertyCache> &cache) + QQmlPropertyResolver(const QQmlPropertyCache::ConstPtr &cache) : cache(cache) {} - QQmlPropertyData *property(int index) const + const QQmlPropertyData *property(int index) const { return cache->property(index); } @@ -73,13 +37,13 @@ struct Q_QML_EXPORT QQmlPropertyResolver IgnoreRevision }; - QQmlPropertyData *property(const QString &name, bool *notInRevision = nullptr, + const QQmlPropertyData *property(const QString &name, bool *notInRevision = nullptr, RevisionCheck check = CheckRevision) const; // This code must match the semantics of QQmlPropertyPrivate::findSignalByName - QQmlPropertyData *signal(const QString &name, bool *notInRevision) const; + const QQmlPropertyData *signal(const QString &name, bool *notInRevision) const; - QQmlRefPointer<QQmlPropertyCache> cache; + QQmlPropertyCache::ConstPtr cache; }; QT_END_NAMESPACE |