diff options
Diffstat (limited to 'src/labs/models/qqmltablemodel.cpp')
| -rw-r--r-- | src/labs/models/qqmltablemodel.cpp | 56 |
1 files changed, 15 insertions, 41 deletions
diff --git a/src/labs/models/qqmltablemodel.cpp b/src/labs/models/qqmltablemodel.cpp index e60c525b0d..6b14eeaaef 100644 --- a/src/labs/models/qqmltablemodel.cpp +++ b/src/labs/models/qqmltablemodel.cpp @@ -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 #include "qqmltablemodel_p.h" @@ -49,7 +13,7 @@ Q_LOGGING_CATEGORY(lcTableModel, "qt.qml.tablemodel") /*! \qmltype TableModel - \instantiates QQmlTableModel +//! \instantiates QQmlTableModel \inqmlmodule Qt.labs.qmlmodels \brief Encapsulates a simple table model. \since 5.14 @@ -124,7 +88,9 @@ Q_LOGGING_CATEGORY(lcTableModel, "qt.qml.tablemodel") TableModel { TableModelColumn { display: function(modelIndex) { return rows[modelIndex.row][0].checked } - setDisplay: function(modelIndex, cellData) { rows[modelIndex.row][0].checked = cellData } + setDisplay: function(modelIndex, cellData) { + rows[modelIndex.row][0].checked = cellData + } } // ... @@ -661,7 +627,7 @@ void QQmlTableModel::columns_append(QQmlListProperty<QQmlTableModelColumn> *prop qsizetype QQmlTableModel::columns_count(QQmlListProperty<QQmlTableModelColumn> *property) { const QQmlTableModel *model = static_cast<QQmlTableModel*>(property->object); - return model->mColumns.count(); + return model->mColumns.size(); } QQmlTableModelColumn *QQmlTableModel::columns_at(QQmlListProperty<QQmlTableModelColumn> *property, qsizetype index) @@ -1084,4 +1050,12 @@ bool QQmlTableModel::validateRowIndex(const char *functionName, const char *argu return true; } +Qt::ItemFlags QQmlTableModel::flags(const QModelIndex &index) const +{ + Q_UNUSED(index) + return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable; +} + QT_END_NAMESPACE + +#include "moc_qqmltablemodel_p.cpp" |