diff options
Diffstat (limited to 'src/labs/models/qqmltablemodel_p.h')
| -rw-r--r-- | src/labs/models/qqmltablemodel_p.h | 53 |
1 files changed, 9 insertions, 44 deletions
diff --git a/src/labs/models/qqmltablemodel_p.h b/src/labs/models/qqmltablemodel_p.h index 60897fe007..9157c989d3 100644 --- a/src/labs/models/qqmltablemodel_p.h +++ b/src/labs/models/qqmltablemodel_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 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) 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 QQMLTABLEMODEL_P_H #define QQMLTABLEMODEL_P_H @@ -55,6 +19,7 @@ #include "qqmltablemodelcolumn_p.h" #include <QtCore/QObject> +#include <QtCore/QHash> #include <QtCore/QAbstractTableModel> #include <QtQml/qqml.h> #include <QtQmlModels/private/qtqmlmodelsglobal_p.h> @@ -65,7 +30,7 @@ QT_REQUIRE_CONFIG(qml_table_model); QT_BEGIN_NAMESPACE -class Q_LABSQMLMODELS_PRIVATE_EXPORT QQmlTableModel : public QAbstractTableModel, public QQmlParserStatus +class Q_LABSQMLMODELS_EXPORT QQmlTableModel : public QAbstractTableModel, public QQmlParserStatus { Q_OBJECT Q_PROPERTY(int columnCount READ columnCount NOTIFY columnCountChanged FINAL) @@ -109,12 +74,17 @@ public: Q_INVOKABLE bool setData(const QModelIndex &index, const QString &role, const QVariant &value); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::DisplayRole) override; QHash<int, QByteArray> roleNames() const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; Q_SIGNALS: void columnCountChanged(); void rowCountChanged(); void rowsChanged(); +protected: + void classBegin() override; + void componentComplete() override; + private: class ColumnRoleMetadata { @@ -156,9 +126,6 @@ private: void doInsert(int rowIndex, const QVariant &row); - void classBegin() override; - void componentComplete() override; - bool componentCompleted = false; QVariantList mRows; QList<QQmlTableModelColumn *> mColumns; @@ -173,6 +140,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlTableModel) - #endif // QQMLTABLEMODEL_P_H |