From d666e7a779a3d82b9d49af33557b46769a10f9ec Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Wed, 8 Dec 2021 13:31:42 +0100
Subject: [PATCH] QVLA: separate control from inline storage [7/N]:
 erase{,_if}()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement erase()/erase_if() using removeAll()/removeIf()

These functions are now on QVLABase, so we no longer instantiate a
different sequential_erase{,_if}() per Prealloc.

Task-number: QTBUG-84785
Change-Id: I339759bc02b0e3104f7d1273ce6d5e09b493610c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/tools/qvarlengtharray.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h
index d8eab35a56..085c06c550 100644
--- a/src/corelib/tools/qvarlengtharray.h
+++ b/src/corelib/tools/qvarlengtharray.h
@@ -924,13 +924,13 @@ size_t qHash(const QVarLengthArray<T, Prealloc> &key, size_t seed = 0)
 template <typename T, qsizetype Prealloc, typename AT>
 qsizetype erase(QVarLengthArray<T, Prealloc> &array, const AT &t)
 {
-    return QtPrivate::sequential_erase(array, t);
+    return array.removeAll(t);
 }
 
 template <typename T, qsizetype Prealloc, typename Predicate>
 qsizetype erase_if(QVarLengthArray<T, Prealloc> &array, Predicate pred)
 {
-    return QtPrivate::sequential_erase_if(array, pred);
+    return array.removeIf(pred);
 }
 
 QT_END_NAMESPACE