diff options
Diffstat (limited to 'src/corelib/time/qtimezoneprivate_data_p.h')
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_data_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h index 69374b8bd1..49d5be746b 100644 --- a/src/corelib/time/qtimezoneprivate_data_p.h +++ b/src/corelib/time/qtimezoneprivate_data_p.h @@ -99,7 +99,7 @@ struct QUtcData */ // Windows ID Key, Territory Enum, IANA ID Index -static const QZoneData zoneDataTable[] = { +static constexpr QZoneData zoneDataTable[] = { { 1, 1, 0 }, // Afghanistan Standard Time / Afghanistan { 2, 248, 11 }, // Alaskan Standard Time / United States { 3, 248, 106 }, // Aleutian Standard Time / United States @@ -470,7 +470,7 @@ static const QZoneData zoneDataTable[] = { }; // Windows ID Key, Windows ID Index, IANA ID Index, UTC Offset -static const QWindowsData windowsDataTable[] = { +static constexpr QWindowsData windowsDataTable[] = { { 1, 0, 0, 16200 }, // Afghanistan Standard Time { 2, 26, 7303,-32400 }, // Alaskan Standard Time { 3, 48, 106,-36000 }, // Aleutian Standard Time @@ -613,7 +613,7 @@ static const QWindowsData windowsDataTable[] = { }; // IANA ID Index, UTC Offset -static const QUtcData utcDataTable[] = { +static constexpr QUtcData utcDataTable[] = { { 7784, 0 }, // UTC { 7788,-50400 }, // UTC-14:00 { 7798,-46800 }, // UTC-13:00 @@ -656,7 +656,7 @@ static const QUtcData utcDataTable[] = { { 8168, 50400 }, // UTC+14:00 }; -static const char windowsIdData[] = { +static constexpr char windowsIdData[] = { 0x41, 0x66, 0x67, 0x68, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x6c, 0x61, 0x73, 0x6b, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, @@ -820,7 +820,7 @@ static const char windowsIdData[] = { 0x75, 0x6b, 0x6f, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0 }; -static const char ianaIdData[] = { +static constexpr char ianaIdData[] = { 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x62, 0x75, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x75, 0x6e, 0x65, 0x61, 0x75, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x74, 0x6c, 0x61, 0x6b, 0x61, 0x74, |