Subversion: Make settings page a value member in the plugin pimpl

No need for the indirection anymore.

Change-Id: Ib9ae5a28a02a93cb709be587f833ac2474e7d6cf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

3 files changed, 4 insertions, 5 deletions

diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp
index 9a31ce1810..e714dfcde9 100644
--- a/src/plugins/subversion/settingspage.cpp
+++ b/src/plugins/subversion/settingspage.cpp
@@ -102,8 +102,7 @@ void SubversionSettingsPageWidget::apply()
     m_onApply();
 }
 
-SubversionSettingsPage::SubversionSettingsPage(const std::function<void()> &onApply, SubversionSettings *settings, QObject *parent) :
-    Core::IOptionsPage(parent)
+SubversionSettingsPage::SubversionSettingsPage(const std::function<void()> &onApply, SubversionSettings *settings)
 {
     setId(VcsBase::Constants::VCS_ID_SUBVERSION);
     setDisplayName(SubversionSettingsPageWidget::tr("Subversion"));
diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h
index d4dad730b1..9778dfb2c4 100644
--- a/src/plugins/subversion/settingspage.h
+++ b/src/plugins/subversion/settingspage.h
@@ -35,7 +35,7 @@ class SubversionSettings;
 class SubversionSettingsPage final : public Core::IOptionsPage
 {
 public:
-    SubversionSettingsPage(const std::function<void()> &onApply, SubversionSettings *settings, QObject *parent);
+    SubversionSettingsPage(const std::function<void()> &onApply, SubversionSettings *settings);
 };
 
 } // namespace Subversion
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index d1577daaf8..1193cb1e03 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -320,6 +320,8 @@ private:
 
     QAction *m_menuAction = nullptr;
     bool m_submitActionTriggered = false;
+
+    SubversionSettingsPage m_settingsPage{[this] { configurationChanged(); }, &m_settings};
 };
 
 
@@ -386,8 +388,6 @@ SubversionPluginPrivate::SubversionPluginPrivate()
     using namespace Core::Constants;
     Context context(SUBVERSION_CONTEXT);
 
-    new SubversionSettingsPage([this] { configurationChanged(); }, &m_settings, this);
-
     new VcsSubmitEditorFactory(&submitParameters,
         []() { return new SubversionSubmitEditor(&submitParameters); }, this);