diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-07-01 20:07:26 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-04 12:31:23 +0200 |
| commit | 1289bd6045818249915028fb345ec29c4ead52e5 (patch) | |
| tree | b249178edd73dbb0326bb17e774d4fc3b75d4b7f /tests | |
| parent | d425848d0c09c49a734d1832e3a9f8e6fa12541b (diff) | |
Eradicate Java-style iterators and mark the module free of them
Java-style iterators are scheduled to be deprecated, or at the very
least banned from use in Qt's own implementation.
Change-Id: I6a1aeceb22dfa13c4ed7443296455b60abed7d67
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp b/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp index 341a49bf09..16b8fe578d 100644 --- a/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp +++ b/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp @@ -47,18 +47,21 @@ class tst_qqmlextensionplugin : public QObject { Q_OBJECT - bool isDuplicate(QString file, const QList<QString> & files) { -#ifndef DEBUG_SUFFIX - Q_UNUSED(file) - Q_UNUSED(files) - return false; -#else + static QStringList removeDuplicates(QStringList files) { +#ifdef DEBUG_SUFFIX + const auto isDuplicate = [files] (QString file) { # ifdef QT_DEBUG - return !file.endsWith(DEBUG_SUFFIX) && files.contains(file.replace(SUFFIX, DEBUG_SUFFIX)); + return !file.endsWith(DEBUG_SUFFIX) && files.contains(file.replace(SUFFIX, DEBUG_SUFFIX)); # else - return file.endsWith(DEBUG_SUFFIX) && files.contains(file.replace(DEBUG_SUFFIX, SUFFIX)); + return file.endsWith(DEBUG_SUFFIX) && files.contains(file.replace(DEBUG_SUFFIX, SUFFIX)); # endif + }; + + files.erase(std::remove_if(files.begin(), files.end(), isDuplicate), + files.end()); + #endif + return files; } public: @@ -84,12 +87,7 @@ void tst_qqmlextensionplugin::iidCheck_data() } } - for (QMutableListIterator<QString> it(files); it.hasNext(); ) { - QString file = it.next(); - if (isDuplicate(file, files)) { - it.remove(); - } - } + files = removeDuplicates(std::move(files)); QTest::addColumn<QString>("filePath"); foreach (const QString &file, files) { |