diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-03 21:35:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 21:35:27 +0200 |
| commit | 27763b67bb63139319bf611590c40e48663e72d6 (patch) | |
| tree | ad9a1589128f569fc6be2a99893b916491f87af1 /modules/mono/utils/string_utils.cpp | |
| parent | 4dd915028a9c8819075d7ac5683f6da7ddf58087 (diff) | |
| parent | 80b8eff6aa41ba79175a5152ba5b2b9b16f6de3f (diff) | |
Merge pull request #40999 from bruvzg/ctl_string_to_utf32
[Complex Test Layouts] Refactor `String` to use UTF-32 encoding.
Diffstat (limited to 'modules/mono/utils/string_utils.cpp')
| -rw-r--r-- | modules/mono/utils/string_utils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/mono/utils/string_utils.cpp b/modules/mono/utils/string_utils.cpp index f8d9804de4..65da4328f6 100644 --- a/modules/mono/utils/string_utils.cpp +++ b/modules/mono/utils/string_utils.cpp @@ -49,7 +49,7 @@ int sfind(const String &p_text, int p_from) { return -1; } - const CharType *src = p_text.c_str(); + const char32_t *src = p_text.get_data(); for (int i = p_from; i <= (len - src_len); i++) { bool found = true; @@ -64,7 +64,7 @@ int sfind(const String &p_text, int p_from) { found = src[read_pos] == '%'; break; case 1: { - CharType c = src[read_pos]; + char32_t c = src[read_pos]; found = src[read_pos] == 's' || (c >= '0' && c <= '4'); break; } @@ -121,7 +121,7 @@ String sformat(const String &p_text, const Variant &p1, const Variant &p2, const int result = 0; while ((result = sfind(p_text, search_from)) >= 0) { - CharType c = p_text[result + 1]; + char32_t c = p_text[result + 1]; int req_index = (c == 's' ? findex++ : c - '0'); |