diff options
| author | Andrei Golubev <andrei.golubev@qt.io> | 2021-04-22 16:59:27 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-27 12:12:34 +0000 |
| commit | 4b518d878aadb132256e8cea48fd6249667f59bb (patch) | |
| tree | 964ae4909ad7b54c2d31849a2bee8906614bb81b /src/corelib/text/qstring.cpp | |
| parent | 96a1bfd06ad921f67626b3ead1ff1678919635df (diff) | |
Add q_points_into_range to container utilities
We already used it in QString and QBA. And implicitly in QADP (see
parent commit). Might as well move to a common location and reuse
Change-Id: I694f0f1dbd109f17c134f64b3f3dc28d19556c88
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 10b46e7f0faecc42a94cc2e25ad3edd08ae28083)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/text/qstring.cpp')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 5a340530a93..77ffc495611 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -100,12 +100,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 char16_t QString::_empty = 0; /* @@ -2824,7 +2818,7 @@ QString& QString::insert(qsizetype i, const QChar *unicode, qsizetype size) return *this; } - if (!d->needsDetach() && points_into_range(s, d.data(), d.data() + d.size)) + if (!d->needsDetach() && QtPrivate::q_points_into_range(s, d.data(), d.data() + d.size)) return insert(i, QStringView{QVarLengthArray(s, s + size)}); d->insert(i, s, size); @@ -3118,7 +3112,7 @@ static void removeStringImpl(QString &s, const T &needle, Qt::CaseSensitivity cs QString &QString::remove(const QString &str, Qt::CaseSensitivity cs) { const auto s = str.d.data(); - if (points_into_range(s, d.data(), d.data() + d.size)) + if (QtPrivate::q_points_into_range(s, d.data(), d.data() + d.size)) removeStringImpl(*this, QStringView{QVarLengthArray(s, s + str.size())}, cs); else removeStringImpl(*this, qToStringViewIgnoringNull(str), cs); |