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

Remove trailing zero rows from qtimezoneprivate_data_p.h's tables

Browse Source 
They are not needed. Iterations over the table track their sizes.
The size-of-table constants just needed their -1s removed.
Incidentally use std::size() rather than sizeof(array)/sizeof(element).

Change-Id: Ie20eef9f6f5786d93c10b830a87e006d3c5bcc1a
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Edward Welbourne 2021-09-09 18:28:28 +02:00
parent 72338c12bc
commit ce868ffb7c
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,10 +55,9 @@ QT_BEGIN_NAMESPACE
Static utilities for looking up Windows ID tables Static utilities for looking up Windows ID tables
*/ */
static const int windowsDataTableSize = sizeof(windowsDataTable) / sizeof(QWindowsData) - 1; static const qsizetype windowsDataTableSize = std::size(windowsDataTable);
static const int zoneDataTableSize = sizeof(zoneDataTable) / sizeof(QZoneData) - 1; static const qsizetype zoneDataTableSize = std::size(zoneDataTable);
static const int utcDataTableSize = sizeof(utcDataTable) / sizeof(QUtcData) - 1; static const qsizetype utcDataTableSize = std::size(utcDataTable);
static const QZoneData *zoneData(quint16 index) static const QZoneData *zoneData(quint16 index)
{ {

5
src/corelib/time/qtimezoneprivate_data_p.h
View File

@ -115,7 +115,7 @@ struct QUtcData {
// GENERATED PART STARTS HERE // GENERATED PART STARTS HERE
/* /*
This part of the file was generated on 2021-07-26 from the This part of the file was generated on 2021-09-09 from the
Common Locale Data Repository v39 file supplemental/windowsZones.xml Common Locale Data Repository v39 file supplemental/windowsZones.xml
http://www.unicode.org/cldr/ http://www.unicode.org/cldr/
@ -493,7 +493,6 @@ static const QZoneData zoneDataTable[] = {
{ 136, 182, 7221 }, // West Pacific Standard Time / Papua New Guinea { 136, 182, 7221 }, // West Pacific Standard Time / Papua New Guinea
{ 137, 193, 7242 }, // Yakutsk Standard Time / Russia { 137, 193, 7242 }, // Yakutsk Standard Time / Russia
{ 138, 41, 7269 }, // Yukon Standard Time / Canada { 138, 41, 7269 }, // Yukon Standard Time / Canada
{ 0, 0, 0 } // Trailing zeroes
}; };
// Windows ID Key, Windows ID Index, IANA ID Index, UTC Offset // Windows ID Key, Windows ID Index, IANA ID Index, UTC Offset
@ -636,7 +635,6 @@ static const QWindowsData windowsDataTable[] = {
{ 136, 3124, 7221, 36000 }, // West Pacific Standard Time { 136, 3124, 7221, 36000 }, // West Pacific Standard Time
{ 137, 3151, 7752, 32400 }, // Yakutsk Standard Time { 137, 3151, 7752, 32400 }, // Yakutsk Standard Time
{ 138, 3173, 7765,-25200 }, // Yukon Standard Time { 138, 3173, 7765,-25200 }, // Yukon Standard Time
{ 0, 0, 0, 0 } // Trailing zeroes
}; };
// IANA ID Index, UTC Offset // IANA ID Index, UTC Offset
@ -681,7 +679,6 @@ static const QUtcData utcDataTable[] = {
{ 8148, 43200 }, // UTC+12:00 { 8148, 43200 }, // UTC+12:00
{ 8158, 46800 }, // UTC+13:00 { 8158, 46800 }, // UTC+13:00
{ 8168, 50400 }, // UTC+14:00 { 8168, 50400 }, // UTC+14:00
{ 0, 0 } // Trailing zeroes
}; };
static const char windowsIdData[] = { static const char windowsIdData[] = {

5
util/locale_database/cldr2qtimezone.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
############################################################################# #############################################################################
## ##
## Copyright (C) 2020 The Qt Company Ltd. ## Copyright (C) 2021 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/ ## Contact: https://www.qt.io/licensing/
## ##
## This file is part of the test suite of the Qt Toolkit. ## This file is part of the test suite of the Qt Toolkit.
@ -299,7 +299,6 @@ class ZoneIdWriter (SourceFileEditor):
data['windowsKey'], data['territoryId'], data['windowsKey'], data['territoryId'],
ianaIdData.append(data['ianaList']), ianaIdData.append(data['ianaList']),
data['windowsId'], data['territory'])) data['windowsId'], data['territory']))
out(' { 0, 0, 0 } // Trailing zeroes\n')
out('};\n\n') out('};\n\n')
# Write Windows ID key table # Write Windows ID key table
@ -311,7 +310,6 @@ class ZoneIdWriter (SourceFileEditor):
windowsIdData.append(pair[0]), windowsIdData.append(pair[0]),
ianaIdData.append(defaults[index]), ianaIdData.append(defaults[index]),
pair[1], pair[0])) pair[1], pair[0]))
out(' { 0, 0, 0, 0 } // Trailing zeroes\n')
out('};\n\n') out('};\n\n')
# Write UTC ID key table # Write UTC ID key table
@ -320,7 +318,6 @@ class ZoneIdWriter (SourceFileEditor):
for pair in utcIdList: for pair in utcIdList:
out(' {{ {:6d},{:6d} }}, // {}\n'.format( out(' {{ {:6d},{:6d} }}, // {}\n'.format(
ianaIdData.append(pair[0]), pair[1], pair[0])) ianaIdData.append(pair[0]), pair[1], pair[0]))
out(' { 0, 0 } // Trailing zeroes\n')
out('};\n') out('};\n')
return windowsIdData, ianaIdData return windowsIdData, ianaIdData