diff options
Diffstat (limited to 'src/labs/models/qqmltablemodelcolumn_p.h')
-rw-r--r-- | src/labs/models/qqmltablemodelcolumn_p.h | 49 |
1 files changed, 5 insertions, 44 deletions
diff --git a/src/labs/models/qqmltablemodelcolumn_p.h b/src/labs/models/qqmltablemodelcolumn_p.h index 7da31c9e2a..d095343fe6 100644 --- a/src/labs/models/qqmltablemodelcolumn_p.h +++ b/src/labs/models/qqmltablemodelcolumn_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 QQMLTABLEMODELCOLUMN_P_H #define QQMLTABLEMODELCOLUMN_P_H @@ -54,6 +18,7 @@ #include "qqmlmodelsglobal_p.h" #include <QtCore/QObject> +#include <QtCore/QHash> #include <QtQml/qqml.h> #include <QtQmlModels/private/qtqmlmodelsglobal_p.h> #include <QtQml/qjsvalue.h> @@ -62,11 +27,11 @@ QT_REQUIRE_CONFIG(qml_table_model); QT_BEGIN_NAMESPACE -class Q_LABSQMLMODELS_PRIVATE_EXPORT QQmlTableModelColumn : public QObject +class Q_LABSQMLMODELS_EXPORT QQmlTableModelColumn : public QObject { Q_OBJECT Q_PROPERTY(QJSValue display READ display WRITE setDisplay NOTIFY displayChanged FINAL) - Q_PROPERTY(QJSValue setDisplay READ getSetDisplay WRITE setSetDisplay NOTIFY setDisplayChanged) + Q_PROPERTY(QJSValue setDisplay READ getSetDisplay WRITE setSetDisplay NOTIFY setDisplayChanged FINAL) Q_PROPERTY(QJSValue decoration READ decoration WRITE setDecoration NOTIFY decorationChanged FINAL) Q_PROPERTY(QJSValue setDecoration READ getSetDecoration WRITE setSetDecoration NOTIFY setDecorationChanged FINAL) Q_PROPERTY(QJSValue edit READ edit WRITE setEdit NOTIFY editChanged FINAL) @@ -216,8 +181,6 @@ Q_SIGNALS: void setSizeHintChanged(); private: - int mIndex = -1; - // We store these in hashes because QQuickTableModel needs string-based lookup in certain situations. QHash<QString, QJSValue> mGetters; QHash<QString, QJSValue> mSetters; @@ -225,6 +188,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlTableModelColumn) - #endif // QQMLTABLEMODELCOLUMN_P_H |