From efc579145ef33655a4aaad5a41124cb103bfbe7a Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 30 Jan 2024 11:21:57 +0100 Subject: QBitArray: simplify resize() Use the new (in Qt 6.4) QByteArray::resize(n, ch) to avoid the manual memset() unpleasentness. Pick-to: 6.7 Change-Id: I786988125f52b1bc1f733c30ab2b95eda569481d Reviewed-by: Thiago Macieira Reviewed-by: Qt CI Bot --- src/corelib/tools/qbitarray.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/corelib/tools/qbitarray.cpp') diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp index 57e7f0ffe5..a6f2722cf8 100644 --- a/src/corelib/tools/qbitarray.cpp +++ b/src/corelib/tools/qbitarray.cpp @@ -208,11 +208,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); } } -- cgit v1.2.3