diff options
Diffstat (limited to 'src/corelib/serialization')
22 files changed, 178 insertions, 135 deletions
diff --git a/src/corelib/serialization/qbinaryjsonvalue.cpp b/src/corelib/serialization/qbinaryjsonvalue.cpp index 5e3a01ad38..7d0bc3d366 100644 --- a/src/corelib/serialization/qbinaryjsonvalue.cpp +++ b/src/corelib/serialization/qbinaryjsonvalue.cpp @@ -63,12 +63,9 @@ QBinaryJsonValue::QBinaryJsonValue(QBinaryJsonPrivate::MutableData *data, case QJsonValue::Double: dbl = v.toDouble(parent); break; - case QJsonValue::String: { - QString s = v.toString(parent); - stringData = s.data_ptr(); - stringData->ref.ref(); + case QJsonValue::String: + stringData = v.toString(parent); break; - } case QJsonValue::Array: case QJsonValue::Object: d = data; @@ -80,9 +77,9 @@ QBinaryJsonValue::QBinaryJsonValue(QBinaryJsonPrivate::MutableData *data, } QBinaryJsonValue::QBinaryJsonValue(QString string) - : stringData(*reinterpret_cast<QStringData **>(&string)), t(QJsonValue::String) + : d(nullptr), t(QJsonValue::String) { - stringData->ref.ref(); + stringData = std::move(string); } QBinaryJsonValue::QBinaryJsonValue(const QBinaryJsonArray &a) @@ -101,9 +98,6 @@ QBinaryJsonValue::QBinaryJsonValue(const QBinaryJsonObject &o) QBinaryJsonValue::~QBinaryJsonValue() { - if (t == QJsonValue::String && stringData && !stringData->ref.deref()) - free(stringData); - if (d && !d->ref.deref()) delete d; } @@ -134,9 +128,7 @@ QString QBinaryJsonValue::toString() const { if (t != QJsonValue::String) return QString(); - stringData->ref.ref(); // the constructor below doesn't add a ref. - QStringDataPtr holder = { stringData }; - return QString(holder); + return stringData; } void QBinaryJsonValue::detach() diff --git a/src/corelib/serialization/qbinaryjsonvalue_p.h b/src/corelib/serialization/qbinaryjsonvalue_p.h index 498fc62ecd..c3b943250c 100644 --- a/src/corelib/serialization/qbinaryjsonvalue_p.h +++ b/src/corelib/serialization/qbinaryjsonvalue_p.h @@ -86,6 +86,7 @@ public: QBinaryJsonValue(QBinaryJsonValue &&other) noexcept : ui(other.ui), + stringData(std::move(other.stringData)), d(other.d), t(other.t) { @@ -96,6 +97,7 @@ public: QBinaryJsonValue &operator =(QBinaryJsonValue &&other) noexcept { + qSwap(stringData, other.stringData); qSwap(ui, other.ui); qSwap(d, other.d); qSwap(t, other.t); @@ -122,9 +124,9 @@ private: quint64 ui; bool b; double dbl; - QStringData *stringData; const QBinaryJsonPrivate::Base *base; }; + QString stringData; QBinaryJsonPrivate::MutableData *d = nullptr; // needed for Objects and Arrays QJsonValue::Type t = QJsonValue::Null; }; diff --git a/src/corelib/serialization/qcborarray.cpp b/src/corelib/serialization/qcborarray.cpp index ca0156e07d..3bb99176af 100644 --- a/src/corelib/serialization/qcborarray.cpp +++ b/src/corelib/serialization/qcborarray.cpp @@ -1200,7 +1200,7 @@ void QCborArray::detach(qsizetype reserved) Returns the offset of this iterator relative to \a other. */ -uint qHash(const QCborArray &array, uint seed) +size_t qHash(const QCborArray &array, size_t seed) { return qHashRange(array.begin(), array.end(), seed); } diff --git a/src/corelib/serialization/qcborarray.h b/src/corelib/serialization/qcborarray.h index fe06b8630f..0438b920ab 100644 --- a/src/corelib/serialization/qcborarray.h +++ b/src/corelib/serialization/qcborarray.h @@ -294,7 +294,7 @@ inline QCborArray QCborValueRef::toArray(const QCborArray &a) const return concrete().toArray(a); } -Q_CORE_EXPORT uint qHash(const QCborArray &array, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QCborArray &array, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborArray &a); diff --git a/src/corelib/serialization/qcborcommon.h b/src/corelib/serialization/qcborcommon.h index bec46399ce..1497da3d2e 100644 --- a/src/corelib/serialization/qcborcommon.h +++ b/src/corelib/serialization/qcborcommon.h @@ -138,12 +138,12 @@ QDataStream &operator<<(QDataStream &ds, QCborSimpleType st); QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st); #endif -inline uint qHash(QCborSimpleType tag, uint seed = 0) +inline size_t qHash(QCborSimpleType tag, size_t seed = 0) { return qHash(quint8(tag), seed); } -inline uint qHash(QCborTag tag, uint seed = 0) +inline size_t qHash(QCborTag tag, size_t seed = 0) { return qHash(quint64(tag), seed); } diff --git a/src/corelib/serialization/qcbormap.cpp b/src/corelib/serialization/qcbormap.cpp index 4b28ca4a2e..9a8a2c4417 100644 --- a/src/corelib/serialization/qcbormap.cpp +++ b/src/corelib/serialization/qcbormap.cpp @@ -1744,7 +1744,7 @@ void QCborMap::detach(qsizetype reserved) \sa operator+=(), operator-() */ -uint qHash(const QCborMap &map, uint seed) +size_t qHash(const QCborMap &map, size_t seed) { return qHashRange(map.begin(), map.end(), seed); } diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h index 6636ce776a..0609c0a39e 100644 --- a/src/corelib/serialization/qcbormap.h +++ b/src/corelib/serialization/qcbormap.h @@ -350,7 +350,7 @@ inline QCborMap QCborValueRef::toMap(const QCborMap &m) const return concrete().toMap(m); } -Q_CORE_EXPORT uint qHash(const QCborMap &map, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QCborMap &map, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborMap &m); diff --git a/src/corelib/serialization/qcborstreamwriter.cpp b/src/corelib/serialization/qcborstreamwriter.cpp index 9d78785416..c73c17aed1 100644 --- a/src/corelib/serialization/qcborstreamwriter.cpp +++ b/src/corelib/serialization/qcborstreamwriter.cpp @@ -729,7 +729,7 @@ void QCborStreamWriter::appendTextString(const char *utf8, qsizetype len) length is implied by the elements contained in it. Note, however, that use of indeterminate-length arrays is not compliant with canonical CBOR encoding. - The following example appends elements from the linked list of strings + The following example appends elements from the vector of strings passed as input: \snippet code/src_corelib_serialization_qcborstream.cpp 20 @@ -802,7 +802,7 @@ bool QCborStreamWriter::endArray() indeterminate-length maps is not compliant with canonical CBOR encoding (canonical encoding also requires keys to be unique and in sorted order). - The following example appends elements from the linked list of int and + The following example appends elements from the vector of int and string pairs passed as input: \snippet code/src_corelib_serialization_qcborstream.cpp 22 diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp index c45a09ad99..a3f93e5eed 100644 --- a/src/corelib/serialization/qcborvalue.cpp +++ b/src/corelib/serialization/qcborvalue.cpp @@ -2542,7 +2542,7 @@ QCborValue QCborValue::fromCbor(const QByteArray &ba, QCborParserError *error) \sa fromCbor(), fromVariant(), fromJsonValue() */ -QByteArray QCborValue::toCbor(EncodingOptions opt) +QByteArray QCborValue::toCbor(EncodingOptions opt) const { QByteArray result; QCborStreamWriter writer(&result); @@ -2579,7 +2579,7 @@ QByteArray QCborValue::toCbor(EncodingOptions opt) \sa fromCbor(), fromVariant(), fromJsonValue() */ -Q_NEVER_INLINE void QCborValue::toCbor(QCborStreamWriter &writer, EncodingOptions opt) +Q_NEVER_INLINE void QCborValue::toCbor(QCborStreamWriter &writer, EncodingOptions opt) const { if (isContainer() || isTag()) return encodeToCbor(writer, container, -type(), opt); @@ -2925,7 +2925,7 @@ inline QCborMap::QCborMap(QCborContainerPrivate &dd) noexcept { } -uint qHash(const QCborValue &value, uint seed) +size_t qHash(const QCborValue &value, size_t seed) { switch (value.type()) { case QCborValue::Integer: diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h index f7064ac6e1..9923710eaa 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -298,8 +298,8 @@ public: { return fromCbor(QByteArray(reinterpret_cast<const char *>(data), int(len)), error); } #endif // QT_CONFIG(cborstreamreader) #if QT_CONFIG(cborstreamwriter) - QByteArray toCbor(EncodingOptions opt = NoTransformation); - void toCbor(QCborStreamWriter &writer, EncodingOptions opt = NoTransformation); + QByteArray toCbor(EncodingOptions opt = NoTransformation) const; + void toCbor(QCborStreamWriter &writer, EncodingOptions opt = NoTransformation) const; #endif QString toDiagnosticNotation(DiagnosticNotationOptions opts = Compact) const; @@ -481,7 +481,7 @@ private: qsizetype i; }; -Q_CORE_EXPORT uint qHash(const QCborValue &value, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QCborValue &value, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborValue &v); diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h index 041a20e746..1d686f118b 100644 --- a/src/corelib/serialization/qcborvalue_p.h +++ b/src/corelib/serialization/qcborvalue_p.h @@ -148,8 +148,8 @@ public: qptrdiff offset = data.size(); // align offset - offset += Q_ALIGNOF(QtCbor::ByteData) - 1; - offset &= ~(Q_ALIGNOF(QtCbor::ByteData) - 1); + offset += alignof(QtCbor::ByteData) - 1; + offset &= ~(alignof(QtCbor::ByteData) - 1); qptrdiff increment = qptrdiff(sizeof(QtCbor::ByteData)) + len; @@ -171,7 +171,7 @@ public: return nullptr; size_t offset = size_t(e.value); - Q_ASSERT((offset % Q_ALIGNOF(QtCbor::ByteData)) == 0); + Q_ASSERT((offset % alignof(QtCbor::ByteData)) == 0); Q_ASSERT(offset + sizeof(QtCbor::ByteData) <= size_t(data.size())); auto b = reinterpret_cast<const QtCbor::ByteData *>(data.constData() + offset); @@ -215,7 +215,7 @@ public: } void insertAt(qsizetype idx, const QCborValue &value, ContainerDisposition disp = CopyContainer) { - replaceAt_internal(*elements.insert(elements.begin() + idx, {}), value, disp); + replaceAt_internal(*elements.insert(elements.begin() + int(idx), {}), value, disp); } void append(QtCbor::Undefined) @@ -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/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 5082a8cb0d..df286085bc 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -163,7 +163,7 @@ QT_BEGIN_NAMESPACE \section1 Reading and Writing Qt Collection Classes The Qt container classes can also be serialized to a QDataStream. - These include QList, QLinkedList, QVector, QSet, QHash, and QMap. + These include QList, QVector, QSet, QHash, and QMap. The stream operators are declared as non-members of the classes. \target Serializing Qt Classes diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index bc05841b52..c7b0008039 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -43,6 +43,7 @@ #include <QtCore/qscopedpointer.h> #include <QtCore/qiodevice.h> #include <QtCore/qpair.h> +#include <QtCore/qcontainerfwd.h> #ifdef Status #error qdatastream.h must be included before any header file that defines Status @@ -54,12 +55,6 @@ class qfloat16; class QByteArray; class QIODevice; -template <typename T> class QList; -template <typename T> class QVector; -template <typename T> class QSet; -template <class Key, class T> class QHash; -template <class Key, class T> class QMap; - #if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED) class QDataStreamPrivate; namespace QtPrivate { @@ -100,15 +95,9 @@ public: Qt_5_12 = 18, Qt_5_13 = 19, Qt_5_14 = Qt_5_13, -#if QT_VERSION >= 0x050f00 Qt_5_15 = Qt_5_14, - Qt_DefaultCompiledVersion = Qt_5_15 -#elif QT_VERSION >= 0x060000 - Qt_6_0 = Qt_5_15, + Qt_6_0 = 20, Qt_DefaultCompiledVersion = Qt_6_0 -#else - Qt_DefaultCompiledVersion = Qt_5_14 -#endif #if QT_VERSION >= 0x060100 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #endif @@ -285,13 +274,6 @@ QDataStream &readListBasedContainer(QDataStream &s, Container &c) return s; } -template <typename T> -struct MultiContainer { using type = T; }; -template <typename K, typename V> -struct MultiContainer<QMap<K, V>> { using type = QMultiMap<K, V>; }; -template <typename K, typename V> -struct MultiContainer<QHash<K, V>> { using type = QMultiHash<K, V>; }; - template <typename Container> QDataStream &readAssociativeContainer(QDataStream &s, Container &c) { @@ -308,7 +290,7 @@ QDataStream &readAssociativeContainer(QDataStream &s, Container &c) c.clear(); break; } - static_cast<typename MultiContainer<Container>::type &>(c).insert(k, t); + c.insert(k, t); } return s; @@ -328,20 +310,20 @@ template <typename Container> QDataStream &writeAssociativeContainer(QDataStream &s, const Container &c) { s << quint32(c.size()); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_DEPRECATED_SINCE(5, 15) - // Deserialization should occur in the reverse order. - // Otherwise, value() will return the least recently inserted - // value instead of the most recently inserted one. - auto it = c.constEnd(); - auto begin = c.constBegin(); - while (it != begin) { - QT_WARNING_PUSH - QT_WARNING_DISABLE_DEPRECATED - --it; - QT_WARNING_POP + auto it = c.constBegin(); + auto end = c.constEnd(); + while (it != end) { s << it.key() << it.value(); + ++it; } -#else + + return s; +} + +template <typename Container> +QDataStream &writeAssociativeMultiContainer(QDataStream &s, const Container &c) +{ + s << quint32(c.size()); auto it = c.constBegin(); auto end = c.constEnd(); while (it != end) { @@ -354,7 +336,6 @@ QDataStream &writeAssociativeContainer(QDataStream &s, const Container &c) s << next.key() << next.value(); } } -#endif return s; } @@ -419,18 +400,6 @@ typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type& operator>>(QDataStream &s, T &t) { return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t); } -template <typename T> -inline QDataStream &operator>>(QDataStream &s, QList<T> &l) -{ - return QtPrivate::readArrayBasedContainer(s, l); -} - -template <typename T> -inline QDataStream &operator<<(QDataStream &s, const QList<T> &l) -{ - return QtPrivate::writeSequentialContainer(s, l); -} - template<typename T> inline QDataStream &operator>>(QDataStream &s, QVector<T> &v) { @@ -462,12 +431,25 @@ inline QDataStream &operator>>(QDataStream &s, QHash<Key, T> &hash) } template <class Key, class T> + inline QDataStream &operator<<(QDataStream &s, const QHash<Key, T> &hash) { return QtPrivate::writeAssociativeContainer(s, hash); } template <class Key, class T> +inline QDataStream &operator>>(QDataStream &s, QMultiHash<Key, T> &hash) +{ + return QtPrivate::readAssociativeContainer(s, hash); +} + +template <class Key, class T> +inline QDataStream &operator<<(QDataStream &s, const QMultiHash<Key, T> &hash) +{ + return QtPrivate::writeAssociativeMultiContainer(s, hash); +} + +template <class Key, class T> inline QDataStream &operator>>(QDataStream &s, QMap<Key, T> &map) { return QtPrivate::readAssociativeContainer(s, map); @@ -479,6 +461,18 @@ inline QDataStream &operator<<(QDataStream &s, const QMap<Key, T> &map) return QtPrivate::writeAssociativeContainer(s, map); } +template <class Key, class T> +inline QDataStream &operator>>(QDataStream &s, QMultiMap<Key, T> &map) +{ + return QtPrivate::readAssociativeContainer(s, map); +} + +template <class Key, class T> +inline QDataStream &operator<<(QDataStream &s, const QMultiMap<Key, T> &map) +{ + return QtPrivate::writeAssociativeMultiContainer(s, map); +} + #ifndef QT_NO_DATASTREAM template <class T1, class T2> inline QDataStream& operator>>(QDataStream& s, QPair<T1, T2>& p) diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp index 05138ad610..98ace021fc 100644 --- a/src/corelib/serialization/qjsonarray.cpp +++ b/src/corelib/serialization/qjsonarray.cpp @@ -1133,7 +1133,7 @@ void QJsonArray::compact() a->compact(a->elements.size()); } -uint qHash(const QJsonArray &array, uint seed) +size_t qHash(const QJsonArray &array, size_t seed) { return qHashRange(array.begin(), array.end(), seed); } diff --git a/src/corelib/serialization/qjsonarray.h b/src/corelib/serialization/qjsonarray.h index 22aa996a3e..d39522bd2f 100644 --- a/src/corelib/serialization/qjsonarray.h +++ b/src/corelib/serialization/qjsonarray.h @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE class QDebug; class QStringList; -template <typename T> class QList; typedef QList<QVariant> QVariantList; class Q_CORE_EXPORT QJsonArray @@ -253,7 +252,7 @@ private: Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonArray) -Q_CORE_EXPORT uint qHash(const QJsonArray &array, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QJsonArray &array, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonArray &); diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp index ee4dd90416..000008db50 100644 --- a/src/corelib/serialization/qjsoncbor.cpp +++ b/src/corelib/serialization/qjsoncbor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 Intel Corporation. +** Copyright (C) 2020 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -262,8 +262,7 @@ QJsonValue qt_convertToJson(QCborContainerPrivate *d, qsizetype idx) const auto &e = d->elements.at(idx); switch (e.type) { case QCborValue::Integer: - return QJsonPrivate::Value::fromTrustedCbor(e.value); - + return QJsonValue(e.value); case QCborValue::ByteArray: case QCborValue::String: case QCborValue::SimpleType: @@ -370,7 +369,7 @@ QJsonValue QCborValue::toJsonValue() const return false; case Integer: - return QJsonPrivate::Value::fromTrustedCbor(n); + return QJsonPrivate::Value::fromTrustedCbor(*this); case True: return true; @@ -615,11 +614,9 @@ QCborValue QCborValue::fromJsonValue(const QJsonValue &v) case QJsonValue::Bool: return v.toBool(); case QJsonValue::Double: { - qint64 i; - const double dbl = v.toDouble(); - if (convertDoubleTo(dbl, &i)) - return i; - return dbl; + if (v.t == Integer) + return v.toInteger(); + return v.toDouble(); } case QJsonValue::String: return v.toString(); @@ -667,9 +664,7 @@ static void appendVariant(QCborContainerPrivate *d, const QVariant &variant) \row \li \c bool \li Bool \row \li \c std::nullptr_t \li Null \row \li \c short, \c ushort, \c int, \c uint, \l qint64 \li Integer - \row \li \l quint64 \li Integer, but they are cast to \c qint64 first so - values higher than 2\sup{63}-1 (\c INT64_MAX) will - be wrapped to negative + \row \li \l quint64 \li Integer, or Double if outside the range of qint64 \row \li \c float, \c double \li Double \row \li \l QByteArray \li ByteArray \row \li \l QDateTime \li DateTime @@ -713,9 +708,12 @@ QCborValue QCborValue::fromVariant(const QVariant &variant) case QMetaType::UShort: case QMetaType::Int: case QMetaType::LongLong: - case QMetaType::ULongLong: case QMetaType::UInt: return variant.toLongLong(); + case QMetaType::ULongLong: + if (variant.toULongLong() <= static_cast<uint64_t>(std::numeric_limits<qint64>::max())) + return variant.toLongLong(); + Q_FALLTHROUGH(); case QMetaType::Float: case QMetaType::Double: return variant.toDouble(); diff --git a/src/corelib/serialization/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp index 850e878571..a03855d4a3 100644 --- a/src/corelib/serialization/qjsonobject.cpp +++ b/src/corelib/serialization/qjsonobject.cpp @@ -1490,7 +1490,7 @@ void QJsonObject::removeAt(int index) o->removeAt(index); } -uint qHash(const QJsonObject &object, uint seed) +size_t qHash(const QJsonObject &object, size_t seed) { QtPrivate::QHashCombine hash; for (auto it = object.begin(), end = object.end(); it != end; ++it) { diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index c31be0353d..dc449eecf4 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -302,7 +302,7 @@ private: Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonObject) -Q_CORE_EXPORT uint qHash(const QJsonObject &object, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QJsonObject &object, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonObject &); diff --git a/src/corelib/serialization/qjsonparser.cpp b/src/corelib/serialization/qjsonparser.cpp index 6d0a92e094..d7ce702ff7 100644 --- a/src/corelib/serialization/qjsonparser.cpp +++ b/src/corelib/serialization/qjsonparser.cpp @@ -709,10 +709,11 @@ bool Parser::parseNumber() // frac = decimal-point 1*DIGIT if (json < end && *json == '.') { - isInt = false; ++json; - while (json < end && *json >= '0' && *json <= '9') + while (json < end && *json >= '0' && *json <= '9') { + isInt = isInt && *json == '0'; ++json; + } } // exp = e [ minus / plus ] 1*DIGIT @@ -893,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; } diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp index caf81c79ef..5eb33bd2a3 100644 --- a/src/corelib/serialization/qjsonvalue.cpp +++ b/src/corelib/serialization/qjsonvalue.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -154,7 +154,9 @@ QJsonValue::QJsonValue(bool b) QJsonValue::QJsonValue(double v) : d(nullptr) { - if (convertDoubleTo(v, &n)) { + // Convert to integer if the number is an integer and changing wouldn't + // introduce additional digit precision not present in the double. + if (convertDoubleTo<qint64>(v, &n, false /* allow_precision_upgrade */)) { t = QCborValue::Integer; } else { memcpy(&n, &v, sizeof(n)); @@ -449,12 +451,18 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant) return QJsonValue(Null); case QMetaType::Bool: return QJsonValue(variant.toBool()); + case QMetaType::Short: + case QMetaType::UShort: case QMetaType::Int: - case QMetaType::Float: - case QMetaType::Double: + case QMetaType::UInt: case QMetaType::LongLong: + return QJsonValue(variant.toLongLong()); case QMetaType::ULongLong: - case QMetaType::UInt: + if (variant.toULongLong() <= static_cast<uint64_t>(std::numeric_limits<qint64>::max())) + return QJsonValue(variant.toLongLong()); + Q_FALLTHROUGH(); + case QMetaType::Float: + case QMetaType::Double: return QJsonValue(variant.toDouble()); case QMetaType::QString: return QJsonValue(variant.toString()); @@ -504,7 +512,7 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant) \value Null QMetaType::Nullptr \value Bool QMetaType::Bool - \value Double QMetaType::Double + \value Double QMetaType::Double or QMetaType::LongLong \value String QString \value Array QVariantList \value Object QVariantMap @@ -520,6 +528,7 @@ QVariant QJsonValue::toVariant() const case QCborValue::False: return false; case QCborValue::Integer: + return toInteger(); case QCborValue::Double: return toDouble(); case QCborValue::String: @@ -548,7 +557,8 @@ QVariant QJsonValue::toVariant() const \value Null A Null value \value Bool A boolean value. Use toBool() to convert to a bool. - \value Double A double. Use toDouble() to convert to a double. + \value Double A number value. Use toDouble() to convert to a double, + or toInteger() to convert to a qint64. \value String A string. Use toString() to convert to a QString. \value Array An array. Use toArray() to convert to a QJsonArray. \value Object An object. Use toObject() to convert to a QJsonObject. @@ -613,18 +623,43 @@ int QJsonValue::toInt(int defaultValue) const { switch (t) { case QCborValue::Double: { - const double dbl = toDouble(); int dblInt; - convertDoubleTo<int>(dbl, &dblInt); - return dbl == dblInt ? dblInt : defaultValue; + if (convertDoubleTo<int>(toDouble(), &dblInt)) + return dblInt; + break; } case QCborValue::Integer: - return (n <= qint64(std::numeric_limits<int>::max()) - && n >= qint64(std::numeric_limits<int>::min())) - ? n : defaultValue; + if (qint64(int(n)) == n) + return int(n); + break; default: - return defaultValue; + break; } + return defaultValue; +} + +/*! + \since 6.0 + Converts the value to an integer and returns it. + + If type() is not Double or the value is not a whole number + representable as qint64, the \a defaultValue will be returned. + */ +qint64 QJsonValue::toInteger(qint64 defaultValue) const +{ + switch (t) { + case QCborValue::Integer: + return n; + case QCborValue::Double: { + qint64 dblInt; + if (convertDoubleTo<qint64>(toDouble(), &dblInt)) + return dblInt; + break; + } + default: + break; + } + return defaultValue; } /*! @@ -641,7 +676,7 @@ double QJsonValue::toDouble(double defaultValue) const return d; } case QCborValue::Integer: - return n; + return double(n); default: return defaultValue; } @@ -787,8 +822,13 @@ const QJsonValue QJsonValue::operator[](int i) const */ bool QJsonValue::operator==(const QJsonValue &other) const { - if (t != other.t) + if (t != other.t) { + if (isDouble() && other.isDouble()) { + // One value Cbor integer, one Cbor double, should interact as doubles. + return toDouble() == other.toDouble(); + } return false; + } switch (t) { case QCborValue::Undefined: @@ -903,7 +943,7 @@ QJsonValue QJsonValueRef::toValue() const return o->valueAt(index); } -uint qHash(const QJsonValue &value, uint seed) +size_t qHash(const QJsonValue &value, size_t seed) { switch (value.type()) { case QJsonValue::Null: @@ -929,32 +969,38 @@ uint qHash(const QJsonValue &value, uint seed) QDebug operator<<(QDebug dbg, const QJsonValue &o) { QDebugStateSaver saver(dbg); - switch (o.type()) { - case QJsonValue::Undefined: + switch (o.t) { + case QCborValue::Undefined: dbg << "QJsonValue(undefined)"; break; - case QJsonValue::Null: + case QCborValue::Null: dbg << "QJsonValue(null)"; break; - case QJsonValue::Bool: + case QCborValue::True: + case QCborValue::False: dbg.nospace() << "QJsonValue(bool, " << o.toBool() << ')'; break; - case QJsonValue::Double: + case QCborValue::Integer: + dbg.nospace() << "QJsonValue(double, " << o.toInteger() << ')'; + break; + case QCborValue::Double: dbg.nospace() << "QJsonValue(double, " << o.toDouble() << ')'; break; - case QJsonValue::String: + case QCborValue::String: dbg.nospace() << "QJsonValue(string, " << o.toString() << ')'; break; - case QJsonValue::Array: + case QCborValue::Array: dbg.nospace() << "QJsonValue(array, "; dbg << o.toArray(); dbg << ')'; break; - case QJsonValue::Object: + case QCborValue::Map: dbg.nospace() << "QJsonValue(object, "; dbg << o.toObject(); dbg << ')'; break; + default: + Q_UNREACHABLE(); } return dbg; } diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index 5adcd64176..fa877ff7ee 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -112,6 +112,7 @@ public: bool toBool(bool defaultValue = false) const; int toInt(int defaultValue = 0) const; + qint64 toInteger(qint64 defaultValue = 0) const; double toDouble(double defaultValue = 0) const; QString toString() const; QString toString(const QString &defaultValue) const; @@ -231,7 +232,7 @@ public: Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonValue) -Q_CORE_EXPORT uint qHash(const QJsonValue &value, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QJsonValue &value, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &); diff --git a/src/corelib/serialization/qjsonwriter.cpp b/src/corelib/serialization/qjsonwriter.cpp index 627d1bbd62..590b59f09c 100644 --- a/src/corelib/serialization/qjsonwriter.cpp +++ b/src/corelib/serialization/qjsonwriter.cpp @@ -60,7 +60,8 @@ static inline uchar hexdig(uint u) static QByteArray escapedString(const QString &s) { - QByteArray ba(s.length(), Qt::Uninitialized); + // give it a minimum size to ensure the resize() below always adds enough space + QByteArray ba(qMax(s.length(), 16), Qt::Uninitialized); uchar *cursor = reinterpret_cast<uchar *>(const_cast<char *>(ba.constData())); const uchar *ba_end = cursor + ba.length(); @@ -138,15 +139,14 @@ static void valueToJson(const QCborValue &v, QByteArray &json, int indent, bool json += "false"; break; case QCborValue::Integer: + json += QByteArray::number(v.toInteger()); + break; case QCborValue::Double: { const double d = v.toDouble(); - if (qIsFinite(d)) { - quint64 absInt; - json += QByteArray::number(d, convertDoubleTo(std::abs(d), &absInt) ? 'f' : 'g', - QLocale::FloatingPointShortest); - } else { + if (qIsFinite(d)) + json += QByteArray::number(d, 'g', QLocale::FloatingPointShortest); + else json += "null"; // +INF || -INF || NaN (see RFC4627#section2.4) - } break; } case QCborValue::String: |