diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-14 13:03:46 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-19 13:53:21 +0100 |
commit | 26e876912435bdafbca2b425af43824d7ec5b876 (patch) | |
tree | b7ee83cdd9de18ce5970bab0bb217a972d3d2445 /src/corelib/text/qbytearraylist.h | |
parent | 7a6c6da2ebbfef33f7284ce5c96aa0c3acabc6bc (diff) | |
parent | bac999f38ca10147832846f6d7df1e4a051d3760 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
Diffstat (limited to 'src/corelib/text/qbytearraylist.h')
-rw-r--r-- | src/corelib/text/qbytearraylist.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/text/qbytearraylist.h b/src/corelib/text/qbytearraylist.h index 0250b649b8..4b6c926960 100644 --- a/src/corelib/text/qbytearraylist.h +++ b/src/corelib/text/qbytearraylist.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtCore/qlist.h> +#include <QtCore/qvector.h> #ifndef QBYTEARRAYLIST_H #define QBYTEARRAYLIST_H @@ -49,12 +49,12 @@ QT_BEGIN_NAMESPACE #if !defined(QT_NO_JAVA_STYLE_ITERATORS) -typedef QListIterator<QByteArray> QByteArrayListIterator; -typedef QMutableListIterator<QByteArray> QMutableByteArrayListIterator; +typedef QVectorIterator<QByteArray> QByteArrayListIterator; +typedef QMutableVectorIterator<QByteArray> QMutableByteArrayListIterator; #endif #ifndef Q_CLANG_QDOC -typedef QList<QByteArray> QByteArrayList; +typedef QVector<QByteArray> QByteArrayList; namespace QtPrivate { QByteArray Q_CORE_EXPORT QByteArrayList_join(const QByteArrayList *that, const char *separator, int separatorLength); @@ -63,14 +63,14 @@ namespace QtPrivate { #endif #ifdef Q_CLANG_QDOC -class QByteArrayList : public QList<QByteArray> +class QByteArrayList : public QVector<QByteArray> #else -template <> struct QListSpecialMethods<QByteArray> +template <> struct QVectorSpecialMethods<QByteArray> #endif { #ifndef Q_CLANG_QDOC protected: - ~QListSpecialMethods() = default; + ~QVectorSpecialMethods() = default; #endif public: inline QByteArray join() const @@ -84,7 +84,7 @@ public: { return QtPrivate::QByteArrayList_indexOf(self(), needle, from); } private: - typedef QList<QByteArray> Self; + typedef QVector<QByteArray> Self; Self *self() { return static_cast<Self *>(this); } const Self *self() const { return static_cast<const Self *>(this); } }; |