diff options
Diffstat (limited to 'src/datavisualization/engine/scatter3dcontroller_p.h')
| -rw-r--r-- | src/datavisualization/engine/scatter3dcontroller_p.h | 64 |
1 files changed, 19 insertions, 45 deletions
diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h index 46acd282..175e4b82 100644 --- a/src/datavisualization/engine/scatter3dcontroller_p.h +++ b/src/datavisualization/engine/scatter3dcontroller_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,10 +14,10 @@ #ifndef Q3DSCATTERCONTROLLER_p_H #define Q3DSCATTERCONTROLLER_p_H -#include "datavisualizationglobal_p.h" -#include "abstract3dcontroller_p.h" +#include <private/datavisualizationglobal_p.h> +#include <private/abstract3dcontroller_p.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Scatter3DRenderer; class QScatterDataProxy; @@ -60,7 +34,7 @@ struct Scatter3DChangeBitField { } }; -class QT_DATAVISUALIZATION_EXPORT Scatter3DController : public Abstract3DController +class Q_DATAVISUALIZATION_EXPORT Scatter3DController : public Abstract3DController { Q_OBJECT @@ -107,28 +81,28 @@ public: explicit Scatter3DController(QRect rect, Q3DScene *scene = 0); ~Scatter3DController(); - virtual void initializeOpenGL(); + void initializeOpenGL() override; // Change selection mode - void setSelectionMode(QAbstract3DGraph::SelectionFlags mode); + void setSelectionMode(QAbstract3DGraph::SelectionFlags mode) override; inline QScatter3DSeries *selectedSeries() const { return m_selectedItemSeries; } void setSelectedItem(int index, QScatter3DSeries *series); static inline int invalidSelectionIndex() { return -1; } - virtual void clearSelection(); + void clearSelection() override; - void synchDataToRenderer(); + void synchDataToRenderer() override; - virtual void addSeries(QAbstract3DSeries *series); - virtual void removeSeries(QAbstract3DSeries *series); + void addSeries(QAbstract3DSeries *series) override; + void removeSeries(QAbstract3DSeries *series) override; virtual QList<QScatter3DSeries *> scatterSeriesList(); - virtual void handleAxisAutoAdjustRangeChangedInOrientation( - QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust); - virtual void handleAxisRangeChangedBySender(QObject *sender); - virtual void handlePendingClick(); - virtual void adjustAxisRanges(); + void handleAxisAutoAdjustRangeChangedInOrientation( + QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust) override; + void handleAxisRangeChangedBySender(QObject *sender) override; + void handlePendingClick() override; + void adjustAxisRanges() override; public Q_SLOTS: void handleArrayReset(); @@ -141,13 +115,13 @@ Q_SIGNALS: void selectedSeriesChanged(QScatter3DSeries *series); protected: - virtual void startRecordingRemovesAndInserts(); + void startRecordingRemovesAndInserts() override; private: Q_DISABLE_COPY(Scatter3DController) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif |