diff --git a/Userland/Libraries/LibLocale/ICU.cpp b/Userland/Libraries/LibLocale/ICU.cpp index 69aa66ed21a..8001fb0016c 100644 --- a/Userland/Libraries/LibLocale/ICU.cpp +++ b/Userland/Libraries/LibLocale/ICU.cpp @@ -15,7 +15,6 @@ #include #include #include -#include namespace Locale { @@ -116,16 +115,6 @@ icu::TimeZoneNames& LocaleData::time_zone_names() return *m_time_zone_names; } -icu::UnicodeString icu_string(StringView string) -{ - return icu::UnicodeString::fromUTF8(icu_string_piece(string)); -} - -icu::StringPiece icu_string_piece(StringView string) -{ - return { string.characters_without_null_termination(), static_cast(string.length()) }; -} - Vector icu_string_list(ReadonlySpan strings) { Vector result; diff --git a/Userland/Libraries/LibLocale/ICU.h b/Userland/Libraries/LibLocale/ICU.h index e11b6df883a..b2b1b39b88e 100644 --- a/Userland/Libraries/LibLocale/ICU.h +++ b/Userland/Libraries/LibLocale/ICU.h @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -24,7 +25,6 @@ class DateTimePatternGenerator; class LocaleDisplayNames; class NumberingSystem; class TimeZoneNames; -class UnicodeString; U_NAMESPACE_END namespace Locale { @@ -63,18 +63,25 @@ private: Optional m_digital_format; }; -static constexpr bool icu_success(UErrorCode code) +constexpr bool icu_success(UErrorCode code) { return static_cast(U_SUCCESS(code)); } -static constexpr bool icu_failure(UErrorCode code) +constexpr bool icu_failure(UErrorCode code) { return static_cast(U_FAILURE(code)); } -icu::UnicodeString icu_string(StringView string); -icu::StringPiece icu_string_piece(StringView string); +ALWAYS_INLINE icu::StringPiece icu_string_piece(StringView string) +{ + return { string.characters_without_null_termination(), static_cast(string.length()) }; +} + +ALWAYS_INLINE icu::UnicodeString icu_string(StringView string) +{ + return icu::UnicodeString::fromUTF8(icu_string_piece(string)); +} Vector icu_string_list(ReadonlySpan strings);