From 0d6ca27517523e960b132bd5e51d9b48bb9a93a3 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 30 Jan 2024 11:19:41 +0100 Subject: QBitArray: simplify (size, value) ctor Don't do the memset() manually just to save re-writing the single leading byte. Pass the initial values to the QByteArray constructor directly. Pick-to: 6.7 Change-Id: I67daf446bebb8c8c6b05d235746ee43604f42445 Reviewed-by: Thiago Macieira --- src/corelib/tools/qbitarray.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/corelib/tools/qbitarray.cpp') diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp index 20fb7f5304..57e7f0ffe5 100644 --- a/src/corelib/tools/qbitarray.cpp +++ b/src/corelib/tools/qbitarray.cpp @@ -135,14 +135,12 @@ static void adjust_head_and_tail(char *data, qsizetype storageSize, qsizetype lo initialized with \a value, which defaults to false (0). */ QBitArray::QBitArray(qsizetype size, bool value) - : d(allocation_size(size), Qt::Uninitialized) + : d(allocation_size(size), value ? 0xFF : 0x00) { Q_ASSERT_X(size >= 0, "QBitArray::QBitArray", "Size must be greater than or equal to 0."); if (size <= 0) return; - uchar *c = reinterpret_cast(d.data()); - memset(c + 1, value ? 0xff : 0, d.size() - 1); adjust_head_and_tail(d.data(), d.size(), size); } -- cgit v1.2.3