diff options
Diffstat (limited to 'tests/manual/repaint/shared/shared.h')
-rw-r--r-- | tests/manual/repaint/shared/shared.h | 47 |
1 files changed, 11 insertions, 36 deletions
diff --git a/tests/manual/repaint/shared/shared.h b/tests/manual/repaint/shared/shared.h index 9ca5cbe2be..0a69011b6c 100644 --- a/tests/manual/repaint/shared/shared.h +++ b/tests/manual/repaint/shared/shared.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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 #include <QWidget> #include <QPainter> @@ -37,7 +12,7 @@ Q_OBJECT public: int hue; bool pressed; - StaticWidget(QWidget *parent = 0) + StaticWidget(QWidget *parent = nullptr) :QWidget(parent) { setAttribute(Qt::WA_StaticContents); @@ -53,20 +28,20 @@ public: const int rectSize = 10; QRect rect(pos.x() - rectSize, pos.y() - rectSize, rectSize *2, rectSize * 2); - QList<QRect> updateRects; - updateRects.append(rect.translated(rectSize * 2, rectSize * 2)); - updateRects.append(rect.translated(rectSize * 2, -rectSize * 2)); - updateRects.append(rect.translated(-rectSize * 2, rectSize * 2)); - updateRects.append(rect.translated(-rectSize * 2, -rectSize * 2)); - + const QRect updateRects[] = { + rect.translated(rectSize * 2, rectSize * 2), + rect.translated(rectSize * 2, -rectSize * 2), + rect.translated(-rectSize * 2, rectSize * 2), + rect.translated(-rectSize * 2, -rectSize * 2), + }; bool useRegion = false; if (useRegion) { QRegion region; - region.setRects(updateRects.data(), 4); + region.setRects(updateRects, 4); update(region); } else { - foreach (QRect rect, updateRects) + for (QRect rect : updateRects) update(rect); } } |