diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index 9751b6fb8b0..daa3daa0b1e 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -1790,13 +1790,6 @@ Error String::append_ascii(const Span &p_range) { return decode_failed ? ERR_INVALID_DATA : OK; } -String String::utf8(const char *p_utf8, int p_len) { - String ret; - ret.append_utf8(p_utf8, p_len); - - return ret; -} - Error String::append_utf8(const char *p_utf8, int p_len, bool p_skip_cr) { if (!p_utf8) { return ERR_INVALID_DATA; @@ -2066,13 +2059,6 @@ CharString String::utf8(Vector *r_ch_length_map) const { return utf8s; } -String String::utf16(const char16_t *p_utf16, int p_len) { - String ret; - ret.append_utf16(p_utf16, p_len, true); - - return ret; -} - Error String::append_utf16(const char16_t *p_utf16, int p_len, bool p_default_little_endian) { if (!p_utf16) { return ERR_INVALID_DATA; diff --git a/core/string/ustring.h b/core/string/ustring.h index fc153a52e75..b5d179dad9a 100644 --- a/core/string/ustring.h +++ b/core/string/ustring.h @@ -545,7 +545,11 @@ public: Error append_utf8(const Span &p_range, bool p_skip_cr = false) { return append_utf8(p_range.ptr(), p_range.size(), p_skip_cr); } - static String utf8(const char *p_utf8, int p_len = -1); + static String utf8(const char *p_utf8, int p_len = -1) { + String ret; + ret.append_utf8(p_utf8, p_len); + return ret; + } static String utf8(const Span &p_range) { return utf8(p_range.ptr(), p_range.size()); } Char16String utf16() const; @@ -553,7 +557,11 @@ public: Error append_utf16(const Span p_range, bool p_skip_cr = false) { return append_utf16(p_range.ptr(), p_range.size(), p_skip_cr); } - static String utf16(const char16_t *p_utf16, int p_len = -1); + static String utf16(const char16_t *p_utf16, int p_len = -1) { + String ret; + ret.append_utf16(p_utf16, p_len); + return ret; + } static String utf16(const Span &p_range) { return utf16(p_range.ptr(), p_range.size()); } void append_utf32(const Span &p_cstr);