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

Expand if condition for readability

Browse Source 
Change-Id: I5057c236457587ad03b55019cb340cf59d9ecdb5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
João Abecasis 2012-01-10 16:03:30 +01:00 committed by Qt by Nokia
parent 5a92bc9760
commit 2c52e9a5c1
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/auto/corelib/tools/qarraydata/simplevector.h
View File

@ -139,15 +139,22 @@ public:
void reserve(size_t n) void reserve(size_t n)
{ {
if (n > capacity() if (n == 0)
|| (n return;
&& !d->capacityReserved
&& (d->ref.isShared() || (d->capacityReserved = 1, false)))) { if (n <= capacity()) {
SimpleVector detached(Data::allocate(n, if (d->capacityReserved)
d->detachFlags() | Data::CapacityReserved)); return;
detached.d->copyAppend(constBegin(), constEnd()); if (!d->ref.isShared()) {
detached.swap(*this); d->capacityReserved = 1;
return;
}
} }
SimpleVector detached(Data::allocate(n,
d->detachFlags() | Data::CapacityReserved));
detached.d->copyAppend(constBegin(), constEnd());
detached.swap(*this);
} }
void prepend(const_iterator first, const_iterator last) void prepend(const_iterator first, const_iterator last)