diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-11-02 10:18:59 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2020-11-04 10:22:16 +0000 |
| commit | 1282c05cdcc935a5eb1be150b8fd88f7771e81de (patch) | |
| tree | 584ba75a2dcd63b77d3183e7229e634325e57d2e /src/corelib/text | |
| parent | edd1e931d1f0a1c5f9b2c1869d34db577307605d (diff) | |
Rename AllocationPosition enum and its members
Use GrowsAt* and GrowthPosition as that is clearer.
Change-Id: I3c173797dec3620f508156efc0c51b4d2cd3e142
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qbytearray.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/text/qstring.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index d729667ff7..f4ade684a0 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -1730,7 +1730,7 @@ void QByteArray::reallocGrowData(qsizetype n) n = 1; if (d->needsDetach()) { - DataPointer dd(DataPointer::allocateGrow(d, n, QArrayData::AllocateAtEnd)); + DataPointer dd(DataPointer::allocateGrow(d, n, QArrayData::GrowsAtEnd)); dd->copyAppend(d.data(), d.data() + d.size); dd.data()[dd.size] = 0; d = dd; @@ -1934,7 +1934,7 @@ QByteArray &QByteArray::insert(qsizetype i, QByteArrayView data) // the old memory: DataPointer detached{}; // construction is free if (d->needsDetach() || i + size - d->size > d.freeSpaceAtEnd()) { - detached = DataPointer::allocateGrow(d, i + size - d->size, Data::AllocateAtEnd); + detached = DataPointer::allocateGrow(d, i + size - d->size, Data::GrowsAtEnd); detached->copyAppend(d.constBegin(), d.constEnd()); d.swap(detached); } @@ -1993,7 +1993,7 @@ QByteArray &QByteArray::insert(qsizetype i, qsizetype count, char ch) if (i >= d->size) { // handle this specially, as QArrayDataOps::insert() doesn't handle out of bounds positions if (d->needsDetach() || i + count - d->size > d.freeSpaceAtEnd()) { - DataPointer detached(DataPointer::allocateGrow(d, i + count - d->size, Data::AllocateAtEnd)); + DataPointer detached(DataPointer::allocateGrow(d, i + count - d->size, Data::GrowsAtEnd)); detached->copyAppend(d.constBegin(), d.constEnd()); d.swap(detached); } diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 6e7809d868..1f32c4db7d 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -2526,7 +2526,7 @@ void QString::reallocGrowData(qsizetype n) n = 1; if (d->needsDetach()) { - DataPointer dd(DataPointer::allocateGrow(d, n, QArrayData::AllocateAtEnd)); + DataPointer dd(DataPointer::allocateGrow(d, n, QArrayData::GrowsAtEnd)); dd->copyAppend(d.data(), d.data() + d.size); dd.data()[dd.size] = 0; d = dd; @@ -2737,7 +2737,7 @@ QString& QString::insert(qsizetype i, const QChar *unicode, qsizetype size) // the old memory: DataPointer detached{}; // construction is free if (d->needsDetach() || i + size - d->size > d.freeSpaceAtEnd()) { - detached = DataPointer::allocateGrow(d, i + size - d->size, Data::AllocateAtEnd); + detached = DataPointer::allocateGrow(d, i + size - d->size, Data::GrowsAtEnd); detached->copyAppend(d.constBegin(), d.constEnd()); d.swap(detached); } |