From 85d9756c006dd5020fce07194b58157cd35626a2 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 3 Feb 2020 17:54:41 +0100 Subject: 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 --- src/plugins/cvs/cvsplugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/cvs') 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; -- cgit v1.2.3