Move QListSpecialMethods over to QVector

Extend QVector with special methods for QByteArray and QString,
just as QList had them in Qt 5.

This also means that QStringList and QByteArrayList
are now implemented through a QVector, not a QList anymore.

QListIterator<QString> is now slightly source incompatible as QStringList
is a QVector, but that will be fixed in a follow-up change when
QList<QString> will start mapping to a QVector.

Change-Id: I7cfb8a72d4d95b347bbd386892f244b7203b41c2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 52 insertions, 16 deletions

diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 62fbdb4a2a..45f7c5b76b 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -59,12 +59,31 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtPrivate {
+   template <typename V, typename U> int indexOf(const QVector<V> &list, const U &u, int from);
+   template <typename V, typename U> int lastIndexOf(const QVector<V> &list, const U &u, int from);
+}
+
+template <typename T> struct QVectorSpecialMethods
+{
+protected:
+    ~QVectorSpecialMethods() = default;
+};
+template <> struct QVectorSpecialMethods<QByteArray>;
+template <> struct QVectorSpecialMethods<QString>;
+
 template <typename T>
 class QVector
+#ifndef Q_QDOC
+    : public QVectorSpecialMethods<T>
+#endif
 {
     typedef QTypedArrayData<T> Data;
     Data *d;
 
+    template <typename V, typename U> friend int QtPrivate::indexOf(const QVector<V> &list, const U &u, int from);
+    template <typename V, typename U> friend int QtPrivate::lastIndexOf(const QVector<V> &list, const U &u, int from);
+
 public:
     inline QVector() noexcept : d(Data::sharedNull()) { }
     explicit QVector(int size);
@@ -1004,38 +1023,52 @@ QVector<T> &QVector<T>::operator+=(const QVector &l)
     return *this;
 }
 
-template <typename T>
-int QVector<T>::indexOf(const T &t, int from) const
+namespace QtPrivate {
+template <typename T, typename U>
+int indexOf(const QVector<T> &vector, const U &u, int from)
 {
     if (from < 0)
-        from = qMax(from + d->size, 0);
-    if (from < d->size) {
-        T* n = d->begin() + from - 1;
-        T* e = d->end();
+        from = qMax(from + vector.size(), 0);
+    if (from < vector.size()) {
+        auto n = vector.begin() + from - 1;
+        auto e = vector.end();
         while (++n != e)
-            if (*n == t)
-                return n - d->begin();
+            if (*n == u)
+                return n - vector.begin();
     }
     return -1;
 }
 
-template <typename T>
-int QVector<T>::lastIndexOf(const T &t, int from) const
+template <typename T, typename U>
+int lastIndexOf(const QVector<T> &vector, const U &u, int from)
 {
     if (from < 0)
-        from += d->size;
-    else if (from >= d->size)
-        from = d->size-1;
+        from += vector.d->size;
+    else if (from >= vector.size())
+        from = vector.size() - 1;
     if (from >= 0) {
-        T* b = d->begin();
-        T* n = d->begin() + from + 1;
+        auto b = vector.begin();
+        auto n = vector.begin() + from + 1;
         while (n != b) {
-            if (*--n == t)
+            if (*--n == u)
                 return n - b;
         }
     }
     return -1;
 }
+}
+
+template <typename T>
+int QVector<T>::indexOf(const T &t, int from) const
+{
+    return QtPrivate::indexOf<T, T>(*this, t, from);
+}
+
+template <typename T>
+int QVector<T>::lastIndexOf(const T &t, int from) const
+{
+    return QtPrivate::lastIndexOf(*this, t, from);
+}
 
 template <typename T>
 bool QVector<T>::contains(const T &t) const
@@ -1153,4 +1186,7 @@ QVector<QStringRef> QStringRef::split(QChar sep, Qt::SplitBehavior behavior, Qt:
 
 QT_END_NAMESPACE
 
+#include <QtCore/qbytearraylist.h>
+#include <QtCore/qstringlist.h>
+
 #endif // QVECTOR_H