diff options
| author | hjk <hjk@qt.io> | 2020-02-03 17:54:41 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-02-03 17:30:03 +0000 |
| commit | 4e4916ce35c839f984829510d6634e53f4366611 (patch) | |
| tree | 9bb5df3a2cd95b48c9cdee2d36ae0081b2748688 /src/plugins/vcsbase | |
| parent | b23dc3a0bf963629b6244b0a752cf284ca6fbe61 (diff) | |
VcsBase: Use settings instead of client when it suffices
Change-Id: I145659d3c423361e87c92e8995fa3476d798cc7b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/vcsbase/vcsbasediffeditorcontroller.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp index 30946aee13..56ed66132c 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 8b4668dbf0..c0bd12173e 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; |