Vcs: Use new FilePathAspect in a few places

Change-Id: Idc23616dd3b7bc21301471cb48e2893116b83f0d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

12 files changed, 15 insertions, 19 deletions

diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 110e990447..d992d70eba 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -871,7 +871,7 @@ bool BazaarPluginPrivate::managesFile(const FilePath &workingDirectory, const QS
 
 bool BazaarPluginPrivate::isConfigured() const
 {
-    const FilePath binary = settings().binaryPath.filePath();
+    const FilePath binary = settings().binaryPath();
     return !binary.isEmpty() && binary.isExecutableFile();
 }
 
diff --git a/src/plugins/bazaar/bazaarsettings.cpp b/src/plugins/bazaar/bazaarsettings.cpp
index 231562edc1..1b2840084c 100644
--- a/src/plugins/bazaar/bazaarsettings.cpp
+++ b/src/plugins/bazaar/bazaarsettings.cpp
@@ -33,7 +33,6 @@ BazaarSettings::BazaarSettings()
     setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
 
     registerAspect(&binaryPath);
-    binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay);
     binaryPath.setExpectedKind(PathChooser::ExistingCommand);
     binaryPath.setDefaultValue(Constants::BAZAARDEFAULT);
     binaryPath.setDisplayName(Tr::tr("Bazaar Command"));
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 076f2ad8b2..d9980328fc 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -366,7 +366,7 @@ bool CvsPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &filePath) con
 
 bool CvsPluginPrivate::isConfigured() const
 {
-    const FilePath binary = settings().binaryPath.filePath();
+    const FilePath binary = settings().binaryPath();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
@@ -439,7 +439,7 @@ VcsCommand *CvsPluginPrivate::createInitialCheckoutCommand(const QString &url,
 
     auto command = VcsBaseClient::createVcsCommand(baseDirectory, Environment::systemEnvironment());
     command->setDisplayName(Tr::tr("CVS Checkout"));
-    command->addJob({settings().binaryPath.filePath(), settings().addOptions(args)}, -1);
+    command->addJob({settings().binaryPath(), settings().addOptions(args)}, -1);
     return command;
 }
 
@@ -1321,7 +1321,7 @@ CommandResult CvsPluginPrivate::runCvs(const FilePath &workingDirectory,
                                        const QStringList &arguments, RunFlags flags,
                                        QTextCodec *outputCodec, int timeoutMultiplier) const
 {
-    const FilePath executable = settings().binaryPath.filePath();
+    const FilePath executable = settings().binaryPath();
     if (executable.isEmpty())
         return CommandResult(ProcessResult::StartFailed, Tr::tr("No CVS executable specified."));
 
diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp
index f18feeed66..dbfd41e500 100644
--- a/src/plugins/cvs/cvssettings.cpp
+++ b/src/plugins/cvs/cvssettings.cpp
@@ -35,7 +35,6 @@ CvsSettings::CvsSettings()
 
     registerAspect(&binaryPath);
     binaryPath.setDefaultValue("cvs" QTC_HOST_EXE_SUFFIX);
-    binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay);
     binaryPath.setExpectedKind(PathChooser::ExistingCommand);
     binaryPath.setHistoryCompleter(QLatin1String("Cvs.Command.History"));
     binaryPath.setDisplayName(Tr::tr("CVS Command"));
diff --git a/src/plugins/fossil/fossilsettings.cpp b/src/plugins/fossil/fossilsettings.cpp
index ca24802114..b72f6b7623 100644
--- a/src/plugins/fossil/fossilsettings.cpp
+++ b/src/plugins/fossil/fossilsettings.cpp
@@ -34,7 +34,6 @@ FossilSettings::FossilSettings()
     setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
 
     registerAspect(&binaryPath);
-    binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay);
     binaryPath.setExpectedKind(PathChooser::ExistingCommand);
     binaryPath.setDefaultValue(Constants::FOSSILDEFAULT);
     binaryPath.setDisplayName(Tr::tr("Fossil Command"));
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 20e4d3745d..6a0c2574d4 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -428,7 +428,7 @@ void MercurialClient::requestReload(const QString &documentId, const FilePath &s
     IDocument *document = DiffEditorController::findOrCreateDocument(documentId, title);
     QTC_ASSERT(document, return);
     auto controller = new MercurialDiffEditorController(document, args);
-    controller->setVcsBinary(settings().binaryPath.filePath());
+    controller->setVcsBinary(settings().binaryPath());
     controller->setProcessEnvironment(processEnvironment());
     controller->setWorkingDirectory(workingDirectory);
 
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index a6bd955c3a..05b3524b4d 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -715,7 +715,7 @@ bool MercurialPluginPrivate::managesFile(const FilePath &workingDirectory, const
 
 bool MercurialPluginPrivate::isConfigured() const
 {
-    const FilePath binary = settings().binaryPath.filePath();
+    const FilePath binary = settings().binaryPath();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
diff --git a/src/plugins/mercurial/mercurialsettings.cpp b/src/plugins/mercurial/mercurialsettings.cpp
index dd63faddc0..0b84187b1b 100644
--- a/src/plugins/mercurial/mercurialsettings.cpp
+++ b/src/plugins/mercurial/mercurialsettings.cpp
@@ -34,7 +34,6 @@ MercurialSettings::MercurialSettings()
     setAutoApply(false);
 
     registerAspect(&binaryPath);
-    binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay);
     binaryPath.setExpectedKind(PathChooser::ExistingCommand);
     binaryPath.setDefaultValue(Constants::MERCURIALDEFAULT);
     binaryPath.setDisplayName(Tr::tr("Mercurial Command"));
diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index b81656f145..3146f066d6 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -240,7 +240,7 @@ SubversionDiffEditorController *SubversionClient::findOrCreateDiffEditor(const Q
                 DiffEditorController::controller(document));
     if (!controller) {
         controller = new SubversionDiffEditorController(document);
-        controller->setVcsBinary(settings.binaryPath.filePath());
+        controller->setVcsBinary(settings.binaryPath());
         controller->setProcessEnvironment(processEnvironment());
         controller->setWorkingDirectory(workingDirectory);
     }
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 957947a89a..5cb7475edb 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -638,7 +638,7 @@ void SubversionPluginPrivate::revertAll()
                              QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
         return;
     // NoteL: Svn "revert ." doesn not work.
-    CommandLine args{settings().binaryPath.filePath(), {"revert"}};
+    CommandLine args{settings().binaryPath(), {"revert"}};
     args << SubversionClient::AddAuthOptions();
     args << QLatin1String("--recursive") << state.topLevel().toString();
     const auto revertResponse = runSvn(state.topLevel(), args, RunFlags::ShowStdOut);
@@ -655,7 +655,7 @@ void SubversionPluginPrivate::revertCurrentFile()
     const VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasFile(), return);
 
-    CommandLine diffArgs{settings().binaryPath.filePath(), {"diff"}};
+    CommandLine diffArgs{settings().binaryPath(), {"diff"}};
     diffArgs << SubversionClient::AddAuthOptions();
     diffArgs << SubversionClient::escapeFile(state.relativeCurrentFile());
 
@@ -673,7 +673,7 @@ void SubversionPluginPrivate::revertCurrentFile()
     FileChangeBlocker fcb(state.currentFile());
 
     // revert
-    CommandLine args{settings().binaryPath.filePath(), {"revert"}};
+    CommandLine args{settings().binaryPath(), {"revert"}};
     args << SubversionClient::AddAuthOptions();
     args << SubversionClient::escapeFile(state.relativeCurrentFile());
 
@@ -734,7 +734,7 @@ void SubversionPluginPrivate::startCommit(const FilePath &workingDir, const QStr
         return;
     }
 
-    CommandLine args{settings().binaryPath.filePath(), {"status"}};
+    CommandLine args{settings().binaryPath(), {"status"}};
     args << SubversionClient::AddAuthOptions();
     args << SubversionClient::escapeFiles(files);
 
@@ -813,7 +813,7 @@ void SubversionPluginPrivate::svnStatus(const FilePath &workingDir, const QStrin
 {
     const VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasTopLevel(), return);
-    CommandLine args{settings().binaryPath.filePath(), {"status"}};
+    CommandLine args{settings().binaryPath(), {"status"}};
     args << SubversionClient::AddAuthOptions();
     if (!relativePath.isEmpty())
         args << SubversionClient::escapeFile(relativePath);
@@ -839,7 +839,7 @@ void SubversionPluginPrivate::updateProject()
 
 void SubversionPluginPrivate::svnUpdate(const FilePath &workingDir, const QString &relativePath)
 {
-    CommandLine args{settings().binaryPath.filePath(), {"update"}};
+    CommandLine args{settings().binaryPath(), {"update"}};
     args << SubversionClient::AddAuthOptions();
     args << Constants::NON_INTERACTIVE_OPTION;
     if (!relativePath.isEmpty())
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 9bd83df3c3..ffa19b24f7 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -69,7 +69,7 @@ VcsBaseSettings &VcsBaseClientImpl::settings() const
 
 FilePath VcsBaseClientImpl::vcsBinary() const
 {
-    return m_baseSettings->binaryPath.filePath();
+    return m_baseSettings->binaryPath();
 }
 
 VcsCommand *VcsBaseClientImpl::createCommand(const FilePath &workingDirectory,
diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.h b/src/plugins/vcsbase/vcsbaseclientsettings.h
index 9a034e5f92..ec5ad3aab0 100644
--- a/src/plugins/vcsbase/vcsbaseclientsettings.h
+++ b/src/plugins/vcsbase/vcsbaseclientsettings.h
@@ -15,7 +15,7 @@ public:
     VcsBaseSettings();
     ~VcsBaseSettings();
 
-    Utils::StringAspect binaryPath;
+    Utils::FilePathAspect binaryPath;
     Utils::StringAspect userName;
     Utils::StringAspect userEmail;
     Utils::IntegerAspect logCount;