diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-05-24 14:27:48 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-10-30 11:52:48 +0100 |
| commit | 5357231c0a10eef558cc6aebfd172048dc010a96 (patch) | |
| tree | 47d13d107665105bc93734c064b11e47ad5392e2 /src/corelib/serialization | |
| parent | 1299a2330ae14a6a901f574ea01fc63715e1b87d (diff) | |
Make QList an alias to QVector
This is almost 100% source compatible with Qt 5. Exceptions are
* Stability of references for large or non movable types
* taking a PMF for types that are now overloaded with r-value references
in QVector
* The missing prepend optimization in QVector (that is still planned
to come for Qt 6)
Change-Id: I96d44553304dd623def9c70d6fea8fa2fb0373b0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qcborvalue_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/serialization/qdatastream.h | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h index 38ad54047f..d18d108969 100644 --- a/src/corelib/serialization/qcborvalue_p.h +++ b/src/corelib/serialization/qcborvalue_p.h @@ -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) diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index bcfcd47ccf..20d3953652 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -389,18 +389,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) { |