whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QByteArrayMatcher users: use the new QByteArrayView overloads 

The new overloads mean that when passing QByteArrayView or
QLatin1String objects, we don't expand them into .data() and
.size() anymore.

Pick-to: 6.3
Change-Id: I0c898e0463d0bf81ce1f7d57e10e64f23bd84587
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
bb10
Marc Mutz 2022-01-21 14:32:10 +01:00
parent a585ce7056
commit f091f371c4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/text/qbytearray.cpp
View File

@ -2625,8 +2625,8 @@ qsizetype QtPrivate::count(QByteArrayView haystack, QByteArrayView needle) noexc
qsizetype num = 0;
qsizetype i = -1;
if (haystack.size() > 500 && needle.size() > 5) {
QByteArrayMatcher matcher(needle.data(), needle.size());
while ((i = matcher.indexIn(haystack.data(), haystack.size(), i + 1)) != -1)
QByteArrayMatcher matcher(needle);
while ((i = matcher.indexIn(haystack, i + 1)) != -1)
++num;
} else {
while ((i = haystack.indexOf(needle, i + 1)) != -1)

4
src/corelib/text/qstring.cpp
View File

@ -10526,8 +10526,8 @@ qsizetype QtPrivate::findString(QLatin1String haystack, qsizetype from, QLatin1S
return from;
if (cs == Qt::CaseSensitive) {
const QByteArrayMatcher matcher(needle.data(), needle.size());
return matcher.indexIn(haystack.data(), haystack.size(), from);
const QByteArrayMatcher matcher(needle);
return matcher.indexIn(haystack, from);
}
// If the needle is sufficiently small we simply iteratively search through