From e0072ec165fc12c45718b154512a3268ae66a818 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 24 Jan 2020 10:13:02 +0100 Subject: Vcs: Move settings ownership from VcsBaseClientImpl to plugin Turns out CVS and Bazaar already had an unused copy there... Change-Id: I512c4d6322620e2b55d9008600ac676ce09032aa Reviewed-by: Orgad Shaneh --- src/plugins/mercurial/mercurialclient.cpp | 2 +- src/plugins/mercurial/mercurialclient.h | 2 +- src/plugins/mercurial/mercurialplugin.cpp | 2 +- src/plugins/mercurial/mercurialplugin.h | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/plugins/mercurial') diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 92037899f68..a9ecc54a005 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -141,7 +141,7 @@ public: ///////////////////////////////////////////////////////////// -MercurialClient::MercurialClient() : VcsBaseClient(new MercurialSettings) +MercurialClient::MercurialClient(MercurialSettings *settings) : VcsBaseClient(settings) { } diff --git a/src/plugins/mercurial/mercurialclient.h b/src/plugins/mercurial/mercurialclient.h index ce317dcfa91..4722a4f3b54 100644 --- a/src/plugins/mercurial/mercurialclient.h +++ b/src/plugins/mercurial/mercurialclient.h @@ -40,7 +40,7 @@ class MercurialClient : public VcsBase::VcsBaseClient { Q_OBJECT public: - MercurialClient(); + explicit MercurialClient(MercurialSettings *settings); bool synchronousClone(const QString &workingDir, const QString &srcLocation, diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 4e6296228d7..062c3d79d8c 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -140,7 +140,7 @@ MercurialPluginPrivate::MercurialPluginPrivate() dd = this; Core::Context context(Constants::MERCURIAL_CONTEXT); - m_client = new MercurialClient; + m_client = new MercurialClient(&m_settings); auto vc = new MercurialControl(m_client); initializeVcs(vc, context); diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h index 8964ba4e716..923fa6b842f 100644 --- a/src/plugins/mercurial/mercurialplugin.h +++ b/src/plugins/mercurial/mercurialplugin.h @@ -111,6 +111,7 @@ private: void createRepositoryActions(const Core::Context &context); // Variables + MercurialSettings m_settings; OptionsPage *optionsPage = nullptr; MercurialClient *m_client = nullptr; -- cgit v1.2.3