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>

6 files changed, 16 insertions, 16 deletions

diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
index 65f20cb125..2788214fee 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
@@ -103,8 +103,8 @@ QString ArtisticStyle::configurationFile() const
     if (m_settings.useOtherFiles()) {
         if (const ProjectExplorer::Project *project
                 = ProjectExplorer::ProjectTree::currentProject()) {
-            const Utils::FileNameList files = project->files(ProjectExplorer::Project::AllFiles);
-            for (const Utils::FileName &file : files) {
+            const Utils::FilePathList files = project->files(ProjectExplorer::Project::AllFiles);
+            for (const Utils::FilePath &file : files) {
                 if (!file.endsWith(".astylerc"))
                     continue;
                 const QFileInfo fi = file.toFileInfo();
@@ -115,7 +115,7 @@ QString ArtisticStyle::configurationFile() const
     }
 
     if (m_settings.useSpecificConfigFile()) {
-        const Utils::FileName file = m_settings.specificConfigFile();
+        const Utils::FilePath file = m_settings.specificConfigFile();
         if (file.exists())
             return file.toUserOutput();
     }
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
index c6b9c60f07..41ba9270aa 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
@@ -131,12 +131,12 @@ void ArtisticStyleSettings::setUseSpecificConfigFile(bool useSpecificConfigFile)
     m_settings.insert(USE_SPECIFIC_CONFIG_FILE, QVariant(useSpecificConfigFile));
 }
 
-Utils::FileName ArtisticStyleSettings::specificConfigFile() const
+Utils::FilePath ArtisticStyleSettings::specificConfigFile() const
 {
-    return Utils::FileName::fromString(m_settings.value(SPECIFIC_CONFIG_FILE).toString());
+    return Utils::FilePath::fromString(m_settings.value(SPECIFIC_CONFIG_FILE).toString());
 }
 
-void ArtisticStyleSettings::setSpecificConfigFile(const Utils::FileName &specificConfigFile)
+void ArtisticStyleSettings::setSpecificConfigFile(const Utils::FilePath &specificConfigFile)
 {
     m_settings.insert(SPECIFIC_CONFIG_FILE, QVariant(specificConfigFile.toString()));
 }
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
index 9e3c60e435..50deba87d6 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
+++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
@@ -56,8 +56,8 @@ public:
     bool useSpecificConfigFile() const;
     void setUseSpecificConfigFile(bool useSpecificConfigFile);
 
-    Utils::FileName specificConfigFile() const;
-    void setSpecificConfigFile(const Utils::FileName &specificConfigFile);
+    Utils::FilePath specificConfigFile() const;
+    void setSpecificConfigFile(const Utils::FilePath &specificConfigFile);
 
     bool useHomeFile() const;
     void setUseHomeFile(bool useHomeFile);
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp
index e2d2488224..f6a36eadc0 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp
@@ -144,8 +144,8 @@ QString Uncrustify::configurationFile() const
     if (m_settings.useOtherFiles()) {
         if (const ProjectExplorer::Project *project
                 = ProjectExplorer::ProjectTree::currentProject()) {
-            const Utils::FileNameList files = project->files(ProjectExplorer::Project::AllFiles);
-            for (const Utils::FileName &file : files) {
+            const Utils::FilePathList files = project->files(ProjectExplorer::Project::AllFiles);
+            for (const Utils::FilePath &file : files) {
                 if (!file.endsWith("cfg"))
                     continue;
                 const QFileInfo fi = file.toFileInfo();
@@ -156,7 +156,7 @@ QString Uncrustify::configurationFile() const
     }
 
     if (m_settings.useSpecificConfigFile()) {
-        const Utils::FileName file = m_settings.specificConfigFile();
+        const Utils::FilePath file = m_settings.specificConfigFile();
         if (file.exists())
             return file.toString();
     }
diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
index 20b134d122..a9c5760ce3 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
@@ -91,12 +91,12 @@ void UncrustifySettings::setUseHomeFile(bool useHomeFile)
     m_settings.insert(USE_HOME_FILE, QVariant(useHomeFile));
 }
 
-Utils::FileName UncrustifySettings::specificConfigFile() const
+Utils::FilePath UncrustifySettings::specificConfigFile() const
 {
-    return Utils::FileName::fromString(m_settings.value(SPECIFIC_CONFIG_FILE_PATH).toString());
+    return Utils::FilePath::fromString(m_settings.value(SPECIFIC_CONFIG_FILE_PATH).toString());
 }
 
-void UncrustifySettings::setSpecificConfigFile(const Utils::FileName &filePath)
+void UncrustifySettings::setSpecificConfigFile(const Utils::FilePath &filePath)
 {
     m_settings.insert(SPECIFIC_CONFIG_FILE_PATH, QVariant(filePath.toString()));
 }
diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.h b/src/plugins/beautifier/uncrustify/uncrustifysettings.h
index 8b21db84f9..07798ef1e1 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifysettings.h
+++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.h
@@ -60,8 +60,8 @@ public:
 
     void updateVersion() override;
 
-    Utils::FileName specificConfigFile() const;
-    void setSpecificConfigFile(const Utils::FileName &filePath);
+    Utils::FilePath specificConfigFile() const;
+    void setSpecificConfigFile(const Utils::FilePath &filePath);
 
     bool useSpecificConfigFile() const;
     void setUseSpecificConfigFile(bool useConfigFile);