1 files changed, 13 insertions, 35 deletions

diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
index bd0f4feb09..d2ccf7b990 100644
--- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
+++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.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>
 
@@ -45,7 +20,7 @@
 #include <math.h>
 
 #ifdef Q_OS_WIN
-#include <windows.h>
+#include <qt_windows.h>
 #endif
 
 #if QT_CONFIG(printer)
@@ -928,7 +903,8 @@ void tst_QPrinter::duplex()
         QPrinter::DuplexMode expected = printerInfo.defaultDuplexMode();
         QCOMPARE(native.duplex(), expected);
         // Test set/get (skipping Auto as that will return something different)
-        foreach (QPrinter::DuplexMode mode, printerInfo.supportedDuplexModes()) {
+        const auto supported = printerInfo.supportedDuplexModes();
+        for (QPrinter::DuplexMode mode : supported) {
             if (mode != expected && mode != QPrinter::DuplexAuto) {
                 expected = mode;
                 break;
@@ -1218,7 +1194,8 @@ void tst_QPrinter::paperSource()
         QPrinter::PaperSource expected = QPrinter::Manual;
 #ifdef Q_OS_WIN
         expected = QPrinter::Auto;
-        foreach (QPrinter::PaperSource supported, native.supportedPaperSources()) {
+        const auto sources = native.supportedPaperSources();
+        for (QPrinter::PaperSource supported : sources) {
             if (supported != QPrinter::Auto) {
                 expected = supported;
                 break;
@@ -1340,7 +1317,8 @@ void tst_QPrinter::printerName()
 
         // Test set/get
         QString expected = QPrinterInfo::defaultPrinter().printerName();
-        foreach (const QPrinterInfo &available, QPrinterInfo::availablePrinters()) {
+        const auto allAvailable = QPrinterInfo::availablePrinters();
+        for (const QPrinterInfo &available : allAvailable) {
             if (available.printerName() != expected) {
                 expected = available.printerName();
                 break;
@@ -1433,7 +1411,7 @@ void tst_QPrinter::resolution()
 #ifdef Q_OS_MAC
         // QMacPrintEngine chooses the closest supported resolution.
         const QList<int> all_supported = native.supportedResolutions();
-        foreach (int supported, all_supported) {
+        for (int supported : all_supported) {
             // Test setting a supported resolution
             int requested = supported;
             native.setResolution(requested);
@@ -1727,7 +1705,7 @@ void tst_QPrinter::reusePageMetrics()
     QPrinter defaultP;
     QPrinterInfo info(defaultP);
     QString otherPrinterName;
-    for (QPrinterInfo i : qAsConst(availablePrinters)) {
+    for (QPrinterInfo i : std::as_const(availablePrinters)) {
         if (i.printerName() != defaultP.printerName()) {
             otherPrinterName = i.printerName();
             break;
@@ -1737,9 +1715,9 @@ void tst_QPrinter::reusePageMetrics()
     QList<QPageSize> defaultPageSizes = info.supportedPageSizes();
     QList<QPageSize> otherPageSizes = QPrinterInfo(otherP).supportedPageSizes();
     QPageSize unavailableSizeToSet;
-    for (QPageSize s : qAsConst(defaultPageSizes)) {
+    for (QPageSize s : std::as_const(defaultPageSizes)) {
         bool found = false;
-        for (QPageSize os : qAsConst(otherPageSizes)) {
+        for (QPageSize os : std::as_const(otherPageSizes)) {
             if (os.isEquivalentTo(s)) {
                 found = true;
                 break;