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

Convert a table iteration to use ranged-for

Browse Source 
The loop used an int counter that was initialized from a size_t,
provoking a warning from MSVC. Since the indexing is irrelevant in any
case, use a ranged-for loop. Since the loop was formerly in decreasing
index order, reverse the table being iterated so that entries remain
in their prior order.

Change-Id: I79b93c5a3f39a502b0cae83215b8e3665d0e17f5
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Edward Welbourne 2022-02-14 10:55:30 +01:00
parent d34c3f9e94
commit b55f10b2a0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2021 The Qt Company Ltd.
** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
@ -596,19 +596,15 @@ void tst_QTimeZone::transitionEachZone_data()
int start, stop;
int year;
} table[] = {
{ 1288488600, -4, 8, 2010 }, // 2010-10-31 01:30 UTC; Europe, Russia
{ 25666200, 3, 12, 1970 }, // 1970-10-25 01:30 UTC; North America
{ 1288488600, -4, 8, 2010 } // 2010-10-31 01:30 UTC; Europe, Russia
};
const auto zones = QTimeZone::availableTimeZoneIds();
for (int k = std::size(table); k-- > 0; ) {
for (const auto &entry : table) {
for (const QByteArray &zone : zones) {
const QString name = QString::asprintf("%s@%d", zone.constData(), table[k].year);
QTest::newRow(name.toUtf8().constData())
<< zone
<< table[k].baseSecs
<< table[k].start
<< table[k].stop;
QTest::addRow("%s@%d", zone.constData(), entry.year)
<< zone << entry.baseSecs << entry.start << entry.stop;
}
}
}