Skip to content

Commit 26a6d40

Browse files
committed
Inline String::utf8 and String::utf16 for their simplicity.
1 parent a895a86 commit 26a6d40

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

core/string/ustring.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1790,13 +1790,6 @@ Error String::append_ascii(const Span<char> &p_range) {
17901790
return decode_failed ? ERR_INVALID_DATA : OK;
17911791
}
17921792

1793-
String String::utf8(const char *p_utf8, int p_len) {
1794-
String ret;
1795-
ret.append_utf8(p_utf8, p_len);
1796-
1797-
return ret;
1798-
}
1799-
18001793
Error String::append_utf8(const char *p_utf8, int p_len, bool p_skip_cr) {
18011794
if (!p_utf8) {
18021795
return ERR_INVALID_DATA;
@@ -2066,13 +2059,6 @@ CharString String::utf8(Vector<uint8_t> *r_ch_length_map) const {
20662059
return utf8s;
20672060
}
20682061

2069-
String String::utf16(const char16_t *p_utf16, int p_len) {
2070-
String ret;
2071-
ret.append_utf16(p_utf16, p_len, true);
2072-
2073-
return ret;
2074-
}
2075-
20762062
Error String::append_utf16(const char16_t *p_utf16, int p_len, bool p_default_little_endian) {
20772063
if (!p_utf16) {
20782064
return ERR_INVALID_DATA;

core/string/ustring.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,15 +545,23 @@ class String {
545545
Error append_utf8(const Span<char> &p_range, bool p_skip_cr = false) {
546546
return append_utf8(p_range.ptr(), p_range.size(), p_skip_cr);
547547
}
548-
static String utf8(const char *p_utf8, int p_len = -1);
548+
static String utf8(const char *p_utf8, int p_len = -1) {
549+
String ret;
550+
ret.append_utf8(p_utf8, p_len);
551+
return ret;
552+
}
549553
static String utf8(const Span<char> &p_range) { return utf8(p_range.ptr(), p_range.size()); }
550554

551555
Char16String utf16() const;
552556
Error append_utf16(const char16_t *p_utf16, int p_len = -1, bool p_default_little_endian = true);
553557
Error append_utf16(const Span<char16_t> p_range, bool p_skip_cr = false) {
554558
return append_utf16(p_range.ptr(), p_range.size(), p_skip_cr);
555559
}
556-
static String utf16(const char16_t *p_utf16, int p_len = -1);
560+
static String utf16(const char16_t *p_utf16, int p_len = -1) {
561+
String ret;
562+
ret.append_utf16(p_utf16, p_len);
563+
return ret;
564+
}
557565
static String utf16(const Span<char16_t> &p_range) { return utf16(p_range.ptr(), p_range.size()); }
558566

559567
void append_utf32(const Span<char32_t> &p_cstr);

0 commit comments

Comments
 (0)