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 /core/io/json.h | |
| 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 'core/io/json.h')
| -rw-r--r-- | core/io/json.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/io/json.h b/core/io/json.h index 4fc5630a93..9122228163 100644 --- a/core/io/json.h +++ b/core/io/json.h @@ -65,10 +65,10 @@ class JSON { static String _print_var(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys); - static Error _get_token(const CharType *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str); - static Error _parse_value(Variant &value, Token &token, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str); - static Error _parse_array(Array &array, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str); - static Error _parse_object(Dictionary &object, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str); + static Error _get_token(const char32_t *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str); + static Error _parse_value(Variant &value, Token &token, const char32_t *p_str, int &index, int p_len, int &line, String &r_err_str); + static Error _parse_array(Array &array, const char32_t *p_str, int &index, int p_len, int &line, String &r_err_str); + static Error _parse_object(Dictionary &object, const char32_t *p_str, int &index, int p_len, int &line, String &r_err_str); public: static String print(const Variant &p_var, const String &p_indent = "", bool p_sort_keys = true); |