diff options
Diffstat (limited to 'src/datavisualization/utils/surfaceobject_p.h')
| -rw-r--r-- | src/datavisualization/utils/surfaceobject_p.h | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index 9e317bb2..7a2b7241 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_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 @@ -40,7 +14,6 @@ #ifndef SURFACEOBJECT_P_H #define SURFACEOBJECT_P_H -#include "datavisualizationglobal_p.h" #include "abstractobjecthelper_p.h" #include "qsurfacedataproxy.h" @@ -96,8 +69,8 @@ public: float minYValue() const { return m_minY; } float maxYValue() const { return m_maxY; } inline void activateSurfaceTexture(bool value) { m_returnTextureBuffer = value; } - inline void setLineColor(const QColor &color) { m_wireFrameColor = color; } - inline const QColor &wireFrameColor() const { return m_wireFrameColor; } + inline void setLineColor(const QColor &color) { m_wireframeColor = color; } + inline const QColor &wireframeColor() const { return m_wireframeColor; } private: void createCoarseIndices(GLint *indices, int &p, int row, int upperRow, int j); @@ -132,7 +105,7 @@ private: bool m_returnTextureBuffer = false; SurfaceObject::DataDimensions m_dataDimension; SurfaceObject::DataDimensions m_oldDataDimension = DataDimensions(-1); - QColor m_wireFrameColor; + QColor m_wireframeColor; }; QT_END_NAMESPACE |