diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-01-21 18:06:24 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-01-23 09:48:28 +0100 |
commit | cce7e35253aa63191f0211b509784b1dc96d49e5 (patch) | |
tree | 6e8067597ec1e61248edf16b53a67254dfd7eca5 /src/corelib/text/qbytearraymatcher.cpp | |
parent | 3d3558dc8f0a1885f416b4650037364f4ef11bd4 (diff) |
Q(Static)ByteArrayMatcher: manage indexIn() overloads
Unlike QString and QStringView, QByteArrayView and QByteArray don't
overload well.
Solve the overload issue the usual way: by making the QByteArray one a
Q_WEAK_OVERLOAD. This is trivial for QStaticByteArrayMatcher, which
isn't exported, but require QT_REMOVED_SINCE magic for
QByteArrayMatcher, which is.
The additional const char* overload has shielded us from the worst
fall-out so far, it seems, but it makes for a truly horrible overload
set:
matcher.indexIn(str, 3);
Q: Is the 3 here the length of the haystack or the value of the from
parameter?
A: It depends on decltype(str)!
If the (const char*, qsizetype, qsizetype=0) overload is the better
match, then 3 limits the haystack's length.
If, otoh, the (QByteArray(View), qsizetype) overload is the better
match, then it's the value of the from parameter.
As if this wasn't bad enough, QByteArray implcitly converts to const
char* by default!
A follow-up patch will therefore deprecate the (ptr, size) overloads,
so we de-inline the QByteArrayView ones to avoid having to touch the
implementation once more.
Found during 6.3 API review.
Pick-to: 6.3
Change-Id: I9640e0bdd298d651511adebcc85f314db9221d34
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/text/qbytearraymatcher.cpp')
-rw-r--r-- | src/corelib/text/qbytearraymatcher.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/corelib/text/qbytearraymatcher.cpp b/src/corelib/text/qbytearraymatcher.cpp index ee4d8d265b..0d96355df2 100644 --- a/src/corelib/text/qbytearraymatcher.cpp +++ b/src/corelib/text/qbytearraymatcher.cpp @@ -206,21 +206,6 @@ void QByteArrayMatcher::setPattern(const QByteArray &pattern) } /*! - Searches the byte array \a ba, from byte position \a from (default - 0, i.e. from the first byte), for the byte array pattern() that - was set in the constructor or in the most recent call to - setPattern(). Returns the position where the pattern() matched in - \a ba, or -1 if no match was found. -*/ -qsizetype QByteArrayMatcher::indexIn(const QByteArray &ba, qsizetype from) const -{ - if (from < 0) - from = 0; - return bm_find(reinterpret_cast<const uchar *>(ba.constData()), ba.size(), from, - p.p, p.l, p.q_skiptable); -} - -/*! Searches the char string \a str, which has length \a len, from byte position \a from (default 0, i.e. from the first byte), for the byte array pattern() that was set in the constructor or in the @@ -246,6 +231,13 @@ qsizetype QByteArrayMatcher::indexIn(const char *str, qsizetype len, qsizetype f setPattern(). Returns the position where the pattern() matched in \a data, or -1 if no match was found. */ +qsizetype QByteArrayMatcher::indexIn(QByteArrayView data, qsizetype from) const +{ + if (from < 0) + from = 0; + return bm_find(reinterpret_cast<const uchar *>(data.data()), data.size(), from, + p.p, p.l, p.q_skiptable); +} /*! \fn QByteArray QByteArrayMatcher::pattern() const |