diff options
Diffstat (limited to 'tests/manual/textrendering/textperformance/main.cpp')
| -rw-r--r-- | tests/manual/textrendering/textperformance/main.cpp | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/tests/manual/textrendering/textperformance/main.cpp b/tests/manual/textrendering/textperformance/main.cpp index eb6d09b9c8..babeb2f810 100644 --- a/tests/manual/textrendering/textperformance/main.cpp +++ b/tests/manual/textrendering/textperformance/main.cpp @@ -1,37 +1,14 @@ -/**************************************************************************** -** -** 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) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses #include <QApplication> #include <QDialog> #include <QFontDatabase> #include <QPainter> #include <QRandomGenerator> -#include <QTime> +#include <QElapsedTimer> #include <QTimer> static const int lastMeasurementsCount = 50; @@ -41,7 +18,7 @@ class FontBlaster: public QWidget Q_OBJECT public: - FontBlaster(QWidget *parent = 0) + FontBlaster(QWidget *parent = nullptr) : QWidget(parent) , m_currentMode(0) { @@ -53,7 +30,7 @@ public: Q_UNUSED(event); QPainter p(this); - if (!m_timer.isNull()) + if (m_timer.isValid()) m_lastMeasurements.append(m_timer.elapsed()); m_timer.start(); @@ -152,7 +129,7 @@ public: { static QStringList samples; if (samples.isEmpty()) { - foreach (const QFontDatabase::WritingSystem system, QFontDatabase().writingSystems()) + foreach (const QFontDatabase::WritingSystem system, QFontDatabase::writingSystems()) if (system != QFontDatabase::Ogham && system != QFontDatabase::Runic) samples.append(QFontDatabase::writingSystemSample(system)); } @@ -195,7 +172,7 @@ private: int m_currentMode; QList<int> m_lastMeasurements; - QTime m_timer; + QElapsedTimer m_timer; }; const struct FontBlaster::mode FontBlaster::m_modes[] = { |