diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-09-01 12:46:57 +0200 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-09-06 17:41:53 +0200 |
| commit | 65a2cb6964f3d1178718203f05e9143bd400c80e (patch) | |
| tree | f6d99eaeca8c6787fa116eabcbf71c6515f336fa /src/corelib/serialization/qjsonparser.cpp | |
| parent | ee2ac8b4ef3b8691ef8b9d17a6d4c95b95db4349 (diff) | |
corelib: Use char16_t and char32_t types for characters
Use standard char16_t and char32_t types instead of ushort and uint.
Remove members of QUtf8BaseTraits that use those integer types.
Change-Id: I77b1a9106244835c813336a50417f6bbdfada288
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/serialization/qjsonparser.cpp')
| -rw-r--r-- | src/corelib/serialization/qjsonparser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/serialization/qjsonparser.cpp b/src/corelib/serialization/qjsonparser.cpp index 525cbfb3a0..9760fde2ed 100644 --- a/src/corelib/serialization/qjsonparser.cpp +++ b/src/corelib/serialization/qjsonparser.cpp @@ -766,7 +766,7 @@ bool Parser::parseNumber() unescaped = %x20-21 / %x23-5B / %x5D-10FFFF */ -static inline bool addHexDigit(char digit, uint *result) +static inline bool addHexDigit(char digit, char32_t *result) { *result <<= 4; if (digit >= '0' && digit <= '9') @@ -780,7 +780,7 @@ static inline bool addHexDigit(char digit, uint *result) return true; } -static inline bool scanEscapeSequence(const char *&json, const char *end, uint *ch) +static inline bool scanEscapeSequence(const char *&json, const char *end, char32_t *ch) { ++json; if (json >= end) @@ -825,7 +825,7 @@ static inline bool scanEscapeSequence(const char *&json, const char *end, uint * return true; } -static inline bool scanUtf8Char(const char *&json, const char *end, uint *result) +static inline bool scanUtf8Char(const char *&json, const char *end, char32_t *result) { const auto *usrc = reinterpret_cast<const uchar *>(json); const auto *uend = reinterpret_cast<const uchar *>(end); @@ -848,7 +848,7 @@ bool Parser::parseString() bool isUtf8 = true; bool isAscii = true; while (json < end) { - uint ch = 0; + char32_t ch = 0; if (*json == '"') break; if (*json == '\\') { @@ -890,7 +890,7 @@ bool Parser::parseString() QString ucs4; while (json < end) { - uint ch = 0; + char32_t ch = 0; if (*json == '"') break; else if (*json == '\\') { |