diff options
Diffstat (limited to 'src/widgets/itemviews/qbsptree_p.h')
-rw-r--r-- | src/widgets/itemviews/qbsptree_p.h | 56 |
1 files changed, 10 insertions, 46 deletions
diff --git a/src/widgets/itemviews/qbsptree_p.h b/src/widgets/itemviews/qbsptree_p.h index 5fd7a5c45f..1f00616e87 100644 --- a/src/widgets/itemviews/qbsptree_p.h +++ b/src/widgets/itemviews/qbsptree_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 QtWidgets 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 QBSPTREE_P_H #define QBSPTREE_P_H @@ -52,7 +16,7 @@ // #include <QtWidgets/private/qtwidgetsglobal_p.h> -#include <qvector.h> +#include <qlist.h> #include <qrect.h> QT_BEGIN_NAMESPACE @@ -80,7 +44,7 @@ public: }; }; typedef QBspTree::Data QBspTreeData; - typedef void callback(QVector<int> &leaf, const QRect &area, uint visited, QBspTreeData data); + typedef void callback(QList<int> &leaf, const QRect &area, uint visited, QBspTreeData data); QBspTree(); @@ -91,8 +55,8 @@ public: void climbTree(const QRect &rect, callback *function, QBspTreeData data); - inline int leafCount() const { return leaves.count(); } - inline QVector<int> &leaf(int i) { return leaves[i]; } + inline int leafCount() const { return leaves.size(); } + inline QList<int> &leaf(int i) { return leaves[i]; } inline void insertLeaf(const QRect &r, int i) { climbTree(r, &insert, i, 0); } inline void removeLeaf(const QRect &r, int i) { climbTree(r, &remove, i, 0); } @@ -103,14 +67,14 @@ protected: inline int parentIndex(int i) const { return (i & 1) ? ((i - 1) / 2) : ((i - 2) / 2); } inline int firstChildIndex(int i) const { return ((i * 2) + 1); } - static void insert(QVector<int> &leaf, const QRect &area, uint visited, QBspTreeData data); - static void remove(QVector<int> &leaf, const QRect &area, uint visited, QBspTreeData data); + static void insert(QList<int> &leaf, const QRect &area, uint visited, QBspTreeData data); + static void remove(QList<int> &leaf, const QRect &area, uint visited, QBspTreeData data); private: uint depth; mutable uint visited; - QVector<Node> nodes; - mutable QVector< QVector<int> > leaves; // the leaves are just indices into the items + QList<Node> nodes; + mutable QList<QList<int>> leaves; // the leaves are just indices into the items }; QT_END_NAMESPACE |