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

QCborStreamReader: don't assume that clear() results in isNull()

Browse Source 
That QString and QByteArray::clear() shed all capacity() is a
historical artifact we will fix at some point. Don't add more code
that assumes a clear()ed string isNull().

Amends 8af346c1f66f813c3c8fe4d8b892ecfbe96eacfb.
Amends 1d9137e13f9eb3f183c967e9e911c5b260f93dc0.

Task-number: QTBUG-31283
Task-number: QTBUG-60745
Change-Id: Ib0d929325088d3e8e119fee3eafa964a783dc8e9
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
(cherry picked from commit 6c424dbcb0385a4b36835fc5103ca74c1044eccc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-02-27 14:49:42 +01:00 committed by Qt Cherry-pick Bot
parent 3e04bf609a
commit 21a4a2daf8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/serialization/qcborstreamreader.h
View File

@ -150,21 +150,21 @@ public:
{
QString dst;
if (!appendToString(dst))
dst.clear();
dst = QString{};
return dst;
}
QByteArray toUtf8String()
{
QByteArray dst;
if (!appendToUtf8String(dst))
dst.clear();
dst = QByteArray{};
return dst;
}
QByteArray toByteArray()
{
QByteArray dst;
if (!appendToByteArray(dst))
dst.clear();
dst = QByteArray{};
return dst;
}