diff options
Diffstat (limited to 'src/datavisualization/data/qitemmodelscatterdataproxy.h')
-rw-r--r-- | src/datavisualization/data/qitemmodelscatterdataproxy.h | 86 |
1 files changed, 30 insertions, 56 deletions
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h index 9a85c4aa..3e4d41f3 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QITEMMODELSCATTERDATAPROXY_H #define QITEMMODELSCATTERDATAPROXY_H @@ -33,13 +7,13 @@ #include <QtDataVisualization/qscatterdataproxy.h> #include <QtCore/QAbstractItemModel> #include <QtCore/QString> -#include <QtCore/QRegExp> +#include <QtCore/QRegularExpression> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QItemModelScatterDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy +class Q_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy { Q_OBJECT Q_PROPERTY(QAbstractItemModel* itemModel READ itemModel WRITE setItemModel NOTIFY itemModelChanged) @@ -47,14 +21,14 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDa Q_PROPERTY(QString yPosRole READ yPosRole WRITE setYPosRole NOTIFY yPosRoleChanged) Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole NOTIFY zPosRoleChanged) Q_PROPERTY(QString rotationRole READ rotationRole WRITE setRotationRole NOTIFY rotationRoleChanged) - Q_PROPERTY(QRegExp xPosRolePattern READ xPosRolePattern WRITE setXPosRolePattern NOTIFY xPosRolePatternChanged REVISION 1) - Q_PROPERTY(QRegExp yPosRolePattern READ yPosRolePattern WRITE setYPosRolePattern NOTIFY yPosRolePatternChanged REVISION 1) - Q_PROPERTY(QRegExp zPosRolePattern READ zPosRolePattern WRITE setZPosRolePattern NOTIFY zPosRolePatternChanged REVISION 1) - Q_PROPERTY(QRegExp rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION 1) - Q_PROPERTY(QString xPosRoleReplace READ xPosRoleReplace WRITE setXPosRoleReplace NOTIFY xPosRoleReplaceChanged REVISION 1) - Q_PROPERTY(QString yPosRoleReplace READ yPosRoleReplace WRITE setYPosRoleReplace NOTIFY yPosRoleReplaceChanged REVISION 1) - Q_PROPERTY(QString zPosRoleReplace READ zPosRoleReplace WRITE setZPosRoleReplace NOTIFY zPosRoleReplaceChanged REVISION 1) - Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION 1) + Q_PROPERTY(QRegularExpression xPosRolePattern READ xPosRolePattern WRITE setXPosRolePattern NOTIFY xPosRolePatternChanged REVISION(1, 1)) + Q_PROPERTY(QRegularExpression yPosRolePattern READ yPosRolePattern WRITE setYPosRolePattern NOTIFY yPosRolePatternChanged REVISION(1, 1)) + Q_PROPERTY(QRegularExpression zPosRolePattern READ zPosRolePattern WRITE setZPosRolePattern NOTIFY zPosRolePatternChanged REVISION(1, 1)) + Q_PROPERTY(QRegularExpression rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION(1, 1)) + Q_PROPERTY(QString xPosRoleReplace READ xPosRoleReplace WRITE setXPosRoleReplace NOTIFY xPosRoleReplaceChanged REVISION(1, 1)) + Q_PROPERTY(QString yPosRoleReplace READ yPosRoleReplace WRITE setYPosRoleReplace NOTIFY yPosRoleReplaceChanged REVISION(1, 1)) + Q_PROPERTY(QString zPosRoleReplace READ zPosRoleReplace WRITE setZPosRoleReplace NOTIFY zPosRoleReplaceChanged REVISION(1, 1)) + Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION(1, 1)) public: explicit QItemModelScatterDataProxy(QObject *parent = nullptr); @@ -83,14 +57,14 @@ public: void remap(const QString &xPosRole, const QString &yPosRole, const QString &zPosRole, const QString &rotationRole); - void setXPosRolePattern(const QRegExp &pattern); - QRegExp xPosRolePattern() const; - void setYPosRolePattern(const QRegExp &pattern); - QRegExp yPosRolePattern() const; - void setZPosRolePattern(const QRegExp &pattern); - QRegExp zPosRolePattern() const; - void setRotationRolePattern(const QRegExp &pattern); - QRegExp rotationRolePattern() const; + void setXPosRolePattern(const QRegularExpression &pattern); + QRegularExpression xPosRolePattern() const; + void setYPosRolePattern(const QRegularExpression &pattern); + QRegularExpression yPosRolePattern() const; + void setZPosRolePattern(const QRegularExpression &pattern); + QRegularExpression zPosRolePattern() const; + void setRotationRolePattern(const QRegularExpression &pattern); + QRegularExpression rotationRolePattern() const; void setXPosRoleReplace(const QString &replace); QString xPosRoleReplace() const; @@ -107,14 +81,14 @@ Q_SIGNALS: void yPosRoleChanged(const QString &role); void zPosRoleChanged(const QString &role); void rotationRoleChanged(const QString &role); - Q_REVISION(1) void xPosRolePatternChanged(const QRegExp &pattern); - Q_REVISION(1) void yPosRolePatternChanged(const QRegExp &pattern); - Q_REVISION(1) void zPosRolePatternChanged(const QRegExp &pattern); - Q_REVISION(1) void rotationRolePatternChanged(const QRegExp &pattern); - Q_REVISION(1) void rotationRoleReplaceChanged(const QString &replace); - Q_REVISION(1) void xPosRoleReplaceChanged(const QString &replace); - Q_REVISION(1) void yPosRoleReplaceChanged(const QString &replace); - Q_REVISION(1) void zPosRoleReplaceChanged(const QString &replace); + Q_REVISION(1, 1) void xPosRolePatternChanged(const QRegularExpression &pattern); + Q_REVISION(1, 1) void yPosRolePatternChanged(const QRegularExpression &pattern); + Q_REVISION(1, 1) void zPosRolePatternChanged(const QRegularExpression &pattern); + Q_REVISION(1, 1) void rotationRolePatternChanged(const QRegularExpression &pattern); + Q_REVISION(1, 1) void rotationRoleReplaceChanged(const QString &replace); + Q_REVISION(1, 1) void xPosRoleReplaceChanged(const QString &replace); + Q_REVISION(1, 1) void yPosRoleReplaceChanged(const QString &replace); + Q_REVISION(1, 1) void zPosRoleReplaceChanged(const QString &replace); protected: QItemModelScatterDataProxyPrivate *dptr(); @@ -126,6 +100,6 @@ private: friend class ScatterItemModelHandler; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif |