diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-11-12 17:24:56 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-11-17 11:47:45 +0100 |
commit | a1f3be3e41f70b0dc39abe6ccdab9a493bd9b32f (patch) | |
tree | 9c7048844c39ef3984a1fd1d9aae4a6c58a966a0 /src/corelib/tools/qarraydataops.h | |
parent | 8c1ff780180dd80bd11f7f582c4621d75d473618 (diff) |
Clean up QList(iterator, iterator)
Fold the two overloads into one, and distinguish the cases using
if constexpr. Do not overload QArrayOps::copyAppend(), to make it
clear which one is being used.
Change-Id: If6a894841aacb84ba190fb2209246f5f61034b42
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/tools/qarraydataops.h')
-rw-r--r-- | src/corelib/tools/qarraydataops.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index 950b26d1a2..7b55406ac2 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -917,18 +917,14 @@ public: // using Base::assign; // using Base::compare; - using Base::copyAppend; - template<typename It> - void copyAppend(It b, It e, QtPrivate::IfIsForwardIterator<It> = true, - QtPrivate::IfIsNotConvertible<It, const T *> = true, - QtPrivate::IfIsNotConvertible<It, const T *> = true) + void appendIteratorRange(It b, It e, QtPrivate::IfIsForwardIterator<It> = true) { Q_ASSERT(this->isMutable() || b == e); Q_ASSERT(!this->isShared() || b == e); - const qsizetype distance = std::distance(b, e); Q_ASSERT(distance >= 0 && distance <= this->allocatedCapacity() - this->size); + Q_UNUSED(distance); T *iter = this->end(); for (; b != e; ++iter, ++b) { |