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

tst_QDir: port Q_FOREACH with QList::removeIf

Browse Source 
filterLinks() is always called on a temporary QStringList, so make it
take by && (which proves it's always called on a temporary), and modify
the parameter directly.

Task-number: QTBUG-115839
Change-Id: I40611f40cc0096a58d5c9d8e68c5df06d43152e5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Ahmad Samir 2023-08-11 02:52:54 +03:00
parent 645dcc27d3
commit 9812df02db
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/corelib/io/qdir/tst_qdir.cpp
View File

@ -717,18 +717,13 @@ void tst_QDir::compare()
QVERIFY(QDir("../") == QDir(QDir::currentPath() + "/..")); QVERIFY(QDir("../") == QDir(QDir::currentPath() + "/.."));
} }
static QStringList filterLinks(const QStringList &list) static QStringList filterLinks(QStringList &&list)
{ {
#ifndef Q_NO_SYMLINKS #ifdef Q_NO_SYMLINKS
return list; auto isDotLnk = [](const auto &s) { return s.endsWith(".lnk"_L1); };
#else list.removeIf(isDotLnk);
QStringList result;
foreach (QString str, list) {
if (!str.endsWith(QLatin1String(".lnk")))
result.append(str);
}
return result;
#endif #endif
return std::move(list);
} }
void tst_QDir::entryList_data() void tst_QDir::entryList_data()