diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2023-08-11 02:52:54 +0300 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2023-08-19 16:28:45 +0300 |
| commit | 9812df02dbf463a820c881ef61e58d5fdece190c (patch) | |
| tree | 8502fdc2bffae410d583122081cbf7579d3f54a7 | |
| parent | 645dcc27d3567a2a39baa11e37bd3e1dfb25e8f7 (diff) | |
tst_QDir: port Q_FOREACH with QList::removeIf
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>
| -rw-r--r-- | tests/auto/corelib/io/qdir/tst_qdir.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp index ff3db64934..dab8f53b4f 100644 --- a/tests/auto/corelib/io/qdir/tst_qdir.cpp +++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp @@ -717,18 +717,13 @@ void tst_QDir::compare() QVERIFY(QDir("../") == QDir(QDir::currentPath() + "/..")); } -static QStringList filterLinks(const QStringList &list) +static QStringList filterLinks(QStringList &&list) { -#ifndef Q_NO_SYMLINKS - return list; -#else - QStringList result; - foreach (QString str, list) { - if (!str.endsWith(QLatin1String(".lnk"))) - result.append(str); - } - return result; +#ifdef Q_NO_SYMLINKS + auto isDotLnk = [](const auto &s) { return s.endsWith(".lnk"_L1); }; + list.removeIf(isDotLnk); #endif + return std::move(list); } void tst_QDir::entryList_data() |