AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make {QString,QByteArray}::squeeze() work without prior reserve()

Browse Source 
string-shortening operations never throw away capacity (unless
detaching), so it may very much make sense to squeeze a string whose
capacity was not explicitly reserved.

this does in fact restore the behavior prior to commit a3aa2fcf, which
changed it presumably only due to not considering the case above.

Change-Id: I0d7919a1724dd3ecc6cd4cbd7236eb52067f0a1c
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
This commit is contained in:
Oswald Buddenhagen 2020-09-11 11:11:45 +02:00 committed by Mårten Nordheim
parent 7ee9bfc158
commit b9290cb6e5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/text/qbytearray.h
View File

@ -532,7 +532,7 @@ inline void QByteArray::reserve(qsizetype asize)
inline void QByteArray::squeeze() inline void QByteArray::squeeze()
{ {
if ((d->flags() & Data::CapacityReserved) == 0) if (!d.isMutable())
return; return;
if (d->needsDetach() || size() < capacity()) { if (d->needsDetach() || size() < capacity()) {
reallocData(size(), d->detachFlags() & ~Data::CapacityReserved); reallocData(size(), d->detachFlags() & ~Data::CapacityReserved);

4
src/corelib/text/qstring.h
View File

@ -1166,9 +1166,9 @@ inline void QString::reserve(qsizetype asize)
inline void QString::squeeze() inline void QString::squeeze()
{ {
if ((d->flags() & Data::CapacityReserved) == 0) if (!d.isMutable())
return; return;
if (d->needsDetach() || d.size < capacity()) { if (d->needsDetach() || size() < capacity()) {
reallocData(d.size, d->detachFlags() & ~Data::CapacityReserved); reallocData(d.size, d->detachFlags() & ~Data::CapacityReserved);
} else { } else {
d->clearFlag(Data::CapacityReserved); d->clearFlag(Data::CapacityReserved);