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

Remove explicit checks for shared_null/empty

Browse Source 
This eases porting to QArrayData and retains semantics. In append() and
prepend() a conditional was generalized so that no work is done if there
is nothing to add.

Done-with: Jędrzej Nowacki
Change-Id: Ib9e7bb572801b2434fa040cde2bf66dacf595f22
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
This commit is contained in:
João Abecasis 2012-04-06 09:24:37 +02:00 committed by Qt by Nokia
parent 2ac4c463af
commit 78b780b9a1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/tools/qbytearray.cpp
View File

@ -1412,7 +1412,7 @@ void QByteArray::resize(int size)
if (!d->ref.deref()) if (!d->ref.deref())
free(d); free(d);
d = x; d = x;
} else if (d == &shared_null.ba || d == &shared_empty.ba) { } else if (d->size == 0 && d->ref.isStatic()) {
// //
// Optimize the idiom: // Optimize the idiom:
// QByteArray a; // QByteArray a;
@ -1536,9 +1536,9 @@ QByteArray QByteArray::nulTerminated() const
QByteArray &QByteArray::prepend(const QByteArray &ba) QByteArray &QByteArray::prepend(const QByteArray &ba)
{ {
if ((d == &shared_null.ba || d == &shared_empty.ba) && !IS_RAW_DATA(ba.d)) { if (d->size == 0 && d->ref.isStatic() && !IS_RAW_DATA(ba.d)) {
*this = ba; *this = ba;
} else if (ba.d != &shared_null.ba) { } else if (ba.d->size != 0) {
QByteArray tmp = *this; QByteArray tmp = *this;
*this = ba; *this = ba;
append(tmp); append(tmp);
@ -1620,9 +1620,9 @@ QByteArray &QByteArray::prepend(char ch)
QByteArray &QByteArray::append(const QByteArray &ba) QByteArray &QByteArray::append(const QByteArray &ba)
{ {
if ((d == &shared_null.ba || d == &shared_empty.ba) && !IS_RAW_DATA(ba.d)) { if (d->size == 0 && d->ref.isStatic() && !IS_RAW_DATA(ba.d)) {
*this = ba; *this = ba;
} else if (ba.d != &shared_null.ba) { } else if (ba.d->size != 0) {
if (d->ref.isShared() || uint(d->size + ba.d->size) + 1u > d->alloc) if (d->ref.isShared() || uint(d->size + ba.d->size) + 1u > d->alloc)
reallocData(uint(d->size + ba.d->size) + 1u, true); reallocData(uint(d->size + ba.d->size) + 1u, true);
memcpy(d->data() + d->size, ba.d->data(), ba.d->size); memcpy(d->data() + d->size, ba.d->data(), ba.d->size);
@ -2663,7 +2663,7 @@ QByteArray QByteArray::right(int len) const
QByteArray QByteArray::mid(int pos, int len) const QByteArray QByteArray::mid(int pos, int len) const
{ {
if (d == &shared_null.ba || d == &shared_empty.ba || pos > d->size) if ((d->size == 0 && d->ref.isStatic()) || pos > d->size)
return QByteArray(); return QByteArray();
if (len < 0) if (len < 0)
len = d->size - pos; len = d->size - pos;