Vcs: Drop VcsBaseOptionsPage hierarchy level

Adapt the remaining users: Cvs,Git,Svn.

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

src/plugins/git/gitplugin.cpp

@@ -325,9 +325,16 @@ GitPluginPrivate::GitPluginPrivate()
     initializeVcs(vc, context);
 
     // Create the settings Page
-    auto settingsPage = new SettingsPage(vc, &m_settings, this);
-    connect(settingsPage, &SettingsPage::settingsChanged,
-            this, &GitPluginPrivate::updateRepositoryBrowserAction);
+    auto onApply = [this, vc] {
+        vc->configurationChanged();
+        updateRepositoryBrowserAction();
+        bool gitFoundOk;
+        QString errorMessage;
+        m_settings.gitExecutable(&gitFoundOk, &errorMessage);
+        if (!gitFoundOk)
+            Core::AsynchronousMessageBox::warning(tr("Git Settings"), errorMessage);
+    };
+    new GitSettingsPage(&m_settings, onApply, this);
 
     new GitGrep(this);
     m_branchViewFactory = new BranchViewFactory;

src/plugins/git/gitsettings.cpp

@@ -92,11 +92,5 @@ Utils::FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) cons
     return binPath;
 }
 
-GitSettings &GitSettings::operator = (const GitSettings &s)
-{
-    VcsBaseClientSettings::operator =(s);
-    return *this;
-}
-
 } // namespace Internal
 } // namespace Git

src/plugins/git/gitsettings.h

@@ -61,7 +61,7 @@ public:
 
     Utils::FilePath gitExecutable(bool *ok = nullptr, QString *errorMessage = nullptr) const;
 
-    GitSettings &operator = (const GitSettings &s);
+    GitSettings &operator=(const GitSettings &s) = default;
 };
 
 } // namespace Internal

src/plugins/git/settingspage.cpp

@@ -44,23 +44,25 @@ using namespace VcsBase;
 namespace Git {
 namespace Internal {
 
-class SettingsPageWidget final : public VcsBase::VcsClientOptionsPageWidget
+class GitSettingsPageWidget final : public Core::IOptionsPageWidget
 {
     Q_DECLARE_TR_FUNCTIONS(Git::Internal::SettingsPageWidget)
 
 public:
-    SettingsPageWidget();
+    GitSettingsPageWidget(GitSettings *settings, const std::function<void()> &onChange);
 
-    VcsBase::VcsBaseClientSettings settings() const final;
-    void setSettings(const VcsBase::VcsBaseClientSettings &s) final;
+    void apply() final;
 
 private:
     void updateNoteField();
 
+    std::function<void()> m_onChange;
+    GitSettings *m_settings;
     Ui::SettingsPage m_ui;
 };
 
-SettingsPageWidget::SettingsPageWidget()
+GitSettingsPageWidget::GitSettingsPageWidget(GitSettings *settings, const std::function<void()> &onChange)
+    : m_onChange(onChange), m_settings(settings)
 {
     m_ui.setupUi(this);
     if (Utils::HostOsInfo::isWindowsHost()) {
@@ -82,25 +84,9 @@ SettingsPageWidget::SettingsPageWidget()
     m_ui.repBrowserCommandPathChooser->setHistoryCompleter("Git.RepoCommand.History");
     m_ui.repBrowserCommandPathChooser->setPromptDialogTitle(tr("Git Repository Browser Command"));
 
-    connect(m_ui.pathLineEdit, &QLineEdit::textChanged, this, &SettingsPageWidget::updateNoteField);
-}
+    connect(m_ui.pathLineEdit, &QLineEdit::textChanged, this, &GitSettingsPageWidget::updateNoteField);
 
-VcsBaseClientSettings SettingsPageWidget::settings() const
-{
-    GitSettings rc;
-    rc.setValue(GitSettings::pathKey, m_ui.pathLineEdit->text());
-    rc.setValue(GitSettings::logCountKey, m_ui.logCountSpinBox->value());
-    rc.setValue(GitSettings::timeoutKey, m_ui.timeoutSpinBox->value());
-    rc.setValue(GitSettings::pullRebaseKey, m_ui.pullRebaseCheckBox->isChecked());
-    rc.setValue(GitSettings::winSetHomeEnvironmentKey, m_ui.winHomeCheckBox->isChecked());
-    rc.setValue(GitSettings::gitkOptionsKey, m_ui.gitkOptionsLineEdit->text().trimmed());
-    rc.setValue(GitSettings::repositoryBrowserCmd, m_ui.repBrowserCommandPathChooser->path().trimmed());
-
-    return rc;
-}
-
-void SettingsPageWidget::setSettings(const VcsBaseClientSettings &s)
-{
+    GitSettings &s = *m_settings;
     m_ui.pathLineEdit->setText(s.stringValue(GitSettings::pathKey));
     m_ui.logCountSpinBox->setValue(s.intValue(GitSettings::logCountKey));
     m_ui.timeoutSpinBox->setValue(s.intValue(GitSettings::timeoutKey));
@@ -110,7 +96,24 @@ void SettingsPageWidget::setSettings(const VcsBaseClientSettings &s)
     m_ui.repBrowserCommandPathChooser->setPath(s.stringValue(GitSettings::repositoryBrowserCmd));
 }
 
-void SettingsPageWidget::updateNoteField()
+void GitSettingsPageWidget::apply()
+{
+    GitSettings rc = *m_settings;
+    rc.setValue(GitSettings::pathKey, m_ui.pathLineEdit->text());
+    rc.setValue(GitSettings::logCountKey, m_ui.logCountSpinBox->value());
+    rc.setValue(GitSettings::timeoutKey, m_ui.timeoutSpinBox->value());
+    rc.setValue(GitSettings::pullRebaseKey, m_ui.pullRebaseCheckBox->isChecked());
+    rc.setValue(GitSettings::winSetHomeEnvironmentKey, m_ui.winHomeCheckBox->isChecked());
+    rc.setValue(GitSettings::gitkOptionsKey, m_ui.gitkOptionsLineEdit->text().trimmed());
+    rc.setValue(GitSettings::repositoryBrowserCmd, m_ui.repBrowserCommandPathChooser->path().trimmed());
+
+    if (rc != *m_settings) {
+        *m_settings = rc;
+        m_onChange();
+    }
+}
+
+void GitSettingsPageWidget::updateNoteField()
 {
     Utils::Environment env = Utils::Environment::systemEnvironment();
     env.prependOrSetPath(m_ui.pathLineEdit->text());
@@ -123,28 +126,13 @@ void SettingsPageWidget::updateNoteField()
 
 // -------- SettingsPage
 
-SettingsPage::SettingsPage(Core::IVersionControl *control, GitSettings *settings, QObject *parent) :
-    VcsClientOptionsPage(control, settings, parent)
+GitSettingsPage::GitSettingsPage(GitSettings *settings, const std::function<void()> &onChange, QObject *parent) :
+    Core::IOptionsPage(parent)
 {
     setId(VcsBase::Constants::VCS_ID_GIT);
-    setDisplayName(SettingsPageWidget::tr("Git"));
+    setDisplayName(GitSettingsPageWidget::tr("Git"));
     setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
-    setWidgetFactory([] { return new SettingsPageWidget; });
-}
-
-void SettingsPage::apply()
-{
-    VcsClientOptionsPage::apply();
-
-    if (widget()->isVisible()) {
-        const VcsBaseClientSettings settings = widget()->settings();
-        auto rc = static_cast<const GitSettings *>(&settings);
-        bool gitFoundOk;
-        QString errorMessage;
-        rc->gitExecutable(&gitFoundOk, &errorMessage);
-        if (!gitFoundOk)
-            Core::AsynchronousMessageBox::warning(tr("Git Settings"), errorMessage);
-    }
+    setWidgetCreator([settings, onChange] { return new GitSettingsPageWidget(settings, onChange); });
 }
 
 } // namespace Internal

src/plugins/git/settingspage.h

@@ -25,18 +25,17 @@
 
 #pragma once
 
-#include <vcsbase/vcsbaseoptionspage.h>
+#include <coreplugin/dialogs/ioptionspage.h>
 
 namespace Git {
 namespace Internal {
 
 class GitSettings;
 
-class SettingsPage final : public VcsBase::VcsClientOptionsPage
+class GitSettingsPage final : public Core::IOptionsPage
 {
 public:
-    SettingsPage(Core::IVersionControl *control, GitSettings *settings, QObject *parent);
-    void apply() final;
+    GitSettingsPage(GitSettings *settings, const std::function<void()> &onChange, QObject *parent);
 };
 
 } // namespace Internal