VcsBase: More use of settings instead of client when it suffices

Client::vcsBinary() maps directly to Settings::binaryPath()
except for git can be replaced by that in non-generic settings.

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

4 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index eebe182442..7e14db5186 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -850,7 +850,7 @@ bool BazaarPluginPrivate::managesFile(const QString &workingDirectory, const QSt
 
 bool BazaarPluginPrivate::isConfigured() const
 {
-    const Utils::FilePath binary = m_client.vcsBinary();
+    const Utils::FilePath binary = m_settings.binaryPath();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 03d03a7b98..17a18c1d02 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -375,7 +375,7 @@ bool CvsPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) con
 
 bool CvsPluginPrivate::isConfigured() const
 {
-    const Utils::FilePath binary = m_client->vcsBinary();
+    const Utils::FilePath binary = m_settings.binaryPath();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
@@ -454,7 +454,7 @@ Core::ShellCommand *CvsPluginPrivate::createInitialCheckoutCommand(const QString
     auto command = new VcsBase::VcsCommand(baseDirectory.toString(),
                                            QProcessEnvironment::systemEnvironment());
     command->setDisplayName(tr("CVS Checkout"));
-    command->addJob({m_client->vcsBinary(), m_settings.addOptions(args)}, -1);
+    command->addJob({m_settings.binaryPath(), m_settings.addOptions(args)}, -1);
     return command;
 }
 
@@ -1413,7 +1413,7 @@ CvsResponse CvsPluginPrivate::runCvs(const QString &workingDirectory,
                               unsigned flags,
                               QTextCodec *outputCodec) const
 {
-    const FilePath executable = m_client->vcsBinary();
+    const FilePath executable = m_settings.binaryPath();
     CvsResponse response;
     if (executable.isEmpty()) {
         response.result = CvsResponse::OtherError;
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 693cedc821..8a905e2425 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -749,7 +749,7 @@ bool MercurialPluginPrivate::managesFile(const QString &workingDirectory, const
 
 bool MercurialPluginPrivate::isConfigured() const
 {
-    const Utils::FilePath binary = m_client.vcsBinary();
+    const Utils::FilePath binary = m_settings.binaryPath();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
@@ -822,7 +822,7 @@ Core::ShellCommand *MercurialPluginPrivate::createInitialCheckoutCommand(const Q
     args << QLatin1String("clone") << extraArgs << url << localName;
     auto command = new VcsBase::VcsCommand(baseDirectory.toString(),
                                            m_client.processEnvironment());
-    command->addJob({m_client.vcsBinary(), args}, -1);
+    command->addJob({m_settings.binaryPath(), args}, -1);
     return command;
 }
 
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index c489977a5b..dbdc47fd06 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -1018,7 +1018,7 @@ SubversionResponse SubversionPluginPrivate::runSvn(const QString &workingDir,
                                             QTextCodec *outputCodec) const
 {
     SubversionResponse response;
-    if (m_client->vcsBinary().isEmpty()) {
+    if (m_settings.binaryPath().isEmpty()) {
         response.error = true;
         response.message =tr("No subversion executable specified.");
         return response;
@@ -1029,7 +1029,7 @@ SubversionResponse SubversionPluginPrivate::runSvn(const QString &workingDir,
 
     response.error = sp_resp.result != SynchronousProcessResponse::Finished;
     if (response.error)
-        response.message = sp_resp.exitMessage(m_client->vcsBinary().toString(), timeOutS);
+        response.message = sp_resp.exitMessage(m_settings.binaryPath().toString(), timeOutS);
     response.stdErr = sp_resp.stdErr();
     response.stdOut = sp_resp.stdOut();
     return response;
@@ -1222,7 +1222,7 @@ bool SubversionPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileNa
 
 bool SubversionPluginPrivate::isConfigured() const
 {
-    const Utils::FilePath binary = m_client->vcsBinary();
+    const Utils::FilePath binary = m_settings.binaryPath();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
@@ -1296,7 +1296,7 @@ Core::ShellCommand *SubversionPluginPrivate::createInitialCheckoutCommand(const
     args << extraArgs << url << localName;
 
     auto command = new VcsBase::VcsCommand(baseDirectory.toString(), m_client->processEnvironment());
-    command->addJob({m_client->vcsBinary(), args}, -1);
+    command->addJob({m_settings.binaryPath(), args}, -1);
     return command;
 }