From 03e184e48cb73dcec60f00d4db1262bbe3d3b944 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 30 Jan 2024 11:21:57 +0100 Subject: [PATCH] QBitArray: simplify resize() Use the new (in Qt 6.4) QByteArray::resize(n, ch) to avoid the manual memset() unpleasentness. Change-Id: I786988125f52b1bc1f733c30ab2b95eda569481d Reviewed-by: Thiago Macieira Reviewed-by: Qt CI Bot (cherry picked from commit efc579145ef33655a4aaad5a41124cb103bfbe7a) Reviewed-by: Marc Mutz Reviewed-by: Allan Sandfeld Jensen --- src/corelib/tools/qbitarray.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp index 8205e2f238f..4390d52cbdc 100644 --- a/src/corelib/tools/qbitarray.cpp +++ b/src/corelib/tools/qbitarray.cpp @@ -206,11 +206,7 @@ void QBitArray::resize(qsizetype size) if (!size) { d.resize(0); } else { - qsizetype s = d.size(); - d.resize(allocation_size(size)); - uchar *c = reinterpret_cast(d.data()); - if (d.size() > s) - memset(c + s, 0, d.size() - s); + d.resize(allocation_size(size), 0x00); adjust_head_and_tail(d.data(), d.size(), size); } }