Utils: Rename FileName to FilePath

More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

14 files changed, 46 insertions, 46 deletions

diff --git a/src/plugins/clangtools/clangfileinfo.h b/src/plugins/clangtools/clangfileinfo.h
index 735028a1f9..eaeaecce12 100644
--- a/src/plugins/clangtools/clangfileinfo.h
+++ b/src/plugins/clangtools/clangfileinfo.h
@@ -37,14 +37,14 @@ class FileInfo
 {
 public:
     FileInfo() = default;
-    FileInfo(Utils::FileName file,
+    FileInfo(Utils::FilePath file,
              CppTools::ProjectFile::Kind kind,
              CppTools::ProjectPart::Ptr projectPart)
         : file(std::move(file))
         , kind(kind)
         , projectPart(projectPart)
     {}
-    Utils::FileName file;
+    Utils::FilePath file;
     CppTools::ProjectFile::Kind kind;
     CppTools::ProjectPart::Ptr projectPart;
 };
diff --git a/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp b/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp
index c3b6f4ac3e..e32553f976 100644
--- a/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp
+++ b/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp
@@ -109,7 +109,7 @@ bool FixitsRefactoringFile::apply()
                     format(*indenter, doc, operationsForFile, i);
                 operationsForFile.clear();
                 indenter = std::unique_ptr<TextEditor::Indenter>(factory->createIndenter(doc));
-                indenter->setFileName(Utils::FileName::fromString(op.fileName));
+                indenter->setFileName(Utils::FilePath::fromString(op.fileName));
             }
 
             QTextCursor cursor(doc);
diff --git a/src/plugins/clangtools/clangselectablefilesdialog.cpp b/src/plugins/clangtools/clangselectablefilesdialog.cpp
index 7a7dbd9013..e48679aa05 100644
--- a/src/plugins/clangtools/clangselectablefilesdialog.cpp
+++ b/src/plugins/clangtools/clangselectablefilesdialog.cpp
@@ -71,7 +71,7 @@ static void linkFileNode(Tree *parentNode, Tree *childNode)
     parentNode->visibleFiles.append(childNode);
 }
 
-static Tree *createDirNode(const QString &name, const FileName &filePath = FileName())
+static Tree *createDirNode(const QString &name, const FilePath &filePath = FilePath())
 {
     auto node = new Tree;
     node->name = name;
@@ -106,7 +106,7 @@ public:
     //
     // For example, if a directory node if fully checked, there is no need to
     // save all the children of that node.
-    void minimalSelection(QSet<FileName> &checkedDirs, QSet<FileName> &checkedFiles) const
+    void minimalSelection(QSet<FilePath> &checkedDirs, QSet<FilePath> &checkedFiles) const
     {
         traverse(index(0, 0, QModelIndex()), [&](const QModelIndex &index){
             auto node = static_cast<Tree *>(index.internalPointer());
@@ -124,7 +124,7 @@ public:
         });
     }
 
-    void restoreMinimalSelection(const QSet<FileName> &dirs, const QSet<FileName> &files)
+    void restoreMinimalSelection(const QSet<FilePath> &dirs, const QSet<FilePath> &files)
     {
         if (dirs.isEmpty() && files.isEmpty())
             return;
@@ -211,20 +211,20 @@ private:
             // Add files outside of the base directory to a separate node
             Tree *externalFilesNode = createDirNode(SelectableFilesDialog::tr(
                                                         "Files outside of the base directory"),
-                                                    FileName::fromString("/"));
+                                                    FilePath::fromString("/"));
             linkDirNode(m_root, externalFilesNode);
             for (const FileInfo &fileInfo : outOfBaseDirFiles)
                 linkFileNode(externalFilesNode, createFileNode(fileInfo, true));
         }
     }
 
-    Tree *buildProjectDirTree(const FileName &projectDir,
+    Tree *buildProjectDirTree(const FilePath &projectDir,
                               const FileInfos &fileInfos,
                               FileInfos &outOfBaseDirFiles) const
     {
         Tree *projectDirNode = createDirNode(projectDir.fileName(), projectDir);
 
-        QHash<FileName, Tree *> dirsToNode;
+        QHash<FilePath, Tree *> dirsToNode;
         dirsToNode.insert(projectDirNode->fullPath, projectDirNode);
 
         for (const FileInfo &fileInfo : fileInfos) {
@@ -234,7 +234,7 @@ private:
             }
 
             // Find or create parent nodes
-            FileName parentDir = fileInfo.file.parentDir();
+            FilePath parentDir = fileInfo.file.parentDir();
             Tree *parentNode = dirsToNode[parentDir];
             if (!parentNode) {
                 // Find nearest existing node
@@ -246,7 +246,7 @@ private:
                 }
 
                 // Create needed extra dir nodes
-                FileName currentDirPath = parentDir;
+                FilePath currentDirPath = parentDir;
                 for (const QString &dirName : dirsToCreate) {
                     currentDirPath = currentDirPath.pathAppended(dirName);
 
@@ -380,8 +380,8 @@ void SelectableFilesDialog::accept()
     settings->setBuildBeforeAnalysis(m_buildBeforeAnalysis);
 
     // Save selection
-    QSet<FileName> checkedDirs;
-    QSet<FileName> checkedFiles;
+    QSet<FilePath> checkedDirs;
+    QSet<FilePath> checkedFiles;
     m_filesModel->minimalSelection(checkedDirs, checkedFiles);
     settings->setSelectedDirs(checkedDirs);
     settings->setSelectedFiles(checkedFiles);
diff --git a/src/plugins/clangtools/clangtidyclazytool.cpp b/src/plugins/clangtools/clangtidyclazytool.cpp
index 43858cc865..f07fdcd3f7 100644
--- a/src/plugins/clangtools/clangtidyclazytool.cpp
+++ b/src/plugins/clangtools/clangtidyclazytool.cpp
@@ -464,7 +464,7 @@ void ClangTidyClazyTool::handleStateUpdate()
 }
 
 QList<Diagnostic> ClangTidyClazyTool::read(const QString &filePath,
-                                           const Utils::FileName &projectRootDir,
+                                           const Utils::FilePath &projectRootDir,
                                            const QString &logFilePath,
                                            QString *errorMessage) const
 {
diff --git a/src/plugins/clangtools/clangtidyclazytool.h b/src/plugins/clangtools/clangtidyclazytool.h
index 24aac6673b..c0765dc6a9 100644
--- a/src/plugins/clangtools/clangtidyclazytool.h
+++ b/src/plugins/clangtools/clangtidyclazytool.h
@@ -54,7 +54,7 @@ public:
     void startTool(bool askUserForFileSelection) final;
 
     QList<Diagnostic> read(const QString &filePath,
-                           const Utils::FileName &projectRootDir,
+                           const Utils::FilePath &projectRootDir,
                            const QString &logFilePath,
                            QString *errorMessage) const final;
 
diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp
index 52746080c1..10295ed28b 100644
--- a/src/plugins/clangtools/clangtool.cpp
+++ b/src/plugins/clangtools/clangtool.cpp
@@ -79,7 +79,7 @@ static FileInfos sortedFileInfos(const QVector<CppTools::ProjectPart::Ptr> &proj
                 continue;
 
             if (file.active && CppTools::ProjectFile::isSource(file.kind)) {
-                fileInfos.emplace_back(Utils::FileName::fromString(file.path),
+                fileInfos.emplace_back(Utils::FilePath::fromString(file.path),
                                        file.kind,
                                        projectPart);
             }
diff --git a/src/plugins/clangtools/clangtool.h b/src/plugins/clangtools/clangtool.h
index 65dde58009..0f322feb47 100644
--- a/src/plugins/clangtools/clangtool.h
+++ b/src/plugins/clangtools/clangtool.h
@@ -31,7 +31,7 @@
 #include <cpptools/projectinfo.h>
 
 namespace Debugger { class DetailedErrorView; }
-namespace Utils { class FileName; }
+namespace Utils { class FilePath; }
 
 namespace ClangTools {
 namespace Internal {
@@ -50,7 +50,7 @@ public:
     virtual void startTool(bool askUserForFileSelection) = 0;
 
     virtual QList<Diagnostic> read(const QString &filePath,
-                                   const Utils::FileName &projectRootDir,
+                                   const Utils::FilePath &projectRootDir,
                                    const QString &logFilePath,
                                    QString *errorMessage) const = 0;
 
diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp
index 2f994c3a8f..2ff19c620e 100644
--- a/src/plugins/clangtools/clangtoolruncontrol.cpp
+++ b/src/plugins/clangtools/clangtoolruncontrol.cpp
@@ -299,7 +299,7 @@ void ClangToolRunControl::start()
         return;
     }
 
-    const Utils::FileName projectFile = m_projectInfo.project()->projectFilePath();
+    const Utils::FilePath projectFile = m_projectInfo.project()->projectFilePath();
     appendMessage(tr("Running %1 on %2").arg(toolName).arg(projectFile.toUserOutput()),
                   Utils::NormalMessageFormat);
 
@@ -386,13 +386,13 @@ void ClangToolRunControl::analyzeNextFile()
     QTC_ASSERT(runner->run(unit.file, unit.arguments), return);
 
     appendMessage(tr("Analyzing \"%1\".").arg(
-                      Utils::FileName::fromString(unit.file).toUserOutput()),
+                      Utils::FilePath::fromString(unit.file).toUserOutput()),
                   Utils::StdOutFormat);
 }
 
-static Utils::FileName cleanPath(const Utils::FileName &filePath)
+static Utils::FilePath cleanPath(const Utils::FilePath &filePath)
 {
-    return Utils::FileName::fromString(QDir::cleanPath(filePath.toString()));
+    return Utils::FilePath::fromString(QDir::cleanPath(filePath.toString()));
 }
 
 void ClangToolRunControl::onRunnerFinishedWithSuccess(const QString &filePath)
@@ -401,7 +401,7 @@ void ClangToolRunControl::onRunnerFinishedWithSuccess(const QString &filePath)
     qCDebug(LOG) << "onRunnerFinishedWithSuccess:" << logFilePath;
 
     QTC_ASSERT(m_projectInfo.project(), return);
-    const Utils::FileName projectRootDir = cleanPath(m_projectInfo.project()->projectDirectory());
+    const Utils::FilePath projectRootDir = cleanPath(m_projectInfo.project()->projectDirectory());
 
     QString errorMessage;
     const QList<Diagnostic> diagnostics = tool()->read(filePath,
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
index c0d64664bf..e5a97fea29 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
@@ -162,7 +162,7 @@ private:
     void handleSuppressedDiagnosticsChanged();
 
     QPointer<ProjectExplorer::Project> m_project;
-    Utils::FileName m_lastProjectDirectory;
+    Utils::FilePath m_lastProjectDirectory;
     SuppressedDiagnosticsList m_suppressedDiagnostics;
 };
 
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
index 33b002ced2..e59b1f22f3 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
@@ -205,8 +205,8 @@ void DiagnosticView::suppressCurrentDiagnostic()
     auto * const filterModel = static_cast<DiagnosticFilterModel *>(model());
     ProjectExplorer::Project * const project = filterModel->project();
     if (project) {
-        Utils::FileName filePath = Utils::FileName::fromString(diag.location.filePath);
-        const Utils::FileName relativeFilePath
+        Utils::FilePath filePath = Utils::FilePath::fromString(diag.location.filePath);
+        const Utils::FilePath relativeFilePath
                 = filePath.relativeChildPath(project->projectDirectory());
         if (!relativeFilePath.isEmpty())
             filePath = relativeFilePath;
diff --git a/src/plugins/clangtools/clangtoolslogfilereader.cpp b/src/plugins/clangtools/clangtoolslogfilereader.cpp
index e8a6fbcc96..63751181ee 100644
--- a/src/plugins/clangtools/clangtoolslogfilereader.cpp
+++ b/src/plugins/clangtools/clangtoolslogfilereader.cpp
@@ -122,7 +122,7 @@ static ExplainingStep buildFixIt(const CXDiagnostic cxDiagnostic, unsigned index
 }
 
 static Diagnostic buildDiagnostic(const CXDiagnostic cxDiagnostic,
-                                  const Utils::FileName &projectRootDir,
+                                  const Utils::FilePath &projectRootDir,
                                   const QString &nativeFilePath)
 {
     Diagnostic diagnostic;
@@ -135,7 +135,7 @@ static Diagnostic buildDiagnostic(const CXDiagnostic cxDiagnostic,
         return diagnostic;
 
     diagnostic.location = diagLocationFromSourceLocation(cxLocation);
-    const auto diagnosticFilePath = Utils::FileName::fromString(diagnostic.location.filePath);
+    const auto diagnosticFilePath = Utils::FilePath::fromString(diagnostic.location.filePath);
     if (!diagnosticFilePath.isChildOf(projectRootDir))
         return diagnostic;
 
@@ -183,7 +183,7 @@ static Diagnostic buildDiagnostic(const CXDiagnostic cxDiagnostic,
 }
 
 static QList<Diagnostic> readSerializedDiagnostics_helper(const QString &filePath,
-                                                          const Utils::FileName &projectRootDir,
+                                                          const Utils::FilePath &projectRootDir,
                                                           const QString &logFilePath)
 {
     QList<Diagnostic> list;
@@ -232,7 +232,7 @@ static bool checkFilePath(const QString &filePath, QString *errorMessage)
 }
 
 QList<Diagnostic> readSerializedDiagnostics(const QString &filePath,
-                                            const Utils::FileName &projectRootDir,
+                                            const Utils::FilePath &projectRootDir,
                                             const QString &logFilePath,
                                             QString *errorMessage)
 {
diff --git a/src/plugins/clangtools/clangtoolslogfilereader.h b/src/plugins/clangtools/clangtoolslogfilereader.h
index 3d8a776932..c95ce645ae 100644
--- a/src/plugins/clangtools/clangtoolslogfilereader.h
+++ b/src/plugins/clangtools/clangtoolslogfilereader.h
@@ -29,13 +29,13 @@
 
 #include <QList>
 
-namespace Utils { class FileName; }
+namespace Utils { class FilePath; }
 
 namespace ClangTools {
 namespace Internal {
 
 QList<Diagnostic> readSerializedDiagnostics(const QString &filePath,
-                                            const Utils::FileName &projectRootDir,
+                                            const Utils::FilePath &projectRootDir,
                                             const QString &logFilePath,
                                             QString *errorMessage);
 
diff --git a/src/plugins/clangtools/clangtoolsprojectsettings.cpp b/src/plugins/clangtools/clangtoolsprojectsettings.cpp
index a44e2e0129..bc8a3cabb6 100644
--- a/src/plugins/clangtools/clangtoolsprojectsettings.cpp
+++ b/src/plugins/clangtools/clangtoolsprojectsettings.cpp
@@ -89,7 +89,7 @@ void ClangToolsProjectSettings::load()
         m_project->namedSettings(SETTINGS_KEY_DIAGNOSTIC_CONFIG));
     m_buildBeforeAnalysis = m_project->namedSettings(SETTINGS_KEY_BUILD_BEFORE_ANALYSIS).toBool();
 
-    auto toFileName = [](const QString &s) { return Utils::FileName::fromString(s); };
+    auto toFileName = [](const QString &s) { return Utils::FilePath::fromString(s); };
 
     const QStringList dirs = m_project->namedSettings(SETTINGS_KEY_SELECTED_DIRS).toStringList();
     m_selectedDirs = Utils::transform<QSet>(dirs, toFileName);
@@ -106,7 +106,7 @@ void ClangToolsProjectSettings::load()
         const QString message = diag.value(SETTINGS_KEY_SUPPRESSED_DIAGS_MESSAGE).toString();
         if (message.isEmpty())
             continue;
-        Utils::FileName fullPath = Utils::FileName::fromString(fp);
+        Utils::FilePath fullPath = Utils::FilePath::fromString(fp);
         if (fullPath.toFileInfo().isRelative())
             fullPath = m_project->projectDirectory().pathAppended(fp);
         if (!fullPath.exists())
@@ -114,7 +114,7 @@ void ClangToolsProjectSettings::load()
         const QString contextKind = diag.value(SETTINGS_KEY_SUPPRESSED_DIAGS_CONTEXTKIND).toString();
         const QString context = diag.value(SETTINGS_KEY_SUPPRESSED_DIAGS_CONTEXT).toString();
         const int uniquifier = diag.value(SETTINGS_KEY_SUPPRESSED_DIAGS_UNIQIFIER).toInt();
-        m_suppressedDiagnostics << SuppressedDiagnostic(Utils::FileName::fromString(fp), message,
+        m_suppressedDiagnostics << SuppressedDiagnostic(Utils::FilePath::fromString(fp), message,
                                                         contextKind, context, uniquifier);
     }
     emit suppressedDiagnosticsChanged();
@@ -126,10 +126,10 @@ void ClangToolsProjectSettings::store()
     m_project->setNamedSettings(SETTINGS_KEY_DIAGNOSTIC_CONFIG, m_diagnosticConfig.toSetting());
     m_project->setNamedSettings(SETTINGS_KEY_BUILD_BEFORE_ANALYSIS, m_buildBeforeAnalysis);
 
-    const QStringList dirs = Utils::transform(m_selectedDirs.toList(), &Utils::FileName::toString);
+    const QStringList dirs = Utils::transform(m_selectedDirs.toList(), &Utils::FilePath::toString);
     m_project->setNamedSettings(SETTINGS_KEY_SELECTED_DIRS, dirs);
 
-    const QStringList files = Utils::transform(m_selectedFiles.toList(), &Utils::FileName::toString);
+    const QStringList files = Utils::transform(m_selectedFiles.toList(), &Utils::FilePath::toString);
     m_project->setNamedSettings(SETTINGS_KEY_SELECTED_FILES, files);
 
     QVariantList list;
@@ -199,7 +199,7 @@ void ClangToolsProjectSettingsManager::handleProjectToBeRemoved(ProjectExplorer:
 ClangToolsProjectSettingsManager::SettingsMap ClangToolsProjectSettingsManager::m_settings;
 
 SuppressedDiagnostic::SuppressedDiagnostic(const Diagnostic &diag)
-    : filePath(Utils::FileName::fromString(diag.location.filePath))
+    : filePath(Utils::FilePath::fromString(diag.location.filePath))
     , description(diag.description)
     , contextKind(diag.issueContextKind)
     , context(diag.issueContext)
diff --git a/src/plugins/clangtools/clangtoolsprojectsettings.h b/src/plugins/clangtools/clangtoolsprojectsettings.h
index fb52862966..757140bc2c 100644
--- a/src/plugins/clangtools/clangtoolsprojectsettings.h
+++ b/src/plugins/clangtools/clangtoolsprojectsettings.h
@@ -39,7 +39,7 @@ class Diagnostic;
 class SuppressedDiagnostic
 {
 public:
-    SuppressedDiagnostic(const Utils::FileName &filePath, const QString &description,
+    SuppressedDiagnostic(const Utils::FilePath &filePath, const QString &description,
                          const QString &contextKind, const QString &context, int uniquifier)
         : filePath(filePath)
         , description(description)
@@ -51,7 +51,7 @@ public:
 
     SuppressedDiagnostic(const Diagnostic &diag);
 
-    Utils::FileName filePath; // Relative for files in project, absolute otherwise.
+    Utils::FilePath filePath; // Relative for files in project, absolute otherwise.
     QString description;
     QString contextKind;
     QString context;
@@ -84,11 +84,11 @@ public:
     bool buildBeforeAnalysis() const;
     void setBuildBeforeAnalysis(bool build);
 
-    QSet<Utils::FileName> selectedDirs() const { return m_selectedDirs; }
-    void setSelectedDirs(const QSet<Utils::FileName> &value) { m_selectedDirs = value; }
+    QSet<Utils::FilePath> selectedDirs() const { return m_selectedDirs; }
+    void setSelectedDirs(const QSet<Utils::FilePath> &value) { m_selectedDirs = value; }
 
-    QSet<Utils::FileName> selectedFiles() const { return m_selectedFiles; }
-    void setSelectedFiles(const QSet<Utils::FileName> &value) { m_selectedFiles = value; }
+    QSet<Utils::FilePath> selectedFiles() const { return m_selectedFiles; }
+    void setSelectedFiles(const QSet<Utils::FilePath> &value) { m_selectedFiles = value; }
 
     SuppressedDiagnosticsList suppressedDiagnostics() const { return m_suppressedDiagnostics; }
     void addSuppressedDiagnostic(const SuppressedDiagnostic &diag);
@@ -105,8 +105,8 @@ private:
     ProjectExplorer::Project *m_project;
     bool m_useGlobalSettings = true;
     Core::Id m_diagnosticConfig;
-    QSet<Utils::FileName> m_selectedDirs;
-    QSet<Utils::FileName> m_selectedFiles;
+    QSet<Utils::FilePath> m_selectedDirs;
+    QSet<Utils::FilePath> m_selectedFiles;
     SuppressedDiagnosticsList m_suppressedDiagnostics;
     bool m_buildBeforeAnalysis = true;
 };