From 1fc83d2a568dea3233212b351d6e9ffbc05c75e9 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 21 Jan 2022 12:22:54 +0100
Subject: Utils: Wrap various file system iteration flags and filters

... into a single class.

This makes passing them around as a whole easier, and opens a path
to have "generic" filters in form of a lambda or such.

Change-Id: Ibf644b2fedcf0f1a35258030710afff8f5873f88
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/android/androidconfigurations.cpp           | 3 +--
 src/plugins/android/androidmanager.cpp                  | 2 +-
 src/plugins/android/androidmanifesteditoriconwidget.cpp | 2 +-
 src/plugins/android/androidsdkdownloader.cpp            | 4 +---
 src/plugins/android/javalanguageserver.cpp              | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/plugins/android')

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index bf86c19ed8..ca8e29eb38 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -382,8 +382,7 @@ QVector<int> AndroidConfig::availableNdkPlatforms(const QtVersion *qtVersion) co
                         .toInt());
                 return true;
             },
-            {"android-*"},
-            QDir::Dirs);
+            {{"android-*"}, QDir::Dirs});
 
     Utils::sort(availableNdkPlatforms, std::greater<>());
     return availableNdkPlatforms;
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index a256bf43c7..5a4d2c2fe5 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -423,7 +423,7 @@ QString AndroidManager::apkDevicePreferredAbi(const Target *target)
     QStringList apkAbis;
     const FilePaths libsPaths = libsPath.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot);
     for (const FilePath &abiDir : libsPaths) {
-        if (!abiDir.dirEntries(QStringList("*.so"), QDir::Files | QDir::NoDotAndDotDot).isEmpty())
+        if (!abiDir.dirEntries({{"*.so"}, QDir::Files | QDir::NoDotAndDotDot}).isEmpty())
             apkAbis << abiDir.fileName();
     }
     return preferredAbi(apkAbis, target);
diff --git a/src/plugins/android/androidmanifesteditoriconwidget.cpp b/src/plugins/android/androidmanifesteditoriconwidget.cpp
index 1202c8ebc1..742c1fd631 100644
--- a/src/plugins/android/androidmanifesteditoriconwidget.cpp
+++ b/src/plugins/android/androidmanifesteditoriconwidget.cpp
@@ -256,7 +256,7 @@ static QImage scaleWithoutStretching(const QImage& original, const QSize& target
 
 static bool similarFilesExist(const FilePath &path)
 {
-    const FilePaths entries = path.parentDir().dirEntries({path.completeBaseName() + ".*"}, {});
+    const FilePaths entries = path.parentDir().dirEntries({{path.completeBaseName() + ".*"}});
     return !entries.empty();
 }
 
diff --git a/src/plugins/android/androidsdkdownloader.cpp b/src/plugins/android/androidsdkdownloader.cpp
index 59adbe50bd..28837ca8d4 100644
--- a/src/plugins/android/androidsdkdownloader.cpp
+++ b/src/plugins/android/androidsdkdownloader.cpp
@@ -73,9 +73,7 @@ static void setSdkFilesExecPermission( const FilePath &sdkExtractPath)
             }
             return true;
         },
-        {"*"},
-        QDir::Files,
-        QDirIterator::Subdirectories);
+        {{"*"}, QDir::Files, QDirIterator::Subdirectories});
 }
 
 void AndroidSdkDownloader::downloadAndExtractSdk(const FilePath &jdkPath, const FilePath &sdkExtractPath)
diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp
index 390a7296bf..4c06b296eb 100644
--- a/src/plugins/android/javalanguageserver.cpp
+++ b/src/plugins/android/javalanguageserver.cpp
@@ -322,7 +322,7 @@ void JLSClient::updateProjectFiles()
             const FilePath androidJar = sdkLocation / QString("platforms/%2/android.jar")
                                            .arg(targetSDK);
             FilePaths libs = {androidJar};
-            libs << packageSourceDir.pathAppended("libs").dirEntries({"*.jar"}, QDir::Files);
+            libs << packageSourceDir.pathAppended("libs").dirEntries({{"*.jar"}, QDir::Files});
             generateProjectFile(projectDir, qtSrc, project()->displayName());
             generateClassPathFile(projectDir, sourceDir, libs);
         }
-- 
cgit v1.2.1