From 4e4916ce35c839f984829510d6634e53f4366611 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 3 Feb 2020 17:54:41 +0100
Subject: [PATCH] VcsBase: Use settings instead of client when it suffices

Change-Id: I145659d3c423361e87c92e8995fa3476d798cc7b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/subversion/subversionclient.cpp         | 4 ++--
 src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp | 5 +++--
 src/plugins/vcsbase/vcsbasediffeditorcontroller.h   | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index 8159bfa5964..020ec0b7d30 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -218,7 +218,7 @@ void SubversionDiffEditorController::requestDescription()
     m_state = GettingDescription;
 
     QStringList args(QLatin1String("log"));
-    args << SubversionClient::addAuthenticationOptions(client()->settings());
+    args << SubversionClient::addAuthenticationOptions(settings());
     args << QLatin1String("-r");
     args << QString::number(m_changeNumber);
     runCommand(QList<QStringList>() << args, VcsCommand::SshPasswordPrompt);
@@ -230,7 +230,7 @@ void SubversionDiffEditorController::requestDiff()
 
     QStringList args;
     args << QLatin1String("diff");
-    args << SubversionClient::addAuthenticationOptions(client()->settings());
+    args << SubversionClient::addAuthenticationOptions(settings());
     args << QLatin1String("--internal-diff");
     if (ignoreWhitespace())
         args << QLatin1String("-x") << QLatin1String("-uw");
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
index 30946aee132..56ed66132c0 100644
--- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
+++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
@@ -26,6 +26,7 @@
 #include "vcsbasediffeditorcontroller.h"
 #include "vcsbaseclient.h"
 #include "vcscommand.h"
+#include "vcsbaseclientsettings.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
@@ -272,9 +273,9 @@ void VcsBaseDiffEditorController::processCommandOutput(const QString &output)
     d->processDiff(output);
 }
 
-VcsBaseClientImpl *VcsBaseDiffEditorController::client() const
+const VcsBaseClientSettings &VcsBaseDiffEditorController::settings() const
 {
-    return d->m_client;
+    return d->m_client->settings();
 }
 
 QString VcsBaseDiffEditorController::workingDirectory() const
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
index 8b4668dbf05..c0bd12173e2 100644
--- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
+++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
@@ -33,6 +33,7 @@ namespace Core { class IDocument; }
 namespace VcsBase {
 
 class VcsBaseClientImpl;
+class VcsBaseClientSettings;
 class VcsBaseDiffEditorControllerPrivate;
 
 class VCSBASE_EXPORT VcsBaseDiffEditorController : public DiffEditor::DiffEditorController
@@ -49,7 +50,7 @@ protected:
     void runCommand(const QList<QStringList> &args, unsigned flags, QTextCodec *codec = nullptr);
     virtual void processCommandOutput(const QString &output);
 
-    VcsBaseClientImpl *client() const;
+    const VcsBaseClientSettings &settings() const;
     QString workingDirectory() const;
     void setStartupFile(const QString &startupFile);
     QString startupFile() const;