AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify (and fix) initialization of a list of time-zones

Browse Source 
Looping over the entries had a typo in it and was quite unnecessary,
as it just made a fresh copy of a list we already had.

Pick-to: 6.6 6.5 6.2 5.15
Change-Id: I0f3023b06163e5854d425d816e465785cda5fc91
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Edward Welbourne 2020-06-22 18:34:45 +02:00
parent f8e1194aef
commit 07e4015687
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/benchmarks/corelib/time/qtimezone/tst_bench_qtimezone.cpp
View File

@ -1,3 +1,4 @@
// Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Crimson AS <info@crimson.no> // Copyright (C) 2019 Crimson AS <info@crimson.no>
// Copyright (C) 2018 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com> // Copyright (C) 2018 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com>
// 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
@ -29,11 +30,7 @@ private Q_SLOTS:
static QList<QByteArray> enoughZones() static QList<QByteArray> enoughZones()
{ {
#ifdef EXHAUSTIVE #ifdef EXHAUSTIVE
auto available = QTimeZone::availableTimeZoneIds(); QList<QByteArray> result = QTimeZone::availableTimeZoneIds();
QList<QByteArray> result;
result.reserve(available.size() + 1);
for (conat auto &name : available)
result << name;
#else #else
QList<QByteArray> result { QList<QByteArray> result {
QByteArray("UTC"), QByteArray("UTC"),