From 6c7b05a0ffcd0492b269d6e7e1eabcca08576a5d Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Fri, 2 Sep 2022 11:27:31 -0400 Subject: [PATCH] LibUnicode+LibJS: Move Unicode::get_available_currencies() to Locale.h This is generated by GenerateLocaleData, which will soon be in the Locale namespace. Move it out of CurrencyCode.h, as that will continue to live in the Unicode namespace. --- Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp | 1 - Userland/Libraries/LibUnicode/CurrencyCode.cpp | 2 -- Userland/Libraries/LibUnicode/CurrencyCode.h | 1 - Userland/Libraries/LibUnicode/Locale.cpp | 1 + Userland/Libraries/LibUnicode/Locale.h | 1 + 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp b/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp index 776da44fc4..2fc0d2abd8 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/Userland/Libraries/LibUnicode/CurrencyCode.cpp b/Userland/Libraries/LibUnicode/CurrencyCode.cpp index 826d2025af..70cfbefb45 100644 --- a/Userland/Libraries/LibUnicode/CurrencyCode.cpp +++ b/Userland/Libraries/LibUnicode/CurrencyCode.cpp @@ -203,6 +203,4 @@ Optional get_currency_code(StringView currency) return currency_codes.get(currency); } -Span __attribute__((weak)) get_available_currencies() { return {}; } - } diff --git a/Userland/Libraries/LibUnicode/CurrencyCode.h b/Userland/Libraries/LibUnicode/CurrencyCode.h index 48e97ac864..8088d29b97 100644 --- a/Userland/Libraries/LibUnicode/CurrencyCode.h +++ b/Userland/Libraries/LibUnicode/CurrencyCode.h @@ -18,6 +18,5 @@ struct CurrencyCode { }; Optional get_currency_code(StringView currency); -Span get_available_currencies(); } diff --git a/Userland/Libraries/LibUnicode/Locale.cpp b/Userland/Libraries/LibUnicode/Locale.cpp index 6f5f56c7cd..db2b946ad3 100644 --- a/Userland/Libraries/LibUnicode/Locale.cpp +++ b/Userland/Libraries/LibUnicode/Locale.cpp @@ -771,6 +771,7 @@ Span __attribute__((weak)) get_available_calendars() { return Span __attribute__((weak)) get_available_collation_case_orderings() { return {}; } Span __attribute__((weak)) get_available_collation_numeric_orderings() { return {}; } Span __attribute__((weak)) get_available_collation_types() { return {}; } +Span __attribute__((weak)) get_available_currencies() { return {}; } Span __attribute__((weak)) get_available_hour_cycles() { return {}; } Span __attribute__((weak)) get_available_number_systems() { return {}; } Optional __attribute__((weak)) locale_from_string(StringView) { return {}; } diff --git a/Userland/Libraries/LibUnicode/Locale.h b/Userland/Libraries/LibUnicode/Locale.h index 28b69c8686..803341b350 100644 --- a/Userland/Libraries/LibUnicode/Locale.h +++ b/Userland/Libraries/LibUnicode/Locale.h @@ -150,6 +150,7 @@ Span get_available_calendars(); Span get_available_collation_case_orderings(); Span get_available_collation_numeric_orderings(); Span get_available_collation_types(); +Span get_available_currencies(); Span get_available_hour_cycles(); Span get_available_number_systems();