From a3ce1235493622e51aa872511ea80081f9e96805 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 23 Dec 2015 00:15:30 +0100 Subject: QtCore: eradicate all Q_FOREACH loops [tools] Saves just under 5.5KiB in text size on optimized GCC 4.9 Linux AMD64 builds. Change-Id: I6d868a7d2e469cf0564127b0e66cd7b272a0c9cd Reviewed-by: Thiago Macieira --- src/corelib/tools/qtimezoneprivate_win.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/corelib/tools/qtimezoneprivate_win.cpp') diff --git a/src/corelib/tools/qtimezoneprivate_win.cpp b/src/corelib/tools/qtimezoneprivate_win.cpp index 33476033ff..b5d45549ef 100644 --- a/src/corelib/tools/qtimezoneprivate_win.cpp +++ b/src/corelib/tools/qtimezoneprivate_win.cpp @@ -237,7 +237,8 @@ static QByteArray windowsSystemZoneId() TIME_ZONE_INFORMATION sysTzi; GetTimeZoneInformation(&sysTzi); bool ok = false; - foreach (const QByteArray &winId, availableWindowsIds()) { + const auto winIds = availableWindowsIds(); + for (const QByteArray &winId : winIds) { if (equalTzi(getRegistryTzi(winId, &ok), sysTzi)) return winId; } @@ -506,7 +507,7 @@ QTimeZonePrivate::Data QWinTimeZonePrivate::data(qint64 forMSecsSinceEpoch) cons bool QWinTimeZonePrivate::hasTransitions() const { - foreach (const QWinTransitionRule &rule, m_tranRules) { + for (const QWinTransitionRule &rule : m_tranRules) { if (rule.standardTimeRule.wMonth > 0 && rule.daylightTimeRule.wMonth > 0) return true; } @@ -637,9 +638,9 @@ QByteArray QWinTimeZonePrivate::systemTimeZoneId() const QList QWinTimeZonePrivate::availableTimeZoneIds() const { QList result; - foreach (const QByteArray &winId, availableWindowsIds()) { + const auto winIds = availableWindowsIds(); + for (const QByteArray &winId : winIds) result += windowsIdToIanaIds(winId); - } std::sort(result.begin(), result.end()); result.erase(std::unique(result.begin(), result.end()), result.end()); return result; -- cgit v1.2.3