Use new FilePathAspect in a few more places

Change-Id: I910a802255c8d54a31313dcccb0d1a48ec577b7a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

7 files changed, 11 insertions, 16 deletions

diff --git a/src/plugins/conan/conaninstallstep.cpp b/src/plugins/conan/conaninstallstep.cpp
index d0c2ef5bac..c1957cc976 100644
--- a/src/plugins/conan/conaninstallstep.cpp
+++ b/src/plugins/conan/conaninstallstep.cpp
@@ -68,7 +68,7 @@ ConanInstallStep::ConanInstallStep(BuildStepList *bsl, Id id)
         const QString buildType = bt == BuildConfiguration::Release ? QString("Release")
                                                                     : QString("Debug");
 
-        CommandLine cmd(ConanPlugin::conanSettings()->conanFilePath.filePath());
+        CommandLine cmd(ConanPlugin::conanSettings()->conanFilePath());
         cmd.addArgs({"install", "-s", "build_type=" + buildType});
         if (buildMissing->value())
             cmd.addArg("--build=missing");
diff --git a/src/plugins/conan/conansettings.cpp b/src/plugins/conan/conansettings.cpp
index 6a608b99f8..83e8f38d53 100644
--- a/src/plugins/conan/conansettings.cpp
+++ b/src/plugins/conan/conansettings.cpp
@@ -16,7 +16,6 @@ ConanSettings::ConanSettings()
 
     registerAspect(&conanFilePath);
     conanFilePath.setSettingsKey("ConanFilePath");
-    conanFilePath.setDisplayStyle(StringAspect::PathChooserDisplay);
     conanFilePath.setExpectedKind(PathChooser::ExistingCommand);
     conanFilePath.setDefaultValue(HostOsInfo::withExecutableSuffix("conan"));
 }
diff --git a/src/plugins/conan/conansettings.h b/src/plugins/conan/conansettings.h
index 93e6190839..69a836dcfe 100644
--- a/src/plugins/conan/conansettings.h
+++ b/src/plugins/conan/conansettings.h
@@ -12,7 +12,7 @@ class ConanSettings : public Utils::AspectContainer
 public:
     ConanSettings();
 
-    Utils::StringAspect conanFilePath;
+    Utils::FilePathAspect conanFilePath;
 };
 
 } // Conan::Internal
diff --git a/src/plugins/copilot/copilotplugin.cpp b/src/plugins/copilot/copilotplugin.cpp
index 3acbc70585..61753b29c3 100644
--- a/src/plugins/copilot/copilotplugin.cpp
+++ b/src/plugins/copilot/copilotplugin.cpp
@@ -56,8 +56,8 @@ void CopilotPlugin::extensionsInitialized()
 void CopilotPlugin::restartClient()
 {
     LanguageClient::LanguageClientManager::shutdownClient(m_client);
-    m_client = new CopilotClient(CopilotSettings::instance().nodeJsPath.filePath(),
-                                 CopilotSettings::instance().distPath.filePath());
+    m_client = new CopilotClient(CopilotSettings::instance().nodeJsPath(),
+                                 CopilotSettings::instance().distPath());
 }
 
 } // namespace Internal
diff --git a/src/plugins/copilot/copilotsettings.cpp b/src/plugins/copilot/copilotsettings.cpp
index a566180ac7..202da82488 100644
--- a/src/plugins/copilot/copilotsettings.cpp
+++ b/src/plugins/copilot/copilotsettings.cpp
@@ -36,10 +36,10 @@ CopilotSettings::CopilotSettings()
         return fp.exists();
     });
 
+    registerAspect(&nodeJsPath);
     nodeJsPath.setExpectedKind(PathChooser::ExistingCommand);
     nodeJsPath.setDefaultFilePath(nodeFromPath);
     nodeJsPath.setSettingsKey("Copilot.NodeJsPath");
-    nodeJsPath.setDisplayStyle(StringAspect::PathChooserDisplay);
     nodeJsPath.setLabelText(Tr::tr("Node.js path:"));
     nodeJsPath.setHistoryCompleter("Copilot.NodePath.History");
     nodeJsPath.setDisplayName(Tr::tr("Node.js Path"));
@@ -47,26 +47,23 @@ CopilotSettings::CopilotSettings()
         Tr::tr("Select path to node.js executable. See https://nodejs.org/de/download/"
                "for installation instructions."));
 
+    registerAspect(&distPath);
     distPath.setExpectedKind(PathChooser::File);
     distPath.setDefaultFilePath(distFromVim);
     distPath.setSettingsKey("Copilot.DistPath");
-    distPath.setDisplayStyle(StringAspect::PathChooserDisplay);
     distPath.setLabelText(Tr::tr("Path to agent.js:"));
+    distPath.setHistoryCompleter("Copilot.DistPath.History");
+    distPath.setDisplayName(Tr::tr("Agent.js path"));
     distPath.setToolTip(Tr::tr(
         "Select path to agent.js in copilot neovim plugin. See "
         "https://github.com/github/copilot.vim#getting-started for installation instructions."));
-    distPath.setHistoryCompleter("Copilot.DistPath.History");
-    distPath.setDisplayName(Tr::tr("Agent.js path"));
 
+    registerAspect(&autoComplete);
     autoComplete.setDisplayName(Tr::tr("Auto Complete"));
     autoComplete.setLabelText(Tr::tr("Request completions automatically"));
     autoComplete.setDefaultValue(true);
     autoComplete.setToolTip(Tr::tr("Automatically request suggestions for the current text cursor "
                                    "position after changes to the document"));
-
-    registerAspect(&nodeJsPath);
-    registerAspect(&distPath);
-    registerAspect(&autoComplete);
 }
 
 } // namespace Copilot
diff --git a/src/plugins/copilot/copilotsettings.h b/src/plugins/copilot/copilotsettings.h
index 44ce178ea5..2337094876 100644
--- a/src/plugins/copilot/copilotsettings.h
+++ b/src/plugins/copilot/copilotsettings.h
@@ -14,8 +14,8 @@ public:
 
     static CopilotSettings &instance();
 
-    Utils::StringAspect nodeJsPath;
-    Utils::StringAspect distPath;
+    Utils::FilePathAspect nodeJsPath;
+    Utils::FilePathAspect distPath;
     Utils::BoolAspect autoComplete;
 };
 
diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp
index 98945ab82e..9bdd07fbf8 100644
--- a/src/plugins/subversion/subversionsettings.cpp
+++ b/src/plugins/subversion/subversionsettings.cpp
@@ -33,7 +33,6 @@ SubversionSettings::SubversionSettings()
     setSettingsGroup("Subversion");
 
     registerAspect(&binaryPath);
-    binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay);
     binaryPath.setExpectedKind(PathChooser::ExistingCommand);
     binaryPath.setHistoryCompleter("Subversion.Command.History");
     binaryPath.setDefaultValue("svn" QTC_HOST_EXE_SUFFIX);