From e14d0ff8f213e53e5838bb550b5ee148837736cc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 13 Dec 2021 07:08:37 +0100 Subject: QRingBuffer: simplify QRingChunk::detach() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just use the QByteArray(ptr, n) ctor instead of the (n, Qt::Uninitialized) one + memcpy() + std::move(). Pick-to: 6.3 Change-Id: I127219c21556e683d15136f7e6f7b3576b7b2444 Reviewed-by: Mårten Nordheim --- src/corelib/tools/qringbuffer.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/corelib/tools/qringbuffer.cpp') diff --git a/src/corelib/tools/qringbuffer.cpp b/src/corelib/tools/qringbuffer.cpp index d46dcdffdff..f59dcc39c4d 100644 --- a/src/corelib/tools/qringbuffer.cpp +++ b/src/corelib/tools/qringbuffer.cpp @@ -57,9 +57,7 @@ void QRingChunk::detach() Q_ASSERT(isShared()); const qsizetype chunkSize = size(); - QByteArray x(chunkSize, Qt::Uninitialized); - ::memcpy(x.data(), chunk.constData() + headOffset, chunkSize); - chunk = std::move(x); + chunk = QByteArray(std::as_const(*this).data(), chunkSize); headOffset = 0; tailOffset = chunkSize; } -- cgit v1.2.3