diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-01-17 14:40:32 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-02-03 17:43:30 +0100 |
commit | 4681f1fc2cfabb64b6b4f1095e2d4f44d0cee903 (patch) | |
tree | 90949be2aba621bd0b4a337d83aa7d1f349094e1 /src/corelib/serialization/qdatastream.h | |
parent | 10afe69c16e641909901159bfad5b233d641151a (diff) |
Separate streaming of QHash and QMultiHash/QMap and QMultiMap
Those classes will not have relations anymore in Qt6, so they need
separate streaming operators. Writing of multi maps/hashes requires some
additional care so that restoring keeps the order of how iteme have been
inserted.
Change-Id: If41d0c5c24962764a2cb81bd2de9e2fadf1a2b63
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/serialization/qdatastream.h')
-rw-r--r-- | src/corelib/serialization/qdatastream.h | 56 |
1 files changed, 39 insertions, 17 deletions
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index b7c16018d5..270267e29e 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -296,10 +296,7 @@ QDataStream &readAssociativeContainer(QDataStream &s, Container &c) c.clear(); break; } -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - c.insertMulti(k, t); -QT_WARNING_POP + c.insert(k, t); } return s; @@ -319,19 +316,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(); -#else + ++it; + } + + 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) { @@ -343,7 +341,6 @@ QDataStream &writeAssociativeContainer(QDataStream &s, const Container &c) auto next = std::next(rangeStart, i); s << next.key() << next.value(); } -#endif } return s; @@ -440,12 +437,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); @@ -457,6 +467,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) |