Vcs: Pass settings handles to settings pages more directly

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

3 files changed, 6 insertions, 4 deletions

diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp
index 8b72b5ae7a..94b5830ced 100644
--- a/src/plugins/subversion/settingspage.cpp
+++ b/src/plugins/subversion/settingspage.cpp
@@ -96,8 +96,8 @@ void SettingsPageWidget::setSettings(const VcsBaseClientSettings &s)
     m_ui.logCountSpinBox->setValue(s.intValue(SubversionSettings::logCountKey));
 }
 
-SettingsPage::SettingsPage(Core::IVersionControl *control, QObject *parent) :
-    VcsClientOptionsPage(control, SubversionPluginPrivate::instance()->client(), parent)
+SettingsPage::SettingsPage(Core::IVersionControl *control, SubversionSettings *settings, QObject *parent) :
+    VcsClientOptionsPage(control, settings, parent)
 {
     setId(VcsBase::Constants::VCS_ID_SUBVERSION);
     setDisplayName(SettingsPageWidget::tr("Subversion"));
diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h
index 60e1976c24..c8dc438d12 100644
--- a/src/plugins/subversion/settingspage.h
+++ b/src/plugins/subversion/settingspage.h
@@ -30,10 +30,12 @@
 namespace Subversion {
 namespace Internal {
 
+class SubversionSettings;
+
 class SettingsPage final : public VcsBase::VcsClientOptionsPage
 {
 public:
-    SettingsPage(Core::IVersionControl *control, QObject *parent);
+    SettingsPage(Core::IVersionControl *control, SubversionSettings *settings, QObject *parent);
 };
 
 } // namespace Subversion
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 4b83b602f1..733f36e21c 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -231,7 +231,7 @@ SubversionPluginPrivate::SubversionPluginPrivate() :
 
     m_client = new SubversionClient(&m_settings);
 
-    new SettingsPage(versionControl(), this);
+    new SettingsPage(versionControl(), &m_settings, this);
 
     new VcsSubmitEditorFactory(&submitParameters,
         []() { return new SubversionSubmitEditor(&submitParameters); }, this);