4 files changed, 85 insertions, 96 deletions
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h
index cbd9445d180..c76ff3d9f02 100644
--- a/src/corelib/tools/qarraydata.h
+++ b/src/corelib/tools/qarraydata.h
@@ -132,79 +132,6 @@ template <class T>
 struct QTypedArrayData
     : QArrayData
 {
-    class iterator {
-        T *i = nullptr;
-    public:
-        typedef std::random_access_iterator_tag  iterator_category;
-        typedef qsizetype difference_type;
-        typedef T value_type;
-        typedef T *pointer;
-        typedef T &reference;
-
-        inline constexpr iterator() = default;
-        inline iterator(T *n) : i(n) {}
-        inline T &operator*() const { return *i; }
-        inline T *operator->() const { return i; }
-        inline T &operator[](qsizetype j) const { return *(i + j); }
-        inline constexpr bool operator==(iterator o) const { return i == o.i; }
-        inline constexpr bool operator!=(iterator o) const { return i != o.i; }
-        inline constexpr bool operator<(iterator other) const { return i < other.i; }
-        inline constexpr bool operator<=(iterator other) const { return i <= other.i; }
-        inline constexpr bool operator>(iterator other) const { return i > other.i; }
-        inline constexpr bool operator>=(iterator other) const { return i >= other.i; }
-        inline constexpr bool operator==(pointer p) const { return i == p; }
-        inline constexpr bool operator!=(pointer p) const { return i != p; }
-        inline iterator &operator++() { ++i; return *this; }
-        inline iterator operator++(int) { T *n = i; ++i; return n; }
-        inline iterator &operator--() { i--; return *this; }
-        inline iterator operator--(int) { T *n = i; i--; return n; }
-        inline iterator &operator+=(qsizetype j) { i+=j; return *this; }
-        inline iterator &operator-=(qsizetype j) { i-=j; return *this; }
-        inline iterator operator+(qsizetype j) const { return iterator(i+j); }
-        inline iterator operator-(qsizetype j) const { return iterator(i-j); }
-        friend inline iterator operator+(qsizetype j, iterator k) { return k + j; }
-        inline qsizetype operator-(iterator j) const { return i - j.i; }
-        inline operator T*() const { return i; }
-    };
-
-    class const_iterator {
-        const T *i = nullptr;
-    public:
-        typedef std::random_access_iterator_tag  iterator_category;
-        typedef qsizetype difference_type;
-        typedef T value_type;
-        typedef const T *pointer;
-        typedef const T &reference;
-
-        inline constexpr const_iterator() = default;
-        inline const_iterator(const T *n) : i(n) {}
-        inline constexpr const_iterator(iterator o): i(o) {}
-        inline const T &operator*() const { return *i; }
-        inline const T *operator->() const { return i; }
-        inline const T &operator[](qsizetype j) const { return *(i + j); }
-        inline constexpr bool operator==(const_iterator o) const { return i == o.i; }
-        inline constexpr bool operator!=(const_iterator o) const { return i != o.i; }
-        inline constexpr bool operator<(const_iterator other) const { return i < other.i; }
-        inline constexpr bool operator<=(const_iterator other) const { return i <= other.i; }
-        inline constexpr bool operator>(const_iterator other) const { return i > other.i; }
-        inline constexpr bool operator>=(const_iterator other) const { return i >= other.i; }
-        inline constexpr bool operator==(iterator o) const { return i == const_iterator(o).i; }
-        inline constexpr bool operator!=(iterator o) const { return i != const_iterator(o).i; }
-        inline constexpr bool operator==(pointer p) const { return i == p; }
-        inline constexpr bool operator!=(pointer p) const { return i != p; }
-        inline const_iterator &operator++() { ++i; return *this; }
-        inline const_iterator operator++(int) { const T *n = i; ++i; return n; }
-        inline const_iterator &operator--() { i--; return *this; }
-        inline const_iterator operator--(int) { const T *n = i; i--; return n; }
-        inline const_iterator &operator+=(qsizetype j) { i+=j; return *this; }
-        inline const_iterator &operator-=(qsizetype j) { i-=j; return *this; }
-        inline const_iterator operator+(qsizetype j) const { return const_iterator(i+j); }
-        inline const_iterator operator-(qsizetype j) const { return const_iterator(i-j); }
-        friend inline const_iterator operator+(qsizetype j, const_iterator k) { return k + j; }
-        inline qsizetype operator-(const_iterator j) const { return i - j.i; }
-        inline operator const T*() const { return i; }
-    };
-
     struct AlignmentDummy { QArrayData header; T data; };
 
     [[nodiscard]] static QPair<QTypedArrayData *, T *> allocate(qsizetype capacity, AllocationOption option = QArrayData::KeepSize)
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h
index b157e2d7339..c1ae93dc104 100644
--- a/src/corelib/tools/qarraydataops.h
+++ b/src/corelib/tools/qarraydataops.h
@@ -635,7 +635,7 @@ public:
     {
         Q_ASSERT(this->isMutable());
         Q_ASSERT(this->size);
-        (--this->end())->~T();
+        (this->end() - 1)->~T();
         --this->size;
     }
 
@@ -883,8 +883,6 @@ struct QCommonArrayOps : QArrayOpsSelector<T>::Type
     using Data = QTypedArrayData<T>;
     using DataPointer = QArrayDataPointer<T>;
     using parameter_type = typename Base::parameter_type;
-    using iterator = typename Base::iterator;
-    using const_iterator = typename Base::const_iterator;
 
 protected:
     using Self = QCommonArrayOps<T>;
diff --git a/src/corelib/tools/qarraydatapointer.h b/src/corelib/tools/qarraydatapointer.h
index 763a5f79270..aa94819b351 100644
--- a/src/corelib/tools/qarraydatapointer.h
+++ b/src/corelib/tools/qarraydatapointer.h
@@ -53,8 +53,6 @@ private:
     typedef QArrayDataOps<T> DataOps;
 
 public:
-    typedef typename Data::iterator iterator;
-    typedef typename Data::const_iterator const_iterator;
     enum {
         pass_parameter_by_value =
                 std::is_arithmetic<T>::value || std::is_pointer<T>::value || std::is_enum<T>::value
@@ -142,12 +140,12 @@ public:
     T *data() noexcept { return ptr; }
     const T *data() const noexcept { return ptr; }
 
-    iterator begin(iterator = iterator()) noexcept { return data(); }
-    iterator end(iterator = iterator()) noexcept { return data() + size; }
-    const_iterator begin(const_iterator = const_iterator()) const noexcept { return data(); }
-    const_iterator end(const_iterator = const_iterator()) const noexcept { return data() + size; }
-    const_iterator constBegin(const_iterator = const_iterator()) const noexcept { return data(); }
-    const_iterator constEnd(const_iterator = const_iterator()) const noexcept { return data() + size; }
+    T *begin() noexcept { return data(); }
+    T *end() noexcept { return data() + size; }
+    const T *begin() const noexcept { return data(); }
+    const T *end() const noexcept { return data() + size; }
+    const T *constBegin() const noexcept { return data(); }
+    const T *constEnd() const noexcept { return data() + size; }
 
     void swap(QArrayDataPointer &other) noexcept
     {
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index 85d3b30432a..517ba103265 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -121,17 +121,6 @@ public:
     using size_type = qsizetype;
     using difference_type = qptrdiff;
 #ifndef Q_QDOC
-    using iterator = typename Data::iterator;
-    using const_iterator = typename Data::const_iterator;
-#else  // simplified aliases for QDoc
-    using iterator = T *;
-    using const_iterator = const T *;
-#endif
-    using Iterator = iterator;
-    using ConstIterator = const_iterator;
-    using reverse_iterator = std::reverse_iterator<iterator>;
-    using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-#ifndef Q_QDOC
     using parameter_type = typename DataPointer::parameter_type;
     using rvalue_ref = typename std::conditional<DataPointer::pass_parameter_by_value, DisableRValueRefs, T &&>::type;
 #else  // simplified aliases for QDoc
@@ -139,6 +128,83 @@ public:
     using rvalue_ref = T &&;
 #endif
 
+    class iterator {
+        T *i = nullptr;
+    public:
+        typedef std::random_access_iterator_tag  iterator_category;
+        typedef qsizetype difference_type;
+        typedef T value_type;
+        typedef T *pointer;
+        typedef T &reference;
+
+        inline constexpr iterator() = default;
+        inline iterator(T *n) : i(n) {}
+        inline T &operator*() const { return *i; }
+        inline T *operator->() const { return i; }
+        inline T &operator[](qsizetype j) const { return *(i + j); }
+        inline constexpr bool operator==(iterator o) const { return i == o.i; }
+        inline constexpr bool operator!=(iterator o) const { return i != o.i; }
+        inline constexpr bool operator<(iterator other) const { return i < other.i; }
+        inline constexpr bool operator<=(iterator other) const { return i <= other.i; }
+        inline constexpr bool operator>(iterator other) const { return i > other.i; }
+        inline constexpr bool operator>=(iterator other) const { return i >= other.i; }
+        inline constexpr bool operator==(pointer p) const { return i == p; }
+        inline constexpr bool operator!=(pointer p) const { return i != p; }
+        inline iterator &operator++() { ++i; return *this; }
+        inline iterator operator++(int) { T *n = i; ++i; return n; }
+        inline iterator &operator--() { i--; return *this; }
+        inline iterator operator--(int) { T *n = i; i--; return n; }
+        inline iterator &operator+=(qsizetype j) { i+=j; return *this; }
+        inline iterator &operator-=(qsizetype j) { i-=j; return *this; }
+        inline iterator operator+(qsizetype j) const { return iterator(i+j); }
+        inline iterator operator-(qsizetype j) const { return iterator(i-j); }
+        friend inline iterator operator+(qsizetype j, iterator k) { return k + j; }
+        inline qsizetype operator-(iterator j) const { return i - j.i; }
+        inline operator T*() const { return i; }
+    };
+
+    class const_iterator {
+        const T *i = nullptr;
+    public:
+        typedef std::random_access_iterator_tag  iterator_category;
+        typedef qsizetype difference_type;
+        typedef T value_type;
+        typedef const T *pointer;
+        typedef const T &reference;
+
+        inline constexpr const_iterator() = default;
+        inline const_iterator(const T *n) : i(n) {}
+        inline constexpr const_iterator(iterator o): i(o) {}
+        inline const T &operator*() const { return *i; }
+        inline const T *operator->() const { return i; }
+        inline const T &operator[](qsizetype j) const { return *(i + j); }
+        inline constexpr bool operator==(const_iterator o) const { return i == o.i; }
+        inline constexpr bool operator!=(const_iterator o) const { return i != o.i; }
+        inline constexpr bool operator<(const_iterator other) const { return i < other.i; }
+        inline constexpr bool operator<=(const_iterator other) const { return i <= other.i; }
+        inline constexpr bool operator>(const_iterator other) const { return i > other.i; }
+        inline constexpr bool operator>=(const_iterator other) const { return i >= other.i; }
+        inline constexpr bool operator==(iterator o) const { return i == const_iterator(o).i; }
+        inline constexpr bool operator!=(iterator o) const { return i != const_iterator(o).i; }
+        inline constexpr bool operator==(pointer p) const { return i == p; }
+        inline constexpr bool operator!=(pointer p) const { return i != p; }
+        inline const_iterator &operator++() { ++i; return *this; }
+        inline const_iterator operator++(int) { const T *n = i; ++i; return n; }
+        inline const_iterator &operator--() { i--; return *this; }
+        inline const_iterator operator--(int) { const T *n = i; i--; return n; }
+        inline const_iterator &operator+=(qsizetype j) { i+=j; return *this; }
+        inline const_iterator &operator-=(qsizetype j) { i-=j; return *this; }
+        inline const_iterator operator+(qsizetype j) const { return const_iterator(i+j); }
+        inline const_iterator operator-(qsizetype j) const { return const_iterator(i-j); }
+        friend inline const_iterator operator+(qsizetype j, const_iterator k) { return k + j; }
+        inline qsizetype operator-(const_iterator j) const { return i - j.i; }
+        inline operator const T*() const { return i; }
+    };
+    using Iterator = iterator;
+    using ConstIterator = const_iterator;
+    using reverse_iterator = std::reverse_iterator<iterator>;
+    using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+
 private:
     void resize_internal(qsizetype i);
     bool isValidIterator(const_iterator i) const
@@ -758,7 +824,7 @@ typename QList<T>::iterator QList<T>::erase(const_iterator abegin, const_iterato
     Q_ASSERT_X(isValidIterator(aend), "QList::erase", "The specified iterator argument 'aend' is invalid");
     Q_ASSERT(aend >= abegin);
 
-    qsizetype i = std::distance(d.constBegin(), abegin);
+    qsizetype i = std::distance(constBegin(), abegin);
     qsizetype n = std::distance(abegin, aend);
     remove(i, n);