aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2021-03-19 14:19:16 +0100
committerhjk <[email protected]>2021-03-22 09:34:52 +0000
commitce85282866dcd714d0eb4fca234268a8c86e5b61 (patch)
tree4ad29ba94b3613e06d79140631fe35516a6e7890 /src/plugins/git/gitclient.cpp
parent62974b0ad9011ec26770f5b012484bb6a1b2738f (diff)
VcsBase: Remove VcsBaseClientSettings
It's replaced by VcsBaseSettings. Change-Id: I60a0e4e267337f71e8a32b9b220565b765c973b1 Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r--src/plugins/git/gitclient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 5f9436692b6..c9da36cc749 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -784,7 +784,7 @@ static inline void msgCannotRun(const QStringList &args, const QString &workingD
// ---------------- GitClient
GitClient::GitClient(GitSettings *settings)
- : VcsBase::VcsBaseClientImpl(nullptr, settings)
+ : VcsBase::VcsBaseClientImpl(settings)
{
m_instance = this;
m_gitQtcEditor = QString::fromLatin1("\"%1\" -client -block -pid %2")
@@ -799,7 +799,7 @@ GitClient *GitClient::instance()
GitSettings &GitClient::settings()
{
- return static_cast<GitSettings &>(m_instance->baseSettings());
+ return static_cast<GitSettings &>(m_instance->VcsBaseClientImpl::settings());
}
QString GitClient::findRepositoryForDirectory(const QString &directory) const