1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QString: proper compare of iterators

Browse Source 
Canonical way is compare result of std::find_if against end by != operator, not <

Change-Id: Ifffbaf11416ea0738a1ccbb2f2f8482193390070
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Anton Kudryavtsev 2023-10-04 18:28:23 +03:00
parent 3a49d7d4e5
commit c24572d2a4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9780,7 +9780,7 @@ qsizetype QtPrivate::findString(QLatin1StringView haystack, qsizetype from, QLat
const auto end = haystack.end() - needle.size() + 1;
auto ciMatch = CaseInsensitiveL1::matcher(needle[0].toLatin1());
const qsizetype nlen1 = needle.size() - 1;
for (auto it = std::find_if(begin + from, end, ciMatch); it < end;
for (auto it = std::find_if(begin + from, end, ciMatch); it != end;
it = std::find_if(it + 1, end, ciMatch)) {
// In this comparison we skip the first character because we know it's a match
if (!nlen1 || QLatin1StringView(it + 1, nlen1).compare(needle.sliced(1), cs) == 0)