1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QRingBuffer: restrict QRingChunk::toByteArray() calls to rvalue *this

Browse Source 
It's only user, QRingBuffer::read(), calls it on an rvalue, so we
don't need the lvalue overload, and we can devil-may-care-like just
std::move(chunk) in the non-isShared() case.

Change-Id: I99c16862f5586125c6346ce5f969dc735de738b8
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2021-12-14 22:03:02 +01:00
parent b01c05ef9b
commit e381288146
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qringbuffer.cpp
View File

@ -62,7 +62,7 @@ void QRingChunk::detach()
tailOffset = chunkSize; tailOffset = chunkSize;
} }
QByteArray QRingChunk::toByteArray() QByteArray QRingChunk::toByteArray() &&
{ {
if (headOffset != 0 || tailOffset != chunk.size()) { if (headOffset != 0 || tailOffset != chunk.size()) {
if (isShared()) if (isShared())
@ -79,7 +79,7 @@ QByteArray QRingChunk::toByteArray()
chunk.resize(tailOffset); chunk.resize(tailOffset);
} }
return chunk; return std::move(chunk);
} }
/*! /*!

2
src/corelib/tools/qringbuffer_p.h
View File

@ -114,7 +114,7 @@ public:
return !chunk.isDetached(); return !chunk.isDetached();
} }
Q_CORE_EXPORT void detach(); Q_CORE_EXPORT void detach();
QByteArray toByteArray(); QByteArray toByteArray() &&;
// getters // getters
inline qsizetype head() const inline qsizetype head() const