Utils: Rename FilePathList to simply FilePaths

The exact storage type does not really matter here.

Change-Id: Iefec40f0f5909c8e7ba3415db4a11962694e1b38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

18 files changed, 74 insertions, 74 deletions

diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index fe3cb14118..0fc6c7d44f 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -446,7 +446,7 @@ void AbstractProcessStep::taskAdded(const Task &task, int linkedOutputLines, int
         while (filePath.startsWith("../"))
             filePath.remove(0, 3);
         bool found = false;
-        const Utils::FilePathList candidates
+        const Utils::FilePaths candidates
                 = d->m_fileFinder.findFile(QUrl::fromLocalFile(filePath), &found);
         if (found && candidates.size() == 1)
             editable.file = candidates.first();
diff --git a/src/plugins/projectexplorer/allprojectsfilter.cpp b/src/plugins/projectexplorer/allprojectsfilter.cpp
index 81be5ebe47..e6beb28724 100644
--- a/src/plugins/projectexplorer/allprojectsfilter.cpp
+++ b/src/plugins/projectexplorer/allprojectsfilter.cpp
@@ -57,7 +57,7 @@ void AllProjectsFilter::prepareSearch(const QString &entry)
 {
     Q_UNUSED(entry)
     if (!fileIterator()) {
-        Utils::FilePathList paths;
+        Utils::FilePaths paths;
         for (Project *project : SessionManager::projects())
             paths.append(project->files(Project::SourceFiles));
         Utils::sort(paths);
diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp
index c0875fc132..89c2ed1a3c 100644
--- a/src/plugins/projectexplorer/currentprojectfilter.cpp
+++ b/src/plugins/projectexplorer/currentprojectfilter.cpp
@@ -56,7 +56,7 @@ void CurrentProjectFilter::prepareSearch(const QString &entry)
 {
     Q_UNUSED(entry)
     if (!fileIterator()) {
-        Utils::FilePathList paths;
+        Utils::FilePaths paths;
         if (m_project)
             paths = m_project->files(Project::SourceFiles);
         setFileIterator(new BaseFileFilter::ListIterator(paths));
diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp
index 7123ff38e2..bfb7164550 100644
--- a/src/plugins/projectexplorer/extracompiler.cpp
+++ b/src/plugins/projectexplorer/extracompiler.cpp
@@ -71,7 +71,7 @@ public:
 };
 
 ExtraCompiler::ExtraCompiler(const Project *project, const Utils::FilePath &source,
-                             const Utils::FilePathList &targets, QObject *parent) :
+                             const Utils::FilePaths &targets, QObject *parent) :
     QObject(parent), d(std::make_unique<ExtraCompilerPrivate>())
 {
     d->project = project;
@@ -146,7 +146,7 @@ QByteArray ExtraCompiler::content(const Utils::FilePath &file) const
     return d->contents.value(file);
 }
 
-Utils::FilePathList ExtraCompiler::targets() const
+Utils::FilePaths ExtraCompiler::targets() const
 {
     return d->contents.keys();
 }
@@ -323,7 +323,7 @@ ExtraCompilerFactory::~ExtraCompilerFactory()
 
 void ExtraCompilerFactory::annouceCreation(const Project *project,
                                            const Utils::FilePath &source,
-                                           const Utils::FilePathList &targets)
+                                           const Utils::FilePaths &targets)
 {
     for (ExtraCompilerFactoryObserver *observer : *observers)
         observer->newExtraCompiler(project, source, targets);
@@ -335,7 +335,7 @@ QList<ExtraCompilerFactory *> ExtraCompilerFactory::extraCompilerFactories()
 }
 
 ProcessExtraCompiler::ProcessExtraCompiler(const Project *project, const Utils::FilePath &source,
-                                           const Utils::FilePathList &targets, QObject *parent) :
+                                           const Utils::FilePaths &targets, QObject *parent) :
     ExtraCompiler(project, source, targets, parent)
 { }
 
diff --git a/src/plugins/projectexplorer/extracompiler.h b/src/plugins/projectexplorer/extracompiler.h
index e6eae13f5c..1ad6d80692 100644
--- a/src/plugins/projectexplorer/extracompiler.h
+++ b/src/plugins/projectexplorer/extracompiler.h
@@ -55,7 +55,7 @@ class PROJECTEXPLORER_EXPORT ExtraCompiler : public QObject
 public:
 
     ExtraCompiler(const Project *project, const Utils::FilePath &source,
-                  const Utils::FilePathList &targets, QObject *parent = nullptr);
+                  const Utils::FilePaths &targets, QObject *parent = nullptr);
     ~ExtraCompiler() override;
 
     const Project *project() const;
@@ -66,7 +66,7 @@ public:
     void setContent(const Utils::FilePath &file, const QByteArray &content);
     QByteArray content(const Utils::FilePath &file) const;
 
-    Utils::FilePathList targets() const;
+    Utils::FilePaths targets() const;
     void forEachTarget(std::function<void(const Utils::FilePath &)> func);
 
     void setCompileTime(const QDateTime &time);
@@ -99,7 +99,7 @@ class PROJECTEXPLORER_EXPORT ProcessExtraCompiler : public ExtraCompiler
 public:
 
     ProcessExtraCompiler(const Project *project, const Utils::FilePath &source,
-                         const Utils::FilePathList &targets, QObject *parent = nullptr);
+                         const Utils::FilePaths &targets, QObject *parent = nullptr);
     ~ProcessExtraCompiler() override;
 
 protected:
@@ -147,7 +147,7 @@ protected:
 
     virtual void newExtraCompiler(const Project *project,
                                   const Utils::FilePath &source,
-                                  const Utils::FilePathList &targets)
+                                  const Utils::FilePaths &targets)
         = 0;
 };
 
@@ -163,12 +163,12 @@ public:
 
     virtual ExtraCompiler *create(const Project *project,
                                   const Utils::FilePath &source,
-                                  const Utils::FilePathList &targets)
+                                  const Utils::FilePaths &targets)
         = 0;
 
     void annouceCreation(const Project *project,
                          const Utils::FilePath &source,
-                         const Utils::FilePathList &targets);
+                         const Utils::FilePaths &targets);
 
     static QList<ExtraCompilerFactory *> extraCompilerFactories();
 };
diff --git a/src/plugins/projectexplorer/fileinsessionfinder.cpp b/src/plugins/projectexplorer/fileinsessionfinder.cpp
index 204fa0f9af..db970a264b 100644
--- a/src/plugins/projectexplorer/fileinsessionfinder.cpp
+++ b/src/plugins/projectexplorer/fileinsessionfinder.cpp
@@ -42,7 +42,7 @@ class FileInSessionFinder : public QObject
 public:
     FileInSessionFinder();
 
-    FilePathList doFindFile(const FilePath &filePath);
+    FilePaths doFindFile(const FilePath &filePath);
     void invalidateFinder() { m_finderIsUpToDate = false; }
 
 private:
@@ -64,13 +64,13 @@ FileInSessionFinder::FileInSessionFinder()
     });
 }
 
-FilePathList FileInSessionFinder::doFindFile(const FilePath &filePath)
+FilePaths FileInSessionFinder::doFindFile(const FilePath &filePath)
 {
     if (!m_finderIsUpToDate) {
         m_finder.setProjectDirectory(SessionManager::startupProject()
                                       ? SessionManager::startupProject()->projectDirectory()
                                       : FilePath());
-        FilePathList allFiles;
+        FilePaths allFiles;
         for (const Project * const p : SessionManager::projects())
             allFiles << p->files(Project::SourceFiles);
         m_finder.setProjectFiles(allFiles);
@@ -81,7 +81,7 @@ FilePathList FileInSessionFinder::doFindFile(const FilePath &filePath)
 
 } // namespace Internal
 
-FilePathList findFileInSession(const FilePath &filePath)
+FilePaths findFileInSession(const FilePath &filePath)
 {
     static Internal::FileInSessionFinder finder;
     return finder.doFindFile(filePath);
diff --git a/src/plugins/projectexplorer/fileinsessionfinder.h b/src/plugins/projectexplorer/fileinsessionfinder.h
index 307018a2fc..b3e011cb3f 100644
--- a/src/plugins/projectexplorer/fileinsessionfinder.h
+++ b/src/plugins/projectexplorer/fileinsessionfinder.h
@@ -32,6 +32,6 @@
 namespace ProjectExplorer {
 
 // Possibly used by "QtCreatorTerminalPlugin"
-PROJECTEXPLORER_EXPORT Utils::FilePathList findFileInSession(const Utils::FilePath &filePath);
+PROJECTEXPLORER_EXPORT Utils::FilePaths findFileInSession(const Utils::FilePath &filePath);
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index a0872c7535..42abadaf79 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -387,7 +387,7 @@ static Utils::FilePath findLocalCompiler(const Utils::FilePath &compilerPath,
         return compilerPath;
 
     // Filter out network compilers
-    const FilePathList pathComponents = Utils::filtered(env.path(), [] (const FilePath &dirPath) {
+    const FilePaths pathComponents = Utils::filtered(env.path(), [] (const FilePath &dirPath) {
         return !isNetworkCompiler(dirPath.toString());
     });
 
@@ -905,7 +905,7 @@ Utils::FilePath GccToolChain::detectInstallDir() const
 // GccToolChainFactory
 // --------------------------------------------------------------------------
 
-static Utils::FilePathList gnuSearchPathsFromRegistry()
+static Utils::FilePaths gnuSearchPathsFromRegistry()
 {
     if (!HostOsInfo::isWindowsHost())
         return {};
@@ -914,7 +914,7 @@ static Utils::FilePathList gnuSearchPathsFromRegistry()
     static const char kRegistryToken[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" \
                                          "Windows\\CurrentVersion\\Uninstall\\";
 
-    Utils::FilePathList searchPaths;
+    Utils::FilePaths searchPaths;
 
     QSettings registry(kRegistryToken, QSettings::NativeFormat);
     const auto productGroups = registry.childGroups();
@@ -937,7 +937,7 @@ static Utils::FilePathList gnuSearchPathsFromRegistry()
     return searchPaths;
 }
 
-static Utils::FilePathList atmelSearchPathsFromRegistry()
+static Utils::FilePaths atmelSearchPathsFromRegistry()
 {
     if (!HostOsInfo::isWindowsHost())
         return {};
@@ -946,7 +946,7 @@ static Utils::FilePathList atmelSearchPathsFromRegistry()
     // "Atmel Studio" IDE.
     static const char kRegistryToken[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Atmel\\";
 
-    Utils::FilePathList searchPaths;
+    Utils::FilePaths searchPaths;
     QSettings registry(kRegistryToken, QSettings::NativeFormat);
 
     // This code enumerate the installed toolchains provided
@@ -1015,7 +1015,7 @@ static Utils::FilePathList atmelSearchPathsFromRegistry()
     return searchPaths;
 }
 
-static Utils::FilePathList renesasRl78SearchPathsFromRegistry()
+static Utils::FilePaths renesasRl78SearchPathsFromRegistry()
 {
     if (!HostOsInfo::isWindowsHost())
         return {};
@@ -1024,7 +1024,7 @@ static Utils::FilePathList renesasRl78SearchPathsFromRegistry()
     static const char kRegistryToken[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" \
                                          "Windows\\CurrentVersion\\Uninstall";
 
-    Utils::FilePathList searchPaths;
+    Utils::FilePaths searchPaths;
 
     QSettings registry(QLatin1String(kRegistryToken), QSettings::NativeFormat);
     const auto productGroups = registry.childGroups();
@@ -1093,13 +1093,13 @@ QList<ToolChain *> GccToolChainFactory::autoDetectToolchains(
         const Core::Id requiredTypeId, const QList<ToolChain *> &alreadyKnown,
         const ToolchainChecker &checker)
 {
-    FilePathList compilerPaths;
+    FilePaths compilerPaths;
     QFileInfo fi(compilerName);
     if (fi.isAbsolute()) {
         if (fi.isFile())
             compilerPaths << FilePath::fromString(compilerName);
     } else {
-        FilePathList searchPaths = Environment::systemEnvironment().path();
+        FilePaths searchPaths = Environment::systemEnvironment().path();
         searchPaths << gnuSearchPathsFromRegistry();
         searchPaths << atmelSearchPathsFromRegistry();
         searchPaths << renesasRl78SearchPathsFromRegistry();
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
index 530ace9ca7..856c4fcd35 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
@@ -334,9 +334,9 @@ static QStringList environmentTemplatesPaths()
     return paths;
 }
 
-Utils::FilePathList &JsonWizardFactory::searchPaths()
+Utils::FilePaths &JsonWizardFactory::searchPaths()
 {
-    static Utils::FilePathList m_searchPaths = Utils::FilePathList()
+    static Utils::FilePaths m_searchPaths = Utils::FilePaths()
             << Utils::FilePath::fromString(Core::ICore::userResourcePath() + QLatin1Char('/') +
                                            QLatin1String(WIZARD_PATH))
             << Utils::FilePath::fromString(Core::ICore::resourcePath() + QLatin1Char('/') +
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
index 5573bb2979..8cb3273356 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
@@ -96,7 +96,7 @@ private:
     static QList<IWizardFactory *> createWizardFactories();
     static JsonWizardFactory *createWizardFactory(const QVariantMap &data, const QDir &baseDir,
                                                   QString *errorMessage);
-    static Utils::FilePathList &searchPaths();
+    static Utils::FilePaths &searchPaths();
 
     static void setVerbose(int level);
     static int verbose();
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 16a11a90fe..e5fd5e9f4a 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -591,11 +591,11 @@ Project::RestoreResult Project::restoreSettings(QString *errorMessage)
 /*!
  * Returns a sorted list of all files matching the predicate \a filter.
  */
-Utils::FilePathList Project::files(const Project::NodeMatcher &filter) const
+Utils::FilePaths Project::files(const Project::NodeMatcher &filter) const
 {
     QTC_ASSERT(filter, return {});
 
-    Utils::FilePathList result;
+    Utils::FilePaths result;
     if (d->m_sortedNodeList.empty() && filter(containerNode()))
         result.append(projectFilePath());
 
@@ -1177,14 +1177,14 @@ void ProjectExplorerPlugin::testProject_projectTree()
     QCOMPARE(project.isKnownFile(TEST_PROJECT_CPP_FILE), true);
     QCOMPARE(project.isKnownFile(TEST_PROJECT_GENERATED_FILE), true);
 
-    Utils::FilePathList allFiles = project.files(Project::AllFiles);
+    Utils::FilePaths allFiles = project.files(Project::AllFiles);
     QCOMPARE(allFiles.count(), 3);
     QVERIFY(allFiles.contains(TEST_PROJECT_PATH));
     QVERIFY(allFiles.contains(TEST_PROJECT_CPP_FILE));
     QVERIFY(allFiles.contains(TEST_PROJECT_GENERATED_FILE));
 
     QCOMPARE(project.files(Project::GeneratedFiles), {TEST_PROJECT_GENERATED_FILE});
-    Utils::FilePathList sourceFiles = project.files(Project::SourceFiles);
+    Utils::FilePaths sourceFiles = project.files(Project::SourceFiles);
     QCOMPARE(sourceFiles.count(), 2);
     QVERIFY(sourceFiles.contains(TEST_PROJECT_PATH));
     QVERIFY(sourceFiles.contains(TEST_PROJECT_CPP_FILE));
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 8e648b5c90..4e1118ca92 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -124,7 +124,7 @@ public:
     static const NodeMatcher SourceFiles;
     static const NodeMatcher GeneratedFiles;
 
-    Utils::FilePathList files(const NodeMatcher &matcher) const;
+    Utils::FilePaths files(const NodeMatcher &matcher) const;
     bool isKnownFile(const Utils::FilePath &filename) const;
 
     virtual QVariantMap toMap() const;
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index b6e64a2c4b..7b8519c7d6 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1904,14 +1904,14 @@ void ProjectExplorerPlugin::extensionsInitialized()
 
     QSsh::SshSettings::loadSettings(Core::ICore::settings());
     const auto searchPathRetriever = [] {
-        Utils::FilePathList searchPaths;
+        Utils::FilePaths searchPaths;
         searchPaths << Utils::FilePath::fromString(Core::ICore::libexecPath());
         if (Utils::HostOsInfo::isWindowsHost()) {
             const QString gitBinary = Core::ICore::settings()->value("Git/BinaryPath", "git")
                     .toString();
             const QStringList rawGitSearchPaths = Core::ICore::settings()->value("Git/Path")
                     .toString().split(':', QString::SkipEmptyParts);
-            const Utils::FilePathList gitSearchPaths = Utils::transform(rawGitSearchPaths,
+            const Utils::FilePaths gitSearchPaths = Utils::transform(rawGitSearchPaths,
                     [](const QString &rawPath) { return Utils::FilePath::fromString(rawPath); });
             const Utils::FilePath fullGitPath = Utils::Environment::systemEnvironment()
                     .searchInPath(gitBinary, gitSearchPaths);
@@ -3578,7 +3578,7 @@ void ProjectExplorerPluginPrivate::addExistingDirectory()
     QTC_ASSERT(folderNode, return);
 
     SelectableFilesDialogAddDirectory dialog(Utils::FilePath::fromString(node->directory()),
-                                             Utils::FilePathList(), ICore::mainWindow());
+                                             Utils::FilePaths(), ICore::mainWindow());
     dialog.setAddFileFilter({});
 
     if (dialog.exec() == QDialog::Accepted)
diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp
index 6ef592598e..9351aa9898 100644
--- a/src/plugins/projectexplorer/selectablefilesmodel.cpp
+++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp
@@ -53,7 +53,7 @@ SelectableFilesModel::SelectableFilesModel(QObject *parent) : QAbstractItemModel
     m_root = new Tree;
 }
 
-void SelectableFilesModel::setInitialMarkedFiles(const Utils::FilePathList &files)
+void SelectableFilesModel::setInitialMarkedFiles(const Utils::FilePaths &files)
 {
     m_files = Utils::toSet(files);
     m_allFiles = files.isEmpty();
@@ -302,14 +302,14 @@ Qt::ItemFlags SelectableFilesModel::flags(const QModelIndex &index) const
     return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
 }
 
-Utils::FilePathList SelectableFilesModel::selectedPaths() const
+Utils::FilePaths SelectableFilesModel::selectedPaths() const
 {
-    Utils::FilePathList result;
+    Utils::FilePaths result;
     collectPaths(m_root, &result);
     return result;
 }
 
-void SelectableFilesModel::collectPaths(Tree *root, Utils::FilePathList *result)  const
+void SelectableFilesModel::collectPaths(Tree *root, Utils::FilePaths *result)  const
 {
     if (root->checked == Qt::Unchecked)
         return;
@@ -318,14 +318,14 @@ void SelectableFilesModel::collectPaths(Tree *root, Utils::FilePathList *result)
         collectPaths(t, result);
 }
 
-Utils::FilePathList SelectableFilesModel::selectedFiles() const
+Utils::FilePaths SelectableFilesModel::selectedFiles() const
 {
-    Utils::FilePathList result = Utils::toList(m_outOfBaseDirFiles);
+    Utils::FilePaths result = Utils::toList(m_outOfBaseDirFiles);
     collectFiles(m_root, &result);
     return result;
 }
 
-Utils::FilePathList SelectableFilesModel::preservedFiles() const
+Utils::FilePaths SelectableFilesModel::preservedFiles() const
 {
     return Utils::toList(m_outOfBaseDirFiles);
 }
@@ -335,7 +335,7 @@ bool SelectableFilesModel::hasCheckedFiles() const
     return m_root->checked != Qt::Unchecked;
 }
 
-void SelectableFilesModel::collectFiles(Tree *root, Utils::FilePathList *result) const
+void SelectableFilesModel::collectFiles(Tree *root, Utils::FilePaths *result) const
 {
     if (root->checked == Qt::Unchecked)
         return;
@@ -592,7 +592,7 @@ SelectableFilesWidget::SelectableFilesWidget(QWidget *parent) :
 }
 
 SelectableFilesWidget::SelectableFilesWidget(const Utils::FilePath &path,
-                                             const Utils::FilePathList &files, QWidget *parent) :
+                                             const Utils::FilePaths &files, QWidget *parent) :
     SelectableFilesWidget(parent)
 {
     resetModel(path, files);
@@ -615,14 +615,14 @@ void SelectableFilesWidget::setBaseDirEditable(bool edit)
     m_startParsingButton->setVisible(edit);
 }
 
-Utils::FilePathList SelectableFilesWidget::selectedFiles() const
+Utils::FilePaths SelectableFilesWidget::selectedFiles() const
 {
-    return m_model ? m_model->selectedFiles() : Utils::FilePathList();
+    return m_model ? m_model->selectedFiles() : Utils::FilePaths();
 }
 
-Utils::FilePathList SelectableFilesWidget::selectedPaths() const
+Utils::FilePaths SelectableFilesWidget::selectedPaths() const
 {
-    return m_model ? m_model->selectedPaths() : Utils::FilePathList();
+    return m_model ? m_model->selectedPaths() : Utils::FilePaths();
 }
 
 bool SelectableFilesWidget::hasFilesSelected() const
@@ -630,7 +630,7 @@ bool SelectableFilesWidget::hasFilesSelected() const
     return m_model ? m_model->hasCheckedFiles() : false;
 }
 
-void SelectableFilesWidget::resetModel(const Utils::FilePath &path, const Utils::FilePathList &files)
+void SelectableFilesWidget::resetModel(const Utils::FilePath &path, const Utils::FilePaths &files)
 {
     m_view->setModel(nullptr);
 
@@ -711,7 +711,7 @@ void SelectableFilesWidget::parsingFinished()
 
     smartExpand(m_model->index(0,0, QModelIndex()));
 
-    const Utils::FilePathList preservedFiles = m_model->preservedFiles();
+    const Utils::FilePaths preservedFiles = m_model->preservedFiles();
     m_preservedFilesLabel->setText(tr("Not showing %n files that are outside of the base directory.\n"
                                       "These files are preserved.", nullptr, preservedFiles.count()));
 
@@ -736,7 +736,7 @@ void SelectableFilesWidget::smartExpand(const QModelIndex &idx)
 //////////
 
 SelectableFilesDialogEditFiles::SelectableFilesDialogEditFiles(const Utils::FilePath &path,
-                                                               const Utils::FilePathList &files,
+                                                               const Utils::FilePaths &files,
                                                                QWidget *parent) :
     QDialog(parent),
     m_filesWidget(new SelectableFilesWidget(path, files))
@@ -759,7 +759,7 @@ SelectableFilesDialogEditFiles::SelectableFilesDialogEditFiles(const Utils::File
     layout->addWidget(buttonBox);
 }
 
-Utils::FilePathList SelectableFilesDialogEditFiles::selectedFiles() const
+Utils::FilePaths SelectableFilesDialogEditFiles::selectedFiles() const
 {
     return m_filesWidget->selectedFiles();
 }
@@ -771,7 +771,7 @@ Utils::FilePathList SelectableFilesDialogEditFiles::selectedFiles() const
 
 
 SelectableFilesDialogAddDirectory::SelectableFilesDialogAddDirectory(const Utils::FilePath &path,
-                                                                     const Utils::FilePathList &files,
+                                                                     const Utils::FilePaths &files,
                                                                      QWidget *parent) :
     SelectableFilesDialogEditFiles(path, files, parent)
 {
diff --git a/src/plugins/projectexplorer/selectablefilesmodel.h b/src/plugins/projectexplorer/selectablefilesmodel.h
index a04a059ffc..2d59e08da1 100644
--- a/src/plugins/projectexplorer/selectablefilesmodel.h
+++ b/src/plugins/projectexplorer/selectablefilesmodel.h
@@ -107,7 +107,7 @@ public:
     SelectableFilesModel(QObject *parent);
     ~SelectableFilesModel() override;
 
-    void setInitialMarkedFiles(const Utils::FilePathList &files);
+    void setInitialMarkedFiles(const Utils::FilePaths &files);
 
     int columnCount(const QModelIndex &parent) const override;
     int rowCount(const QModelIndex &parent) const override;
@@ -118,9 +118,9 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     Qt::ItemFlags flags(const QModelIndex &index) const override;
 
-    Utils::FilePathList selectedFiles() const;
-    Utils::FilePathList selectedPaths() const;
-    Utils::FilePathList preservedFiles() const;
+    Utils::FilePaths selectedFiles() const;
+    Utils::FilePaths selectedPaths() const;
+    Utils::FilePaths preservedFiles() const;
 
     bool hasCheckedFiles() const;
 
@@ -141,8 +141,8 @@ protected:
 private:
     QList<Glob> parseFilter(const QString &filter);
     Qt::CheckState applyFilter(const QModelIndex &idx);
-    void collectFiles(Tree *root, Utils::FilePathList *result) const;
-    void collectPaths(Tree *root, Utils::FilePathList *result) const;
+    void collectFiles(Tree *root, Utils::FilePaths *result) const;
+    void collectPaths(Tree *root, Utils::FilePaths *result) const;
     void selectAllFiles(Tree *root);
 
 protected:
@@ -192,18 +192,18 @@ class PROJECTEXPLORER_EXPORT SelectableFilesWidget : public QWidget
 
 public:
     explicit SelectableFilesWidget(QWidget *parent = nullptr);
-    SelectableFilesWidget(const Utils::FilePath &path, const Utils::FilePathList &files,
+    SelectableFilesWidget(const Utils::FilePath &path, const Utils::FilePaths &files,
                           QWidget *parent = nullptr);
 
     void setAddFileFilter(const QString &filter);
     void setBaseDirEditable(bool edit);
 
-    Utils::FilePathList selectedFiles() const;
-    Utils::FilePathList selectedPaths() const;
+    Utils::FilePaths selectedFiles() const;
+    Utils::FilePaths selectedPaths() const;
 
     bool hasFilesSelected() const;
 
-    void resetModel(const Utils::FilePath &path, const Utils::FilePathList &files);
+    void resetModel(const Utils::FilePath &path, const Utils::FilePaths &files);
     void cancelParsing();
 
     void enableFilterHistoryCompletion(const QString &keyPrefix);
@@ -249,9 +249,9 @@ class PROJECTEXPLORER_EXPORT SelectableFilesDialogEditFiles : public QDialog
     Q_OBJECT
 
 public:
-    SelectableFilesDialogEditFiles(const Utils::FilePath &path, const Utils::FilePathList &files,
+    SelectableFilesDialogEditFiles(const Utils::FilePath &path, const Utils::FilePaths &files,
                                    QWidget *parent);
-    Utils::FilePathList selectedFiles() const;
+    Utils::FilePaths selectedFiles() const;
 
     void setAddFileFilter(const QString &filter) { m_filesWidget->setAddFileFilter(filter); }
 
@@ -264,7 +264,7 @@ class SelectableFilesDialogAddDirectory : public SelectableFilesDialogEditFiles
     Q_OBJECT
 
 public:
-    SelectableFilesDialogAddDirectory(const Utils::FilePath &path, const Utils::FilePathList &files,
+    SelectableFilesDialogAddDirectory(const Utils::FilePath &path, const Utils::FilePaths &files,
                                       QWidget *parent);
 };
 
diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp
index 8b0b67a1eb..d6c7ef8a1b 100644
--- a/src/plugins/projectexplorer/task.cpp
+++ b/src/plugins/projectexplorer/task.cpp
@@ -124,7 +124,7 @@ void Task::setFile(const Utils::FilePath &file_)
 {
     file = file_;
     if (!file.isEmpty() && !file.toFileInfo().isAbsolute()) {
-        Utils::FilePathList possiblePaths = findFileInSession(file);
+        Utils::FilePaths possiblePaths = findFileInSession(file);
         if (possiblePaths.length() == 1)
             file = possiblePaths.first();
         else
diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h
index 739e90f176..4d8abf5608 100644
--- a/src/plugins/projectexplorer/task.h
+++ b/src/plugins/projectexplorer/task.h
@@ -77,7 +77,7 @@ public:
     Options options = AddTextMark | FlashWorthy;
     QString description;
     Utils::FilePath file;
-    Utils::FilePathList fileCandidates;
+    Utils::FilePaths fileCandidates;
     int line = -1;
     int movedLine = -1; // contains a line number if the line was moved in the editor
     Core::Id category;
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index 5f3c3692b7..cc26ff54b1 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -278,10 +278,10 @@ public:
     UserFileBackUpStrategy(UserFileAccessor *accessor) : Utils::VersionedBackUpStrategy(accessor)
     { }
 
-    FilePathList readFileCandidates(const Utils::FilePath &baseFileName) const final;
+    FilePaths readFileCandidates(const Utils::FilePath &baseFileName) const final;
 };
 
-FilePathList UserFileBackUpStrategy::readFileCandidates(const FilePath &baseFileName) const
+FilePaths UserFileBackUpStrategy::readFileCandidates(const FilePath &baseFileName) const
 {
     const auto *const ac = static_cast<const UserFileAccessor *>(accessor());
     const FilePath externalUser = ac->externalUserFile();
@@ -289,7 +289,7 @@ FilePathList UserFileBackUpStrategy::readFileCandidates(const FilePath &baseFile
     QTC_CHECK(!baseFileName.isEmpty());
     QTC_CHECK(baseFileName == externalUser || baseFileName == projectUser);
 
-    FilePathList result = Utils::VersionedBackUpStrategy::readFileCandidates(projectUser);
+    FilePaths result = Utils::VersionedBackUpStrategy::readFileCandidates(projectUser);
     if (!externalUser.isEmpty())
         result.append(Utils::VersionedBackUpStrategy::readFileCandidates(externalUser));