diff options
Diffstat (limited to 'src/qmlmodels/qqmlobjectmodel_p.h')
| -rw-r--r-- | src/qmlmodels/qqmlobjectmodel_p.h | 53 |
1 files changed, 7 insertions, 46 deletions
diff --git a/src/qmlmodels/qqmlobjectmodel_p.h b/src/qmlmodels/qqmlobjectmodel_p.h index 5f91b5e8a0..e161586c90 100644 --- a/src/qmlmodels/qqmlobjectmodel_p.h +++ b/src/qmlmodels/qqmlobjectmodel_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml module 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) 2016 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 QQMLINSTANCEMODEL_P_H #define QQMLINSTANCEMODEL_P_H @@ -64,7 +28,7 @@ class QObject; class QQmlChangeSet; class QAbstractItemModel; -class Q_QMLMODELS_PRIVATE_EXPORT QQmlInstanceModel : public QObject +class Q_QMLMODELS_EXPORT QQmlInstanceModel : public QObject { Q_OBJECT @@ -78,8 +42,6 @@ public: Reusable }; - virtual ~QQmlInstanceModel() {} - enum ReleaseFlag { Referenced = 0x01, Destroyed = 0x02, Pooled = 0x04 }; Q_DECLARE_FLAGS(ReleaseFlags, ReleaseFlag) @@ -99,6 +61,8 @@ public: virtual int indexOf(QObject *object, QObject *objectContext) const = 0; virtual const QAbstractItemModel *abstractItemModel() const { return nullptr; } + virtual bool setRequiredProperty(int index, const QString &name, const QVariant &value); + Q_SIGNALS: void countChanged(); void modelUpdated(const QQmlChangeSet &changeSet, bool reset); @@ -118,7 +82,7 @@ private: class QQmlObjectModelAttached; class QQmlObjectModelPrivate; -class Q_QMLMODELS_PRIVATE_EXPORT QQmlObjectModel : public QQmlInstanceModel +class Q_QMLMODELS_EXPORT QQmlObjectModel : public QQmlInstanceModel { Q_OBJECT Q_DECLARE_PRIVATE(QQmlObjectModel) @@ -174,7 +138,7 @@ public: attachedProperties.remove(parent()); } - Q_PROPERTY(int index READ index NOTIFY indexChanged) + Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) int index() const { return m_index; } void setIndex(int idx) { if (m_index != idx) { @@ -204,7 +168,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlInstanceModel) -QML_DECLARE_TYPE(QQmlObjectModel) - #endif // QQMLINSTANCEMODEL_P_H |