From 329eef34f4401e2303a60b70904c7f58ccf64af8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 19 Jun 2019 17:30:28 -0700 Subject: Add functions for facilitating adding UTF-8 and US-ASCII strings Change-Id: Ief874765cd7b43798de3fffd15a9c0b4dc82a64e Reviewed-by: Ulf Hermann --- src/corelib/serialization/qcborvalue_p.h | 9 +++++++++ src/corelib/serialization/qjsonparser.cpp | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h index d18d108969..b5d3de74fe 100644 --- a/src/corelib/serialization/qcborvalue_p.h +++ b/src/corelib/serialization/qcborvalue_p.h @@ -236,6 +236,15 @@ public: elements.append(QtCbor::Element(addByteData(data, len), type, QtCbor::Element::HasByteData | extraFlags)); } + void appendAsciiString(const QString &s); + void appendAsciiString(const char *str, qsizetype len) + { + appendByteData(str, len, QCborValue::String, QtCbor::Element::StringIsAscii); + } + void appendUtf8String(const char *str, qsizetype len) + { + appendByteData(str, len, QCborValue::String); + } void append(QLatin1String s) { if (!QtPrivate::isAscii(s)) diff --git a/src/corelib/serialization/qjsonparser.cpp b/src/corelib/serialization/qjsonparser.cpp index aab8112d7f..d7ce702ff7 100644 --- a/src/corelib/serialization/qjsonparser.cpp +++ b/src/corelib/serialization/qjsonparser.cpp @@ -894,9 +894,10 @@ bool Parser::parseString() // no escape sequences, we are done if (isUtf8) { - container->appendByteData(start, json - start - 1, QCborValue::String, - isAscii ? QtCbor::Element::StringIsAscii - : QtCbor::Element::ValueFlags {}); + if (isAscii) + container->appendAsciiString(start, json - start - 1); + else + container->appendUtf8String(start, json - start - 1); END; return true; } -- cgit v1.2.3