1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QPrinter: compile with QT_NO_FOREACH

Browse Source 
resolution(): a local const container, Q_FOREACH wasn't needed here to
begin with, port to ranged-for

The rest, the loops were iterating over temporaries, so just put them in
local const auto variables and use ranged-for.

Task-number: QTBUG-115839
Change-Id: Iebe6d164661d74df9fefb764c370cdc9a8e817ff
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Ahmad Samir 2023-08-14 02:44:14 +03:00
parent 7889dcda95
commit 78f0250053
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
View File

@ -1,8 +1,6 @@
// Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
#include <QTest> #include <QTest>
#include <qprinter.h> #include <qprinter.h>
@ -905,7 +903,8 @@ void tst_QPrinter::duplex()
QPrinter::DuplexMode expected = printerInfo.defaultDuplexMode(); QPrinter::DuplexMode expected = printerInfo.defaultDuplexMode();
QCOMPARE(native.duplex(), expected); QCOMPARE(native.duplex(), expected);
// Test set/get (skipping Auto as that will return something different) // 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) { if (mode != expected && mode != QPrinter::DuplexAuto) {
expected = mode; expected = mode;
break; break;
@ -1195,7 +1194,8 @@ void tst_QPrinter::paperSource()
QPrinter::PaperSource expected = QPrinter::Manual; QPrinter::PaperSource expected = QPrinter::Manual;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
expected = QPrinter::Auto; expected = QPrinter::Auto;
foreach (QPrinter::PaperSource supported, native.supportedPaperSources()) { const auto sources = native.supportedPaperSources();
for (QPrinter::PaperSource supported : sources) {
if (supported != QPrinter::Auto) { if (supported != QPrinter::Auto) {
expected = supported; expected = supported;
break; break;
@ -1317,7 +1317,8 @@ void tst_QPrinter::printerName()
// Test set/get // Test set/get
QString expected = QPrinterInfo::defaultPrinter().printerName(); 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) { if (available.printerName() != expected) {
expected = available.printerName(); expected = available.printerName();
break; break;
@ -1410,7 +1411,7 @@ void tst_QPrinter::resolution()
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// QMacPrintEngine chooses the closest supported resolution. // QMacPrintEngine chooses the closest supported resolution.
const QList<int> all_supported = native.supportedResolutions(); const QList<int> all_supported = native.supportedResolutions();
foreach (int supported, all_supported) { for (int supported : all_supported) {
// Test setting a supported resolution // Test setting a supported resolution
int requested = supported; int requested = supported;
native.setResolution(requested); native.setResolution(requested);