From 01e4f573e812c9c855a11d0cb199f9d9bed8de49 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 24 Jan 2020 09:36:10 +0100
Subject: [PATCH] VcsBase: Un-pimpl VcsBaseClientImpl

Not helpful for a single pointer.

Change-Id: Id5cfdb67533ca1852d5594d25689b2e46baca992
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/vcsbase/vcsbaseclient.cpp | 25 +++----------------------
 src/plugins/vcsbase/vcsbaseclient.h   |  2 +-
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index c91ca35a025..25358a761ee 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -73,41 +73,22 @@ static Core::IEditor *locateEditor(const char *property, const QString &entry)
 
 namespace VcsBase {
 
-class VcsBaseClientImplPrivate
-{
-public:
-    VcsBaseClientImplPrivate(VcsBaseClientSettings *settings);
-    ~VcsBaseClientImplPrivate();
-
-    VcsBaseClientSettings *m_clientSettings;
-};
-
-VcsBaseClientImplPrivate::VcsBaseClientImplPrivate(VcsBaseClientSettings *settings) :
+VcsBaseClientImpl::VcsBaseClientImpl(VcsBaseClientSettings *settings) :
     m_clientSettings(settings)
 {
     m_clientSettings->readSettings(Core::ICore::settings());
-}
-
-VcsBaseClientImplPrivate::~VcsBaseClientImplPrivate()
-{
-    delete m_clientSettings;
-}
-
-VcsBaseClientImpl::VcsBaseClientImpl(VcsBaseClientSettings *settings) :
-    d(new VcsBaseClientImplPrivate(settings))
-{
     connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested,
             this, &VcsBaseClientImpl::saveSettings);
 }
 
 VcsBaseClientImpl::~VcsBaseClientImpl()
 {
-    delete d;
+    delete m_clientSettings;
 }
 
 VcsBaseClientSettings &VcsBaseClientImpl::settings() const
 {
-    return *d->m_clientSettings;
+    return *m_clientSettings;
 }
 
 FilePath VcsBaseClientImpl::vcsBinary() const
diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h
index 96e9ca5e40c..463a4ee9394 100644
--- a/src/plugins/vcsbase/vcsbaseclient.h
+++ b/src/plugins/vcsbase/vcsbaseclient.h
@@ -129,7 +129,7 @@ protected:
 private:
     void saveSettings();
 
-    VcsBaseClientImplPrivate *d;
+    VcsBaseClientSettings *m_clientSettings;
 };
 
 class VCSBASE_EXPORT VcsBaseClient : public VcsBaseClientImpl