diff --git a/src/corelib/time/qtimezoneprivate.cpp b/src/corelib/time/qtimezoneprivate.cpp index 5e50ce6dbab..99f443aa0e9 100644 --- a/src/corelib/time/qtimezoneprivate.cpp +++ b/src/corelib/time/qtimezoneprivate.cpp @@ -613,7 +613,8 @@ QList QTimeZonePrivate::availableTimeZoneIds() const return QList(); } -static QList selectAvailable(QList&& desired, const QList& all) +static QList selectAvailable(QList &&desired, + const QList &all) { std::sort(desired.begin(), desired.end()); const auto newEnd = std::unique(desired.begin(), desired.end()); @@ -628,13 +629,13 @@ static QList selectAvailable(QList&& desired, const QLis QList QTimeZonePrivate::availableTimeZoneIds(QLocale::Territory territory) const { // Default fall-back mode, use the zoneTable to find Region of know Zones - QList regions; + QList regions; // First get all Zones in the Zones table belonging to the Region for (const ZoneData &data : zoneDataTable) { if (data.territory == territory) { for (auto l1 : data.ids()) - regions << QByteArray(l1.data(), l1.size()); + regions << QByteArrayView(l1.data(), l1.size()); } } return selectAvailable(std::move(regions), availableTimeZoneIds()); @@ -642,16 +643,16 @@ QList QTimeZonePrivate::availableTimeZoneIds(QLocale::Territory terr QList QTimeZonePrivate::availableTimeZoneIds(int offsetFromUtc) const { - // Default fall-back mode, use the zoneTable to find Offset of know Zones - QList offsets; - // First get all Zones in the table using the Offset + // Default fall-back mode: use the zoneTable to find offsets of know zones. + QList offsets; + // First get all Zones in the table using the given offset: for (const WindowsData &winData : windowsDataTable) { if (winData.offsetFromUtc == offsetFromUtc) { for (auto data = zoneStartForWindowsId(winData.windowsIdKey); data != std::end(zoneDataTable) && data->windowsIdKey == winData.windowsIdKey; ++data) { for (auto l1 : data->ids()) - offsets << QByteArray(l1.data(), l1.size()); + offsets << QByteArrayView(l1.data(), l1.size()); } } }