godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Core: Remove skip_cr argument from String

Browse Source
This commit is contained in:
Thaddeus Crews
2025-09-24 13:55:45 -05:00
parent 9283328fe7
commit f6fc2f4a08
11 changed files with 99 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/string/ustring.cpp
View File

@@ -1763,7 +1763,7 @@ Error String::append_ascii(const Span<char> &p_range) {
return decode_failed ? ERR_INVALID_DATA : OK;
}
Error String::append_utf8(const char *p_utf8, int p_len, bool p_skip_cr) {
Error String::append_utf8(const char *p_utf8, int p_len) {
if (!p_utf8) {
return ERR_INVALID_DATA;
}
@@ -1796,11 +1796,6 @@ Error String::append_utf8(const char *p_utf8, int p_len, bool p_skip_cr) {
while (ptrtmp < ptr_limit && *ptrtmp) {
uint8_t c = *ptrtmp;
if (p_skip_cr && c == '\r') {
++ptrtmp;
continue;
}
uint32_t unicode = _replacement_char;
uint32_t size = 1;

6
core/string/ustring.h
View File

@@ -525,9 +525,9 @@ public:
}
CharString utf8(Vector<uint8_t> *r_ch_length_map = nullptr) const;
Error append_utf8(const char *p_utf8, int p_len = -1, bool p_skip_cr = false);
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);
Error append_utf8(const char *p_utf8, int p_len = -1);
Error append_utf8(const Span<char> &p_range) {
return append_utf8(p_range.ptr(), p_range.size());
}
static String utf8(const char *p_utf8, int p_len = -1) {
String ret;