diff options
author | hjk <hjk@qt.io> | 2020-02-03 17:54:41 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-02-04 07:11:41 +0000 |
commit | 85d9756c006dd5020fce07194b58157cd35626a2 (patch) | |
tree | a95f2597839af1d7e822710b931cb4de8e3b4ab4 /src/plugins/cvs | |
parent | 481a00c298f4aa3348ca034a74defcf95f07d0c4 (diff) |
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>
Diffstat (limited to 'src/plugins/cvs')
-rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; |