diff options
Diffstat (limited to 'tests/manual/touch/main.cpp')
-rw-r--r-- | tests/manual/touch/main.cpp | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/tests/manual/touch/main.cpp b/tests/manual/touch/main.cpp index bd8b39bb85..dcc29799aa 100644 --- a/tests/manual/touch/main.cpp +++ b/tests/manual/touch/main.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 <QApplication> #include <QAction> @@ -407,7 +382,7 @@ void TouchTestWidget::paintEvent(QPaintEvent *) const QRectF geom = QRectF(QPointF(0, 0), QSizeF(size())); painter.fillRect(geom, Qt::white); painter.drawRect(QRectF(geom.topLeft(), geom.bottomRight() - QPointF(1, 1))); - for (const Point &point : qAsConst(m_points)) { + for (const Point &point : std::as_const(m_points)) { if (geom.contains(point.pos)) { if (point.type == MouseRelease) drawEllipse(point.pos, point.horizontalDiameter, point.verticalDiameter, point.color(), painter); @@ -415,7 +390,7 @@ void TouchTestWidget::paintEvent(QPaintEvent *) fillEllipse(point.pos, point.horizontalDiameter, point.verticalDiameter, point.color(), painter); } } - for (const GesturePtr &gp : qAsConst(m_gestures)) + for (const GesturePtr &gp : std::as_const(m_gestures)) gp->draw(geom, painter); } @@ -444,7 +419,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) auto layout = new QVBoxLayout(this); TouchWindowTouchTypes touchTypes; - if (auto nativeWindowsApp = dynamic_cast<QWindowsApplication *>(QGuiApplicationPrivate::platformIntegration())) + if (auto nativeWindowsApp = qGuiApp->nativeInterface<QWindowsApplication>()) touchTypes = nativeWindowsApp->touchWindowTouchType(); m_fineCheckBox = new QCheckBox("Fine Touch", this); @@ -468,7 +443,7 @@ void SettingsDialog::touchTypeToggled() types.setFlag(TouchWindowTouchType::FineTouch); if (m_palmCheckBox->isChecked()) types.setFlag(TouchWindowTouchType::WantPalmTouch); - if (auto nativeWindowsApp = dynamic_cast<QWindowsApplication *>(QGuiApplicationPrivate::platformIntegration())) + if (auto nativeWindowsApp = qGuiApp->nativeInterface<QWindowsApplication>()) nativeWindowsApp->setTouchWindowTouchType(types); else qWarning("Missing Interface QWindowsApplication"); |