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 <orgads@gmail.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index d56e39534f..f3c2d35c00 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -101,13 +101,13 @@ public:
     }
 };
 
-BazaarClient::BazaarClient() : VcsBaseClient(new BazaarSettings)
+BazaarClient::BazaarClient(BazaarSettings *settings) : VcsBaseClient(settings)
 {
-    setDiffConfigCreator([this](QToolBar *toolBar) {
-        return new BazaarDiffConfig(settings(), toolBar);
+    setDiffConfigCreator([settings](QToolBar *toolBar) {
+        return new BazaarDiffConfig(*settings, toolBar);
     });
-    setLogConfigCreator([this](QToolBar *toolBar) {
-        return new BazaarLogConfig(settings(), toolBar);
+    setLogConfigCreator([settings](QToolBar *toolBar) {
+        return new BazaarLogConfig(*settings, toolBar);
     });
 }
 
diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h
index 78d1ca5b35..5d45dd0c4c 100644
--- a/src/plugins/bazaar/bazaarclient.h
+++ b/src/plugins/bazaar/bazaarclient.h
@@ -40,7 +40,7 @@ class BazaarClient : public VcsBase::VcsBaseClient
     Q_OBJECT
 
 public:
-    BazaarClient();
+    explicit BazaarClient(BazaarSettings *settings);
 
     bool synchronousSetUserId();
     BranchInfo synchronousBranchQuery(const QString &repositoryRoot) const;
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 7db4b212d7..230269b38a 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -162,7 +162,7 @@ BazaarPluginPrivate::BazaarPluginPrivate()
 
     Context context(Constants::BAZAAR_CONTEXT);
 
-    m_client = new BazaarClient;
+    m_client = new BazaarClient(&m_bazaarSettings);
     auto vcsCtrl = new BazaarControl(m_client);
     initializeVcs(vcsCtrl, context);