diff options
Diffstat (limited to 'src/datavisualization/theme/q3dtheme.h')
| -rw-r--r-- | src/datavisualization/theme/q3dtheme.h | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h index e0a49631..5087d854 100644 --- a/src/datavisualization/theme/q3dtheme.h +++ b/src/datavisualization/theme/q3dtheme.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 Q3DTHEME_H #define Q3DTHEME_H @@ -36,11 +10,11 @@ #include <QtGui/QFont> #include <QtGui/QColor> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DThemePrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DTheme : public QObject +class Q_DATAVISUALIZATION_EXPORT Q3DTheme : public QObject { Q_OBJECT Q_ENUMS(ColorStyle) @@ -76,7 +50,7 @@ public: }; enum Theme { - ThemeQt, + ThemeQt = 0, ThemePrimaryColors, ThemeDigia, ThemeStoneMoss, @@ -197,6 +171,6 @@ private: friend class Abstract3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif |