From 10b46e7f0faecc42a94cc2e25ad3edd08ae28083 Mon Sep 17 00:00:00 2001
From: Andrei Golubev <andrei.golubev@qt.io>
Date: Thu, 22 Apr 2021 16:59:27 +0200
Subject: 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

Pick-to: dev 6.0 6.1
Change-Id: I694f0f1dbd109f17c134f64b3f3dc28d19556c88
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/text/qbytearray.cpp          | 14 ++++----------
 src/corelib/text/qstring.cpp             | 10 ++--------
 src/corelib/tools/qcontainertools_impl.h | 13 +++++++++++++
 3 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'src/corelib')

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);
     }
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index 745b963260..a86ba03932 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);
diff --git a/src/corelib/tools/qcontainertools_impl.h b/src/corelib/tools/qcontainertools_impl.h
index 238e8a849b..465ea5c544 100644
--- a/src/corelib/tools/qcontainertools_impl.h
+++ b/src/corelib/tools/qcontainertools_impl.h
@@ -59,6 +59,19 @@ QT_BEGIN_NAMESPACE
 namespace QtPrivate
 {
 
+/*!
+  \internal
+
+  Returns whether \a p is within a range [b, e). In simplest form equivalent to:
+  b <= p < e.
+*/
+template<typename T, typename Cmp = std::less<>>
+static constexpr bool q_points_into_range(const T *p, const T *b, const T *e,
+                                          Cmp less = {}) noexcept
+{
+    return !less(p, b) && less(p, e);
+}
+
 template <typename T, typename N>
 void q_uninitialized_relocate_n(T* first, N n, T* out)
 {
-- 
cgit v1.2.3