diff options
Diffstat (limited to 'src/corelib/json')
-rw-r--r-- | src/corelib/json/qjsonparser.cpp | 5 | ||||
-rw-r--r-- | src/corelib/json/qjsonwriter.cpp | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/json/qjsonparser.cpp b/src/corelib/json/qjsonparser.cpp index 5fecb8d4e7..6706f12b24 100644 --- a/src/corelib/json/qjsonparser.cpp +++ b/src/corelib/json/qjsonparser.cpp @@ -45,7 +45,6 @@ #include <qdebug.h> #include "qjsonparser_p.h" #include "qjson_p.h" -#include <private/qunicodetables_p.h> //#define PARSER_DEBUG #ifdef PARSER_DEBUG @@ -769,8 +768,8 @@ static inline bool scanUtf8Char(const char *&json, const char *end, uint *result uc = (uc << 6) | (ch & 0x3f); } - if (uc < min_uc || QUnicodeTables::isNonCharacter(uc) || - (uc >= 0xd800 && uc <= 0xdfff) || uc >= 0x110000) { + if (uc < min_uc || QChar::isNonCharacter(uc) || + QChar::isSurrogate(uc) || uc > QChar::LastValidCodePoint) { return false; } diff --git a/src/corelib/json/qjsonwriter.cpp b/src/corelib/json/qjsonwriter.cpp index b086cbdea9..c591657f4c 100644 --- a/src/corelib/json/qjsonwriter.cpp +++ b/src/corelib/json/qjsonwriter.cpp @@ -41,7 +41,6 @@ #include "qjsonwriter_p.h" #include "qjson_p.h" -#include <private/qunicodetables_p.h> QT_BEGIN_NAMESPACE @@ -140,7 +139,7 @@ static QByteArray escapedString(const QString &s) *cursor++ = 0xc0 | ((uchar) (u >> 6)); } else { // is it one of the Unicode non-characters? - if (QUnicodeTables::isNonCharacter(u)) { + if (QChar::isNonCharacter(u)) { *cursor++ = replacement; ++ch; continue; |