diff options
Diffstat (limited to 'src/corelib/serialization')
-rw-r--r-- | src/corelib/serialization/qcbormap.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qcborvalue.h | 1 | ||||
-rw-r--r-- | src/corelib/serialization/qcborvalue_p.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qdatastream.h | 4 | ||||
-rw-r--r-- | src/corelib/serialization/qjson_p.h | 6 | ||||
-rw-r--r-- | src/corelib/serialization/qxmlstream.h | 15 |
6 files changed, 14 insertions, 16 deletions
diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h index 1199cb47b7..7e1a4cb485 100644 --- a/src/corelib/serialization/qcbormap.h +++ b/src/corelib/serialization/qcbormap.h @@ -188,7 +188,7 @@ public: qsizetype size() const noexcept Q_DECL_PURE_FUNCTION; bool isEmpty() const { return size() == 0; } void clear(); - QVector<QCborValue> keys() const; + QList<QCborValue> keys() const; QCborValue value(qint64 key) const { const_iterator it = find(key); return it == end() ? QCborValue() : it.value(); } diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h index 487173e421..b8c3dce294 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -51,7 +51,6 @@ #include <QtCore/qurl.h> #include <QtCore/quuid.h> #include <QtCore/qvariant.h> -#include <QtCore/qvector.h> // See qcborcommon.h for why we check #if defined(QT_X11_DEFINES_FOUND) diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h index cad605bd1a..3b1e45a2a8 100644 --- a/src/corelib/serialization/qcborvalue_p.h +++ b/src/corelib/serialization/qcborvalue_p.h @@ -131,7 +131,7 @@ public: QByteArray::size_type usedData = 0; QByteArray data; - QVector<QtCbor::Element> elements; + QList<QtCbor::Element> elements; void deref() { if (!ref.deref()) delete this; } void compact(qsizetype reserved); diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index c11d6803ac..d00fb5e7d8 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -406,13 +406,13 @@ operator>>(QDataStream &s, T &t) { return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t); } template<typename T> -inline QDataStream &operator>>(QDataStream &s, QVector<T> &v) +inline QDataStream &operator>>(QDataStream &s, QList<T> &v) { return QtPrivate::readArrayBasedContainer(s, v); } template<typename T> -inline QDataStream &operator<<(QDataStream &s, const QVector<T> &v) +inline QDataStream &operator<<(QDataStream &s, const QList<T> &v) { return QtPrivate::writeSequentialContainer(s, v); } diff --git a/src/corelib/serialization/qjson_p.h b/src/corelib/serialization/qjson_p.h index d2bbf928d0..4589284ef3 100644 --- a/src/corelib/serialization/qjson_p.h +++ b/src/corelib/serialization/qjson_p.h @@ -113,7 +113,7 @@ struct ObjectIterator Element m_value; }; - using difference_type = typename QVector<Element>::difference_type; + using difference_type = typename QList<Element>::difference_type; using iterator_category = std::random_access_iterator_tag; ObjectIterator() = default; @@ -182,8 +182,8 @@ inline bool operator==( return a.elementsIterator() == b.elementsIterator(); } -using KeyIterator = ObjectIterator<QtCbor::Element, QVector<QtCbor::Element>::iterator>; -using ConstKeyIterator = ObjectIterator<const QtCbor::Element, QVector<QtCbor::Element>::const_iterator>; +using KeyIterator = ObjectIterator<QtCbor::Element, QList<QtCbor::Element>::iterator>; +using ConstKeyIterator = ObjectIterator<const QtCbor::Element, QList<QtCbor::Element>::const_iterator>; template<> inline KeyIterator::reference &KeyIterator::reference::operator=(const KeyIterator::value_type &value) diff --git a/src/corelib/serialization/qxmlstream.h b/src/corelib/serialization/qxmlstream.h index fdc28a97e1..44f33b111b 100644 --- a/src/corelib/serialization/qxmlstream.h +++ b/src/corelib/serialization/qxmlstream.h @@ -44,9 +44,9 @@ #ifndef QT_NO_XMLSTREAM -#include <QtCore/qstring.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtCore/qscopedpointer.h> +#include <QtCore/qstring.h> QT_BEGIN_NAMESPACE @@ -113,7 +113,7 @@ public: Q_DECLARE_TYPEINFO(QXmlStreamAttribute, Q_MOVABLE_TYPE); -class Q_CORE_EXPORT QXmlStreamAttributes : public QVector<QXmlStreamAttribute> +class Q_CORE_EXPORT QXmlStreamAttributes : public QList<QXmlStreamAttribute> { public: inline QXmlStreamAttributes() {} @@ -140,7 +140,7 @@ public: return !value(namespaceUri, name).isNull(); } - using QVector<QXmlStreamAttribute>::append; + using QList<QXmlStreamAttribute>::append; }; class Q_CORE_EXPORT QXmlStreamNamespaceDeclaration { @@ -164,7 +164,7 @@ public: }; Q_DECLARE_TYPEINFO(QXmlStreamNamespaceDeclaration, Q_MOVABLE_TYPE); -typedef QVector<QXmlStreamNamespaceDeclaration> QXmlStreamNamespaceDeclarations; +typedef QList<QXmlStreamNamespaceDeclaration> QXmlStreamNamespaceDeclarations; class Q_CORE_EXPORT QXmlStreamNotationDeclaration { QXmlStreamStringRef m_name, m_systemId, m_publicId; @@ -188,7 +188,7 @@ public: }; Q_DECLARE_TYPEINFO(QXmlStreamNotationDeclaration, Q_MOVABLE_TYPE); -typedef QVector<QXmlStreamNotationDeclaration> QXmlStreamNotationDeclarations; +typedef QList<QXmlStreamNotationDeclaration> QXmlStreamNotationDeclarations; class Q_CORE_EXPORT QXmlStreamEntityDeclaration { QXmlStreamStringRef m_name, m_notationName, m_systemId, m_publicId, m_value; @@ -217,8 +217,7 @@ public: }; Q_DECLARE_TYPEINFO(QXmlStreamEntityDeclaration, Q_MOVABLE_TYPE); -typedef QVector<QXmlStreamEntityDeclaration> QXmlStreamEntityDeclarations; - +typedef QList<QXmlStreamEntityDeclaration> QXmlStreamEntityDeclarations; class Q_CORE_EXPORT QXmlStreamEntityResolver { |