QVarLengthArray: More Self-Encapsulate Field

Two more instances where we can use public API instead of accessing the data members directly. Amends 9d79e5f. Task-number: QTBUG-84785 Change-Id: I2037339383836b0d292b3362fe1d6b056638e81a Reviewed-by: Fabian Kosmale <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
qt · Dec 1, 2021 · 147093e · 147093e
1 parent e977b55
commit 147093e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h
@@ -140,7 +140,7 @@ class QVarLengthArray
             ptr = std::exchange(other.ptr, otherInlineStorage);
         } else {
             // inline storage: move into our storage (doesn't matter whether inline or external)
-            QtPrivate::q_uninitialized_relocate_n(other.ptr, other.s, data());
+            QtPrivate::q_uninitialized_relocate_n(other.data(), other.size(), data());
         }
         s = std::exchange(other.s, 0);
         return *this;
@@ -550,8 +550,10 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::reallocate(qsizetype asi
 
     if (QTypeInfo<T>::isComplex) {
         // call default constructor for new objects (which can throw)
-        while (s < asize)
-            new (ptr+(s++)) T;
+        while (size() < asize) {
+            new (data() + size()) T;
+            ++s;
+        }
     } else {
         s = asize;
     }