diff options
Diffstat (limited to 'src/datavisualization/data/abstractrenderitem_p.h')
| -rw-r--r-- | src/datavisualization/data/abstractrenderitem_p.h | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/src/datavisualization/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h index 28755d61..765e0ba7 100644 --- a/src/datavisualization/data/abstractrenderitem_p.h +++ b/src/datavisualization/data/abstractrenderitem_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,19 +14,20 @@ #ifndef ABSTRACTRENDERITEM_P_H #define ABSTRACTRENDERITEM_P_H -#include "datavisualizationglobal_p.h" -#include "labelitem_p.h" +#include <private/datavisualizationglobal_p.h> +#include <private/labelitem_p.h> #include <QtGui/QVector3D> #include <QtGui/QQuaternion> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class AbstractRenderItem { public: AbstractRenderItem(); AbstractRenderItem(const AbstractRenderItem &other); + AbstractRenderItem &operator=(const AbstractRenderItem &other) = default; virtual ~AbstractRenderItem(); // Position in 3D scene @@ -75,6 +50,6 @@ protected: friend class QAbstractDataItem; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif |