From 20883c9bcc7882b79db438ed0959530f82c8ee0a Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 4 Nov 2020 15:29:17 +0100 Subject: Smaller code cleanups in QList MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some cosmetics, but also some optimizations where we avoid a temporary copy, or calling detach() twice. Change-Id: I26803fdecf943ed9fab9baf58124091c7cebe1f3 Reviewed-by: Andrei Golubev Reviewed-by: Mårten Nordheim Reviewed-by: Thiago Macieira --- src/corelib/tools/qlist.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/corelib/tools/qlist.h') diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index f80553d976..85c8ee76bf 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -385,8 +385,8 @@ public: void replace(qsizetype i, parameter_type t) { Q_ASSERT_X(i >= 0 && i < d->size, "QList::replace", "index out of range"); - const T copy(t); - data()[i] = copy; + auto oldData = d.detach(); + d.data()[i] = t; } void replace(qsizetype i, rvalue_ref t) { @@ -395,16 +395,16 @@ public: Q_UNUSED(t); } else { Q_ASSERT_X(i >= 0 && i < d->size, "QList::replace", "index out of range"); - const T copy(std::move(t)); - data()[i] = std::move(copy); + auto oldData = d.detach(); + d.data()[i] = std::move(t); } } void remove(qsizetype i, qsizetype n = 1); void removeFirst(); void removeLast(); - value_type takeFirst() { Q_ASSERT(!isEmpty()); value_type v = std::move(first()); remove(0); return v; } - value_type takeLast() { Q_ASSERT(!isEmpty()); value_type v = std::move(last()); remove(size() - 1); return v; } + value_type takeFirst() { Q_ASSERT(!isEmpty()); value_type v = std::move(first()); d->eraseFirst(); return v; } + value_type takeLast() { Q_ASSERT(!isEmpty()); value_type v = std::move(last()); d->eraseLast(); return v; } QList &fill(parameter_type t, qsizetype size = -1); @@ -427,7 +427,6 @@ public: return qsizetype(std::count(&*cbegin(), &*cend(), t)); } - // QList compatibility void removeAt(qsizetype i) { remove(i); } template qsizetype removeAll(const AT &t) @@ -447,7 +446,7 @@ public: const AT &tCopy = CopyProxy(t); const iterator e = end(), it = std::remove(begin() + index, e, tCopy); const qsizetype result = std::distance(it, e); - erase(it, e); + d->erase(it, e); return result; } template @@ -606,9 +605,9 @@ inline void QList::resize_internal(qsizetype newSize) if (d->needsDetach() || newSize > capacity() - d.freeSpaceAtBegin()) { // must allocate memory DataPointer detached(Data::allocate(d->detachCapacity(newSize))); - if (size() && newSize) { - detached->copyAppend(constBegin(), constBegin() + qMin(newSize, size())); - } + qsizetype toCopy = qMin(size(), newSize); + if (toCopy) + detached->copyAppend(constBegin(), constBegin() + toCopy); d.swap(detached); } -- cgit v1.2.3