From 3174f44579ac448198c02518d42d9eff48c1ed75 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 18 Jul 2022 17:36:30 +0200 Subject: [PATCH] Make locale data arrays constexpr Weirdly, the generator script already has these arrays all as constexpr... Pick-to: 6.4 6.3 6.2 Task-number: QTBUG-100485 Change-Id: I66d54e097cac1fb6399adfeac155f1e46ff525de Reviewed-by: Edward Welbourne --- src/corelib/time/qhijricalendar_data_p.h | 4 ++-- src/corelib/time/qjalalicalendar_data_p.h | 4 ++-- src/corelib/time/qromancalendar_data_p.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/time/qhijricalendar_data_p.h b/src/corelib/time/qhijricalendar_data_p.h index f5538bb3d9..87986eec9a 100644 --- a/src/corelib/time/qhijricalendar_data_p.h +++ b/src/corelib/time/qhijricalendar_data_p.h @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE edited) CLDR data; see qtbase/util/locale_database/. */ -static const QCalendarLocale locale_data[] = { +static constexpr QCalendarLocale locale_data[] = { // lang script terr sLong long sShrt short sNarw narow Sizes... { 1, 0, 0, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// C/AnyScript/AnyTerritory { 2, 27, 90, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Abkhazian/Cyrillic/Georgia @@ -662,7 +662,7 @@ static const QCalendarLocale locale_data[] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },// trailing zeros }; -static const char16_t months_data[] = { +static constexpr char16_t months_data[] = { 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, diff --git a/src/corelib/time/qjalalicalendar_data_p.h b/src/corelib/time/qjalalicalendar_data_p.h index 56db41b541..176e10b31d 100644 --- a/src/corelib/time/qjalalicalendar_data_p.h +++ b/src/corelib/time/qjalalicalendar_data_p.h @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE edited) CLDR data; see qtbase/util/locale_database/. */ -static const QCalendarLocale locale_data[] = { +static constexpr QCalendarLocale locale_data[] = { // lang script terr sLong long sShrt short sNarw narow Sizes... { 1, 0, 0, 0, 0, 83, 83, 130, 153, 83, 83, 47, 47, 23, 26 },// C/AnyScript/AnyTerritory { 2, 27, 90, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Abkhazian/Cyrillic/Georgia @@ -662,7 +662,7 @@ static const QCalendarLocale locale_data[] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },// trailing zeros }; -static const char16_t months_data[] = { +static constexpr char16_t months_data[] = { 0x46, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x68, 0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x53, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x41, 0x62, 0x61, 0x6e, diff --git a/src/corelib/time/qromancalendar_data_p.h b/src/corelib/time/qromancalendar_data_p.h index ee75f639cf..9d77881672 100644 --- a/src/corelib/time/qromancalendar_data_p.h +++ b/src/corelib/time/qromancalendar_data_p.h @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE edited) CLDR data; see qtbase/util/locale_database/. */ -static const QCalendarLocale locale_data[] = { +static constexpr QCalendarLocale locale_data[] = { // lang script terr sLong long sShrt short sNarw narow Sizes... { 1, 0, 0, 0, 0, 85, 85, 132, 155, 85, 85, 47, 47, 23, 26 },// C/AnyScript/AnyTerritory { 2, 27, 90, 181, 181, 181, 181, 155, 155, 47, 47, 47, 47, 26, 26 },// Abkhazian/Cyrillic/Georgia @@ -662,7 +662,7 @@ static const QCalendarLocale locale_data[] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },// trailing zeros }; -static const char16_t months_data[] = { +static constexpr char16_t months_data[] = { 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x68, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,