diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 78c60a406c4..a7047d8d612 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -902,19 +902,19 @@ static bool findNewQmlLibraryInPath(const Utils::FilePath &path, return true; } -static FilePath modulePath(const ImportInfo &import, const QList &paths) +static FilePath modulePath(const ImportInfo &import, const FilePaths &paths) { if (!import.version().isValid()) return FilePath(); - const QList modPaths = modulePaths(import.name(), import.version().toString(), paths); + const FilePaths modPaths = modulePaths(import.name(), import.version().toString(), paths); return modPaths.value(0); // first is best match } static void findNewLibraryImports(const Document::Ptr &doc, const Snapshot &snapshot, ModelManagerInterface *modelManager, - QList *importedFiles, + FilePaths *importedFiles, QSet *scannedPaths, QSet *newLibraries) { @@ -923,7 +923,7 @@ static void findNewLibraryImports(const Document::Ptr &doc, importedFiles, scannedPaths, newLibraries, false); // scan dir and lib imports - const QList importPaths = modelManager->importPathsNames(); + const FilePaths importPaths = modelManager->importPathsNames(); const auto imports = doc->bind()->imports(); for (const ImportInfo &import : imports) { switch (import.type()) { diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index d1171c371ef..6056b0b28f3 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -1454,13 +1454,13 @@ Environment FilePath::deviceEnvironment() const return Environment::systemEnvironment(); } -QString FilePath::formatFilePaths(const QList &files, const QString &separator) +QString FilePath::formatFilePaths(const FilePaths &files, const QString &separator) { const QStringList nativeFiles = transform(files, &FilePath::toUserOutput); return nativeFiles.join(separator); } -void FilePath::removeDuplicates(QList &files) +void FilePath::removeDuplicates(FilePaths &files) { // FIXME: Improve. QStringList list = transform(files, &FilePath::toString); @@ -1468,7 +1468,7 @@ void FilePath::removeDuplicates(QList &files) files = transform(list, &FilePath::fromString); } -void FilePath::sort(QList &files) +void FilePath::sort(FilePaths &files) { // FIXME: Improve. QStringList list = transform(files, &FilePath::toString); diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h index f6479685af2..704fd217df0 100644 --- a/src/libs/utils/filepath.h +++ b/src/libs/utils/filepath.h @@ -62,6 +62,8 @@ public: const QDirIterator::IteratorFlags iteratorFlags = QDirIterator::NoIteratorFlags; }; +using FilePaths = QList; + class QTCREATOR_UTILS_EXPORT FilePath { public: @@ -132,9 +134,8 @@ public: qint64 fileSize() const; qint64 bytesAvailable() const; bool createDir() const; - QList dirEntries(const FileFilter &filter, - QDir::SortFlags sort = QDir::NoSort) const; - QList dirEntries(QDir::Filters filters) const; + FilePaths dirEntries(const FileFilter &filter, QDir::SortFlags sort = QDir::NoSort) const; + FilePaths dirEntries(QDir::Filters filters) const; QByteArray fileContents(qint64 maxSize = -1, qint64 offset = 0) const; bool writeFileContents(const QByteArray &data) const; @@ -163,18 +164,18 @@ public: [[nodiscard]] FilePath withExecutableSuffix() const; [[nodiscard]] FilePath relativeChildPath(const FilePath &parent) const; [[nodiscard]] FilePath relativePath(const FilePath &anchor) const; - [[nodiscard]] FilePath searchInDirectories(const QList &dirs) const; + [[nodiscard]] FilePath searchInDirectories(const FilePaths &dirs) const; [[nodiscard]] Environment deviceEnvironment() const; [[nodiscard]] FilePath onDevice(const FilePath &deviceTemplate) const; [[nodiscard]] FilePath withNewPath(const QString &newPath) const; void iterateDirectory(const std::function &callBack, const FileFilter &filter) const; - static void iterateDirectories(const QList &dirs, + static void iterateDirectories(const FilePaths &dirs, const std::function &callBack, const FileFilter &filter); enum PathAmending { AppendToPath, PrependToPath }; - [[nodiscard]] FilePath searchInPath(const QList &additionalDirs = {}, + [[nodiscard]] FilePath searchInPath(const FilePaths &additionalDirs = {}, PathAmending = AppendToPath) const; // makes sure that capitalization of directories is canonical @@ -186,9 +187,9 @@ public: QString shortNativePath() const; bool startsWithDriveLetter() const; - static QString formatFilePaths(const QList &files, const QString &separator); - static void removeDuplicates(QList &files); - static void sort(QList &files); + static QString formatFilePaths(const FilePaths &files, const QString &separator); + static void removeDuplicates(FilePaths &files); + static void sort(FilePaths &files); // Asynchronous interface template using Continuation = std::function; @@ -232,8 +233,6 @@ private: QString m_data; }; -using FilePaths = QList; - inline size_t qHash(const Utils::FilePath &a, uint seed = 0) { return a.hash(seed); diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index dd6a01bac80..d852893f685 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -71,7 +71,7 @@ public: std::function removeRecursively; std::function copyFile; std::function renameFile; - std::function &)> searchInPath; + std::function searchInPath; std::function symLinkTarget; std::function mapToDevicePath; std::function &postOperation = {}); bool operator()(const FilePath &src, const FilePath &dest, QString *error); - QList files() const; + FilePaths files() const; private: QWidget *m_parent; diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 7f665131855..139383f8375 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -402,7 +402,7 @@ static QList availableNdkPlatformsV21Plus(const FilePath &ndkLocation, cons const QString abi = AndroidConfig::toolsPrefix(abis.first()); const FilePath libPath = AndroidConfig::toolchainPathFromNdk(ndkLocation, hostOs) / "sysroot/usr/lib" / abi; - const QList dirEntries = libPath.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot); + const FilePaths dirEntries = libPath.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot); const QList availableNdkPlatforms = Utils::transform(dirEntries, [](const FilePath &path) { return path.fileName().toInt(); }); diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 18352732232..fd51c5995e5 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -176,7 +176,7 @@ static FilePath clangPlusPlusPath(const FilePath &clangPath) return clangPath.parentDir().pathAppended(clangPath.baseName() + "++").withExecutableSuffix(); } -static QList uniqueNdksForCurrentQtVersions() +static FilePaths uniqueNdksForCurrentQtVersions() { const AndroidConfig &config = AndroidConfigurations::currentConfig(); @@ -185,7 +185,7 @@ static QList uniqueNdksForCurrentQtVersions() return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE); }); - QList uniqueNdks; + FilePaths uniqueNdks; for (const QtSupport::QtVersion *version : androidQtVersions) { FilePath ndk = config.ndkLocation(version); if (!uniqueNdks.contains(ndk)) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index d9ef4be3ad2..9f316d417b1 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -81,7 +81,7 @@ static QStringList scanDirectory(const FilePath &path, const QString &prefix) QStringList result; qCDebug(cmInputLog) << "Scanning for directories matching" << prefix << "in" << path; - const QList entries = path.dirEntries({{prefix + "*"}, QDir::Dirs | QDir::NoDotAndDotDot}); + const FilePaths entries = path.dirEntries({{prefix + "*"}, QDir::Dirs | QDir::NoDotAndDotDot}); for (const FilePath &entry : entries) { QTC_ASSERT(entry.isDir(), continue); result.append(entry.toString()); diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp index 3dde746a91e..a152c1cf090 100644 --- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp @@ -75,8 +75,8 @@ private: std::unique_ptr m_process; QMutex m_mutex; QWaitCondition m_waitForItems; - QList m_queue; - QList m_filePaths; + FilePaths m_queue; + FilePaths m_filePaths; int m_index; bool m_finished; }; diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 44b7233d5fe..66c49347386 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -1473,8 +1473,8 @@ void MainWindow::changeLog() ICore::raiseWindow(dialog); return; } - const QList files = ICore::resourcePath("changelog") - .dirEntries({{"changes-*"}, QDir::Files}); + const FilePaths files = + ICore::resourcePath("changelog").dirEntries({{"changes-*"}, QDir::Files}); static const QRegularExpression versionRegex("\\d+[.]\\d+[.]\\d+"); using VersionFilePair = std::pair; QList versionedFiles = Utils::transform(files, [](const FilePath &fp) { diff --git a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp b/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp index 3fa987f2b0a..3648a48ddc3 100644 --- a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp @@ -253,7 +253,7 @@ static FileType fileType(const FilePath &path) static void dirEntries(QFutureInterface &futureInterface, const FilePath &dir) { - const QList entries = dir.dirEntries(QDir::NoFilter); + const FilePaths entries = dir.dirEntries(QDir::NoFilter); ResultType result; for (const FilePath &entry : entries) { if (futureInterface.isCanceled()) diff --git a/src/plugins/projectexplorer/devicesupport/sshsettings.cpp b/src/plugins/projectexplorer/devicesupport/sshsettings.cpp index d0f93e2fb7e..0c582ffce60 100644 --- a/src/plugins/projectexplorer/devicesupport/sshsettings.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshsettings.cpp @@ -129,7 +129,7 @@ static FilePath filePathValue(const FilePath &value, const QStringList &candidat { if (!value.isEmpty()) return value; - const QList additionalSearchPaths = sshSettings->searchPathRetriever(); + const FilePaths additionalSearchPaths = sshSettings->searchPathRetriever(); for (const QString &candidate : candidateFileNames) { const FilePath filePath = Environment::systemEnvironment() .searchInPath(candidate, additionalSearchPaths);