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

tst_QFont: compile with QT_NO_FOREACH

Browse Source 
Loops are iterating over newly-made const containers.

msgNotAcceptableFont(): the container to which the const& parameter
refers is also const.

Port to ranged-for.

Task-number: QTBUG-115839
Change-Id: Idc319026900b77075d7d4afd7184665c734f4c9e
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Ahmad Samir 2023-08-14 03:18:36 +03:00 committed by Marc Mutz
parent 688905fc9d
commit 56d2a65a33
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/gui/text/qfont/tst_qfont.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 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
#include <QTest> #include <QTest>
#include <QBuffer> #include <QBuffer>
#include <QtEndian> #include <QtEndian>
@ -577,7 +575,7 @@ QString getPlatformGenericFont(const char* genericName)
static inline QByteArray msgNotAcceptableFont(const QString &defaultFamily, const QStringList &acceptableFamilies) static inline QByteArray msgNotAcceptableFont(const QString &defaultFamily, const QStringList &acceptableFamilies)
{ {
QString res = QString::fromLatin1("Font family '%1' is not one of the following acceptable results: ").arg(defaultFamily); QString res = QString::fromLatin1("Font family '%1' is not one of the following acceptable results: ").arg(defaultFamily);
Q_FOREACH (const QString &family, acceptableFamilies) for (const QString &family : acceptableFamilies)
res += QLatin1String("\n ") + family; res += QLatin1String("\n ") + family;
return res.toLocal8Bit(); return res.toLocal8Bit();
} }
@ -598,7 +596,7 @@ void tst_QFont::defaultFamily_data()
void tst_QFont::defaultFamily() void tst_QFont::defaultFamily()
{ {
QFETCH(QFont::StyleHint, styleHint); QFETCH(QFont::StyleHint, styleHint);
QFETCH(QStringList, acceptableFamilies); QFETCH(const QStringList, acceptableFamilies);
QFont f; QFont f;
f.setStyleHint(styleHint); f.setStyleHint(styleHint);
@ -608,7 +606,7 @@ void tst_QFont::defaultFamily()
QVERIFY(QFontDatabase::hasFamily(familyForHint)); QVERIFY(QFontDatabase::hasFamily(familyForHint));
bool isAcceptable = false; bool isAcceptable = false;
Q_FOREACH (const QString& family, acceptableFamilies) { for (const QString &family : acceptableFamilies) {
if (!familyForHint.compare(family, Qt::CaseInsensitive)) { if (!familyForHint.compare(family, Qt::CaseInsensitive)) {
isAcceptable = true; isAcceptable = true;
break; break;