1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #101356 from Ivorforce/inline-utf-creation-functions

Browse Source 
Inline `String::utf8` and `String::utf16` for their simplicity.
This commit is contained in:
Thaddeus Crews 2025-05-07 12:48:32 -05:00
commit 090d244b16
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/string/ustring.cpp
View File

@ -1790,13 +1790,6 @@ Error String::append_ascii(const Span<char> &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<uint8_t> *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;

12
core/string/ustring.h
View File

@ -545,7 +545,11 @@ public:
Error append_utf8(const Span<char> &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<char> &p_range) { return utf8(p_range.ptr(), p_range.size()); }
Char16String utf16() const;
@ -553,7 +557,11 @@ public:
Error append_utf16(const Span<char16_t> 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<char16_t> &p_range) { return utf16(p_range.ptr(), p_range.size()); }
void append_utf32(const Span<char32_t> &p_cstr);