diff options
Diffstat (limited to 'src/gui/painting/qtriangulator_p.h')
-rw-r--r-- | src/gui/painting/qtriangulator_p.h | 54 |
1 files changed, 9 insertions, 45 deletions
diff --git a/src/gui/painting/qtriangulator_p.h b/src/gui/painting/qtriangulator_p.h index 177e5e66ed..09db3f1619 100644 --- a/src/gui/painting/qtriangulator_p.h +++ b/src/gui/painting/qtriangulator_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or 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.GPL2 and 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-2.0.html and -** 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 LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTRIANGULATOR_P_H #define QTRIANGULATOR_P_H @@ -52,8 +16,8 @@ // #include <QtGui/private/qtguiglobal_p.h> -#include <QtCore/qvector.h> #include <QtGui/private/qvectorpath_p.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE @@ -67,13 +31,13 @@ public: inline Type type() const { return t; } - inline void setDataUint(const QVector<quint32> &data) + inline void setDataUint(const QList<quint32> &data) { t = UnsignedInt; indices32 = data; } - inline void setDataUshort(const QVector<quint16> &data) + inline void setDataUshort(const QList<quint16> &data) { t = UnsignedShort; indices16 = data; @@ -96,20 +60,20 @@ public: private: Type t; - QVector<quint32> indices32; - QVector<quint16> indices16; + QList<quint32> indices32; + QList<quint16> indices16; }; struct QTriangleSet { // The vertices of a triangle are given by: (x[i[n]], y[i[n]]), (x[j[n]], y[j[n]]), (x[k[n]], y[k[n]]), n = 0, 1, ... - QVector<qreal> vertices; // [x[0], y[0], x[1], y[1], x[2], ...] + QList<qreal> vertices; // [x[0], y[0], x[1], y[1], x[2], ...] QVertexIndexVector indices; // [i[0], j[0], k[0], i[1], j[1], k[1], i[2], ...] }; struct QPolylineSet { - QVector<qreal> vertices; // [x[0], y[0], x[1], y[1], x[2], ...] + QList<qreal> vertices; // [x[0], y[0], x[1], y[1], x[2], ...] QVertexIndexVector indices; // End of polyline is marked with -1. }; |