diff options
Diffstat (limited to 'src/datavisualization/data/qitemmodelbardataproxy_p.h')
| -rw-r--r-- | src/datavisualization/data/qitemmodelbardataproxy_p.h | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/src/datavisualization/data/qitemmodelbardataproxy_p.h b/src/datavisualization/data/qitemmodelbardataproxy_p.h index a4eefbcd..cea4eb30 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy_p.h +++ b/src/datavisualization/data/qitemmodelbardataproxy_p.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 // // W A R N I N G @@ -43,7 +17,7 @@ #include "qitemmodelbardataproxy.h" #include "qbardataproxy_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class BarItemModelHandler; @@ -74,10 +48,10 @@ private: bool m_autoRowCategories; bool m_autoColumnCategories; - QRegExp m_rowRolePattern; - QRegExp m_columnRolePattern; - QRegExp m_valueRolePattern; - QRegExp m_rotationRolePattern; + QRegularExpression m_rowRolePattern; + QRegularExpression m_columnRolePattern; + QRegularExpression m_valueRolePattern; + QRegularExpression m_rotationRolePattern; QString m_rowRoleReplace; QString m_columnRoleReplace; @@ -90,6 +64,6 @@ private: friend class QItemModelBarDataProxy; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif |