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

QTimeZone: Avoid creating quite as many QByteArrays

Browse Source 
Cuts off 1 second from the timezone test locally

Change-Id: I184728e97bcd65ca0362df4c26a3407576e12dfb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Mårten Nordheim 2020-12-02 11:20:06 +01:00
parent 6862ce3d77
commit 6ec3321875
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/corelib/time/qtimezoneprivate.cpp
View File

@ -95,6 +95,11 @@ static QByteArray ianaId(const QZoneData *zoneData)
return (ianaIdData + zoneData->ianaIdIndex);
}
static QByteArrayView ianaIdView(const QZoneData *zoneData)
{
return (ianaIdData + zoneData->ianaIdIndex);
}
static QByteArray utcId(const QUtcData *utcData)
{
return (ianaIdData + utcData->ianaIdIndex);
@ -170,8 +175,14 @@ QLocale::Country QTimeZonePrivate::country() const
// Default fall-back mode, use the zoneTable to find Region of known Zones
for (int i = 0; i < zoneDataTableSize; ++i) {
const QZoneData *data = zoneData(i);
if (ianaId(data).split(' ').contains(m_id))
return (QLocale::Country)data->country;
QByteArrayView idView = ianaIdView(data);
while (!idView.isEmpty()) {
qsizetype index = idView.indexOf(' ');
QByteArrayView next = index == -1 ? idView : idView.first(index);
if (next == m_id)
return (QLocale::Country)data->country;
idView = index == -1 ? QByteArrayView() : idView.sliced(index + 1);
}
}
return QLocale::AnyCountry;
}
@ -688,8 +699,14 @@ QByteArray QTimeZonePrivate::ianaIdToWindowsId(const QByteArray &id)
{
for (int i = 0; i < zoneDataTableSize; ++i) {
const QZoneData *data = zoneData(i);
if (ianaId(data).split(' ').contains(id))
return toWindowsIdLiteral(data->windowsIdKey);
QByteArrayView idView = ianaIdView(data);
while (!idView.isEmpty()) {
qsizetype index = idView.indexOf(' ');
QByteArrayView next = index == -1 ? idView : idView.first(index);
if (next == id)
return toWindowsIdLiteral(data->windowsIdKey);
idView = index == -1 ? QByteArrayView() : idView.sliced(index + 1);
}
}
return QByteArray();
}