Fix signature of QArrayDataOps::erase()

Bring it in line with the other methods that also take a
pointer and a size.

Also use truncate() in removeAll() as that's more efficient
for the use case.

Change-Id: Ib1073b7c048ceb96fb6391b308ef8feb77896866
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h
index 1efa94ebd1..950b26d1a2 100644
--- a/src/corelib/tools/qarraydataops.h
+++ b/src/corelib/tools/qarraydataops.h
@@ -216,8 +216,9 @@ public:
         new (where) T(std::move(tmp));
     }
 
-    void erase(T *b, T *e)
+    void erase(T *b, qsizetype n)
     {
+        T *e = b + n;
         Q_ASSERT(this->isMutable());
         Q_ASSERT(b < e);
         Q_ASSERT(b >= this->begin() && b < this->end());
@@ -231,7 +232,7 @@ public:
             this->ptr = e;
         else if (e != this->end())
             ::memmove(static_cast<void *>(b), static_cast<void *>(e), (static_cast<T *>(this->end()) - e) * sizeof(T));
-        this->size -= (e - b);
+        this->size -= n;
     }
 
     void eraseFirst() noexcept
@@ -592,8 +593,9 @@ public:
         Inserter(this, pos).insertOne(i, std::move(tmp));
     }
 
-    void erase(T *b, T *e)
+    void erase(T *b, qsizetype n)
     {
+        T *e = b + n;
         Q_ASSERT(this->isMutable());
         Q_ASSERT(b < e);
         Q_ASSERT(b >= this->begin() && b < this->end());
@@ -616,7 +618,7 @@ public:
                 ++e;
             }
         }
-        this->size -= (e - b);
+        this->size -= n;
         std::destroy(b, e);
     }
 
@@ -818,8 +820,10 @@ public:
         Inserter(this, pos).insertOne(i, std::move(tmp));
     }
 
-    void erase(T *b, T *e)
+    void erase(T *b, qsizetype n)
     {
+        T *e = b + n;
+
         Q_ASSERT(this->isMutable());
         Q_ASSERT(b < e);
         Q_ASSERT(b >= this->begin() && b < this->end());
@@ -836,7 +840,7 @@ public:
         } else if (e != this->end()) {
             memmove(static_cast<void *>(b), static_cast<const void *>(e), (static_cast<const T *>(this->end()) - e)*sizeof(T));
         }
-        this->size -= (e - b);
+        this->size -= n;
     }
 
     void reallocate(qsizetype alloc, QArrayData::AllocationOption option)