Fix compile after FileName drop

Amends 44acfc0702.

Change-Id: I1bddb0642e181b0a02d4ecba7ff1ae282218338f
Reviewed-by: hjk <hjk@qt.io>

src/plugins/baremetal/iarewtoolchain.cpp

@@ -433,7 +433,7 @@ QList<ToolChain *> IarToolChainFactory::autoDetect(const QList<ToolChain *> &alr
                     if (!compilerPath.isEmpty()) {
                         // Build full compiler path.
                         compilerPath += entry.subExePath;
-                        const FileName fn = FileName::fromString(compilerPath);
+                        const FilePath fn = FilePath::fromString(compilerPath);
                         if (compilerExists(fn)) {
                             // Note: threeLevelKey is a guessed toolchain version.
                             candidates.push_back({fn, threeLevelKey});

src/plugins/clangformat/clangformatplugin.cpp

@@ -135,7 +135,7 @@ bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorS
                     const QString fileName = openClangFormatConfigAction->data().toString();
                     if (!fileName.isEmpty()) {
                         const QString clangFormatConfigPath = configForFile(
-                            Utils::FileName::fromString(fileName));
+                            Utils::FilePath::fromString(fileName));
                         Core::EditorManager::openEditor(clangFormatConfigPath);
                     }
                 });

src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp

@@ -430,7 +430,7 @@ Utils::FilePath CompilationDatabaseProject::rootPathFromSettings() const
 #ifdef WITH_TESTS
     return Utils::FilePath::fromString(projectDirectory().fileName());
 #else
-    return Utils::FileName::fromString(
+    return Utils::FilePath::fromString(
         namedSettings(ProjectExplorer::Constants::PROJECT_ROOT_PATH_KEY).toString());
 #endif
 }

tests/auto/utils/settings/tst_settings.cpp

@@ -602,7 +602,7 @@ void tst_SettingsAccessor::findIssues_ok()
 {
     const TestSettingsAccessor accessor;
     const QVariantMap data = versionedMap(6, TESTACCESSOR_DEFAULT_ID);
-    const Utils::FileName path = Utils::FileName::fromString("/foo/baz.user");
+    const Utils::FilePath path = Utils::FilePath::fromString("/foo/baz.user");
 
     const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path);
 
@@ -613,7 +613,7 @@ void tst_SettingsAccessor::findIssues_emptyData()
 {
     const TestSettingsAccessor accessor;
     const QVariantMap data;
-    const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user");
+    const Utils::FilePath path = Utils::FilePath::fromString("/foo/bar.user");
 
     const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path);
 
@@ -624,7 +624,7 @@ void tst_SettingsAccessor::findIssues_tooNew()
 {
     const TestSettingsAccessor accessor;
     const QVariantMap data = versionedMap(42, TESTACCESSOR_DEFAULT_ID);
-    const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user");
+    const Utils::FilePath path = Utils::FilePath::fromString("/foo/bar.user");
 
     const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path);
 
@@ -635,7 +635,7 @@ void tst_SettingsAccessor::findIssues_tooOld()
 {
     const TestSettingsAccessor accessor;
     const QVariantMap data = versionedMap(2, TESTACCESSOR_DEFAULT_ID);
-    const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user");
+    const Utils::FilePath path = Utils::FilePath::fromString("/foo/bar.user");
 
     const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path);
 
@@ -646,7 +646,7 @@ void tst_SettingsAccessor::findIssues_wrongId()
 {
     const TestSettingsAccessor accessor;
     const QVariantMap data = versionedMap(6, "foo");
-    const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user");
+    const Utils::FilePath path = Utils::FilePath::fromString("/foo/bar.user");
 
     const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path);
 
@@ -657,7 +657,7 @@ void tst_SettingsAccessor::findIssues_nonDefaultPath()
 {
     const TestSettingsAccessor accessor;
     const QVariantMap data = versionedMap(6, TESTACCESSOR_DEFAULT_ID);
-    const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user.foobar");
+    const Utils::FilePath path = Utils::FilePath::fromString("/foo/bar.user.foobar");
 
     const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path);
 

tests/unit/mockup/projectexplorer/buildconfiguration.h

@@ -32,6 +32,6 @@ namespace ProjectExplorer {
 class BuildConfiguration
 {
 public:
-    Utils::FileName buildDirectory() const { return {}; }
+    Utils::FilePath buildDirectory() const { return {}; }
 }; // namespace Target
 } // namespace ProjectExplorer

tests/unit/mockup/projectexplorer/kitinformation.h

@@ -34,7 +34,7 @@ class Kit;
 class SysRootKitInformation
 {
 public:
-    static Utils::FileName sysRoot(const Kit *) { return Utils::FileName(); }
+    static Utils::FilePath sysRoot(const Kit *) { return Utils::FilePath(); }
 };
 
 } // namespace ProjectExplorer

tests/unit/mockup/projectexplorer/project.h

@@ -37,16 +37,16 @@ class Project : public QObject {
 public:
     Project() = default;
 
-    Utils::FileName projectDirectory() const { return {}; }
+    Utils::FilePath projectDirectory() const { return {}; }
 
-    Utils::FileName rootProjectDirectory() const { return rootProjectDirectoryPath; }
+    Utils::FilePath rootProjectDirectory() const { return rootProjectDirectoryPath; }
 
     Target *activeTarget() const { return {}; }
 
     QVariant namedSettings(const QString &name) const { return settings.at(name); }
     void setNamedSettings(const QString &name, const QVariant &value) { settings[name] = value; }
 
-    Utils::FileName rootProjectDirectoryPath;
+    Utils::FilePath rootProjectDirectoryPath;
     mutable std::map<QString, QVariant> settings;
 };
 } // namespace ProjectExplorer