diff options
Diffstat (limited to 'src/corelib/text/qbytearray.cpp')
-rw-r--r-- | src/corelib/text/qbytearray.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index a815037a73..6a7d8b2657 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -67,12 +67,6 @@ QT_BEGIN_NAMESPACE -template <typename T, typename Cmp = std::less<>> -static constexpr bool points_into_range(const T *p, const T *b, const T *e, Cmp less = {}) noexcept -{ - return !less(p, b) && less(p, e); -} - const char QByteArray::_empty = '\0'; // ASCII case system, used by QByteArray::to{Upper,Lower}() and qstr(n)icmp(): @@ -2030,7 +2024,7 @@ QByteArray &QByteArray::insert(qsizetype i, QByteArrayView data) return *this; } - if (!d->needsDetach() && points_into_range(str, d.data(), d.data() + d.size)) { + if (!d->needsDetach() && QtPrivate::q_points_into_range(str, d.data(), d.data() + d.size)) { QVarLengthArray a(str, str + size); return insert(i, a); } @@ -2169,7 +2163,7 @@ QByteArray &QByteArray::remove(qsizetype pos, qsizetype len) QByteArray &QByteArray::replace(qsizetype pos, qsizetype len, QByteArrayView after) { - if (points_into_range(after.data(), d.data(), d.data() + d.size)) { + if (QtPrivate::q_points_into_range(after.data(), d.data(), d.data() + d.size)) { QVarLengthArray copy(after.data(), after.data() + after.size()); return replace(pos, len, QByteArrayView{copy}); } @@ -2226,11 +2220,11 @@ QByteArray &QByteArray::replace(QByteArrayView before, QByteArrayView after) return *this; // protect against before or after being part of this - if (points_into_range(a, d.data(), d.data() + d.size)) { + if (QtPrivate::q_points_into_range(a, d.data(), d.data() + d.size)) { QVarLengthArray copy(a, a + asize); return replace(before, QByteArrayView{copy}); } - if (points_into_range(b, d.data(), d.data() + d.size)) { + if (QtPrivate::q_points_into_range(b, d.data(), d.data() + d.size)) { QVarLengthArray copy(b, b + bsize); return replace(QByteArrayView{copy}, after); } |