diff options
Diffstat (limited to 'tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp')
-rw-r--r-- | tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp | 65 |
1 files changed, 21 insertions, 44 deletions
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 27f5a90bab..cefbc75e76 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -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 <qtest.h> #include <QtCore/QDebug> @@ -68,11 +43,11 @@ public: void tryResize(int width, int height) { - QWidget *desktop = QApplication::desktop(); - if (desktop->width() < width) - width = desktop->width(); - if (desktop->height() < height) - height = desktop->height(); + const QSize desktopSize = QGuiApplication::primaryScreen()->size(); + if (desktopSize.width() < width) + width = desktopSize.width(); + if (desktopSize.height() < height) + height = desktopSize.height(); if (size() != QSize(width, height)) { resize(width, height); QTest::qWait(250); @@ -81,14 +56,14 @@ public: } protected: - void paintEvent(QPaintEvent *event) + void paintEvent(QPaintEvent *event) override { QGraphicsView::paintEvent(event); if (waiting) eventLoop.exit(); } - void timerEvent(QTimerEvent *event) + void timerEvent(QTimerEvent *event) override { if (event->timerId() == timerId) eventLoop.exit(); @@ -469,7 +444,7 @@ void tst_QGraphicsView::deepNesting() class AnimatedPixmapItem : public QGraphicsPixmapItem { public: - AnimatedPixmapItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = 0) + AnimatedPixmapItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent), rotateFactor(0), scaleFactor(0) { rotate = rot; @@ -479,7 +454,7 @@ public: } protected: - void advance(int i) + void advance(int i) override { if (!i) return; @@ -576,7 +551,7 @@ void tst_QGraphicsView::imageRiver() class AnimatedTextItem : public QGraphicsSimpleTextItem { public: - AnimatedTextItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = 0) + AnimatedTextItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = nullptr) : QGraphicsSimpleTextItem(parent), rotateFactor(0), scaleFactor(25) { setText("River of text"); @@ -587,7 +562,7 @@ public: } protected: - void advance(int i) + void advance(int i) override { if (!i) return; @@ -686,21 +661,22 @@ void tst_QGraphicsView::textRiver() class AnimatedPixmapCacheItem : public QGraphicsPixmapItem { public: - AnimatedPixmapCacheItem(int x, int y, QGraphicsItem *parent = 0) + AnimatedPixmapCacheItem(int x, int y, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent) { xspeed = x; yspeed = y; } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget = 0) override { QGraphicsPixmapItem::paint(painter,option,widget); //We just want to wait, and we don't want to process the event loop with qWait QTest::qSleep(3); } protected: - void advance(int i) + void advance(int i) override { if (!i) return; @@ -787,17 +763,18 @@ void tst_QGraphicsView::moveItemCache() class UpdatedPixmapCacheItem : public QGraphicsPixmapItem { public: - UpdatedPixmapCacheItem(bool partial, QGraphicsItem *parent = 0) + UpdatedPixmapCacheItem(bool partial, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent), partial(partial) { } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget = 0) override { QGraphicsPixmapItem::paint(painter,option,widget); } protected: - void advance(int i) + void advance(int i) override { Q_UNUSED(i); if (partial) |