Vcs: Base VcsClientOptionsPageWidget on Core::IOptionsPageWidget

In preparation of the using the new ICore::IOptionsPage convenience
functions.

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

12 files changed, 16 insertions, 14 deletions

diff --git a/src/plugins/bazaar/optionspage.cpp b/src/plugins/bazaar/optionspage.cpp
index 877a7e6dc4..a3dc0f4a32 100644
--- a/src/plugins/bazaar/optionspage.cpp
+++ b/src/plugins/bazaar/optionspage.cpp
@@ -37,7 +37,7 @@ using namespace Bazaar::Internal;
 using namespace Bazaar;
 using namespace VcsBase;
 
-OptionsPageWidget::OptionsPageWidget(QWidget *parent) : VcsClientOptionsPageWidget(parent)
+OptionsPageWidget::OptionsPageWidget()
 {
     m_ui.setupUi(this);
     m_ui.commandChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
diff --git a/src/plugins/bazaar/optionspage.h b/src/plugins/bazaar/optionspage.h
index 8a2cd5010f..3465ff6f25 100644
--- a/src/plugins/bazaar/optionspage.h
+++ b/src/plugins/bazaar/optionspage.h
@@ -39,7 +39,7 @@ class OptionsPageWidget : public VcsBase::VcsClientOptionsPageWidget
     Q_OBJECT
 
 public:
-    explicit OptionsPageWidget(QWidget *parent = nullptr);
+    OptionsPageWidget();
 
     VcsBase::VcsBaseClientSettings settings() const override;
     void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp
index cf47b8a8b8..6d5759dd17 100644
--- a/src/plugins/cvs/settingspage.cpp
+++ b/src/plugins/cvs/settingspage.cpp
@@ -42,7 +42,7 @@ using namespace Cvs::Internal;
 using namespace Utils;
 using namespace VcsBase;
 
-SettingsPageWidget::SettingsPageWidget(QWidget *parent) : VcsClientOptionsPageWidget(parent)
+SettingsPageWidget::SettingsPageWidget()
 {
     m_ui.setupUi(this);
     m_ui.commandPathChooser->setExpectedKind(PathChooser::ExistingCommand);
diff --git a/src/plugins/cvs/settingspage.h b/src/plugins/cvs/settingspage.h
index 404146aef9..aac992c4f8 100644
--- a/src/plugins/cvs/settingspage.h
+++ b/src/plugins/cvs/settingspage.h
@@ -39,7 +39,7 @@ class SettingsPageWidget : public VcsBase::VcsClientOptionsPageWidget
     Q_OBJECT
 
 public:
-    explicit SettingsPageWidget(QWidget *parent = nullptr);
+    SettingsPageWidget();
 
     VcsBase::VcsBaseClientSettings settings() const override;
     void setSettings(const VcsBase::VcsBaseClientSettings &) override;
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp
index 9026d0f26f..8a2a047ed5 100644
--- a/src/plugins/git/settingspage.cpp
+++ b/src/plugins/git/settingspage.cpp
@@ -44,7 +44,7 @@ using namespace VcsBase;
 namespace Git {
 namespace Internal {
 
-SettingsPageWidget::SettingsPageWidget(QWidget *parent) : VcsClientOptionsPageWidget(parent)
+SettingsPageWidget::SettingsPageWidget()
 {
     m_ui.setupUi(this);
     if (Utils::HostOsInfo::isWindowsHost()) {
diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h
index e97ae59dec..c6ac3b9c2c 100644
--- a/src/plugins/git/settingspage.h
+++ b/src/plugins/git/settingspage.h
@@ -43,7 +43,7 @@ class SettingsPageWidget : public VcsBase::VcsClientOptionsPageWidget {
     Q_OBJECT
 
 public:
-    explicit SettingsPageWidget(QWidget *parent = nullptr);
+    SettingsPageWidget();
 
     VcsBase::VcsBaseClientSettings settings() const override;
     void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
diff --git a/src/plugins/mercurial/optionspage.cpp b/src/plugins/mercurial/optionspage.cpp
index 06f0ea1bb4..f7d4a0efc4 100644
--- a/src/plugins/mercurial/optionspage.cpp
+++ b/src/plugins/mercurial/optionspage.cpp
@@ -40,7 +40,7 @@ using namespace VcsBase;
 namespace Mercurial {
 namespace Internal  {
 
-OptionsPageWidget::OptionsPageWidget(QWidget *parent) : VcsClientOptionsPageWidget(parent)
+OptionsPageWidget::OptionsPageWidget()
 {
     m_ui.setupUi(this);
     m_ui.commandChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
diff --git a/src/plugins/mercurial/optionspage.h b/src/plugins/mercurial/optionspage.h
index 1e70b2771c..be963bba0a 100644
--- a/src/plugins/mercurial/optionspage.h
+++ b/src/plugins/mercurial/optionspage.h
@@ -39,7 +39,7 @@ class OptionsPageWidget : public VcsBase::VcsClientOptionsPageWidget
     Q_OBJECT
 
 public:
-    explicit OptionsPageWidget(QWidget *parent = nullptr);
+    OptionsPageWidget();
 
     VcsBase::VcsBaseClientSettings settings() const override;
     void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp
index 2ffee34344..43bcbe0488 100644
--- a/src/plugins/subversion/settingspage.cpp
+++ b/src/plugins/subversion/settingspage.cpp
@@ -42,7 +42,7 @@ using namespace Subversion::Internal;
 using namespace Utils;
 using namespace VcsBase;
 
-SettingsPageWidget::SettingsPageWidget(QWidget *parent) : VcsClientOptionsPageWidget(parent)
+SettingsPageWidget::SettingsPageWidget()
 {
     m_ui.setupUi(this);
     m_ui.pathChooser->setExpectedKind(PathChooser::ExistingCommand);
diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h
index 23ec7548c7..13befb535d 100644
--- a/src/plugins/subversion/settingspage.h
+++ b/src/plugins/subversion/settingspage.h
@@ -41,7 +41,7 @@ class SettingsPageWidget : public VcsBase::VcsClientOptionsPageWidget
     Q_OBJECT
 
 public:
-    explicit SettingsPageWidget(QWidget *parent = nullptr);
+    SettingsPageWidget();
 
     VcsBase::VcsBaseClientSettings settings() const override;
     void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.cpp b/src/plugins/vcsbase/vcsbaseoptionspage.cpp
index ded4e8c770..ef5a1ea4e1 100644
--- a/src/plugins/vcsbase/vcsbaseoptionspage.cpp
+++ b/src/plugins/vcsbase/vcsbaseoptionspage.cpp
@@ -54,8 +54,7 @@ VcsBaseOptionsPage::VcsBaseOptionsPage(QObject *parent) : Core::IOptionsPage(par
 
 VcsBaseOptionsPage::~VcsBaseOptionsPage() = default;
 
-VcsClientOptionsPageWidget::VcsClientOptionsPageWidget(QWidget *parent) : QWidget(parent)
-{ }
+VcsClientOptionsPageWidget::VcsClientOptionsPageWidget() = default;
 
 VcsClientOptionsPage::VcsClientOptionsPage(Core::IVersionControl *control, VcsBaseClientImpl *client,
                                            QObject *parent) :
diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.h b/src/plugins/vcsbase/vcsbaseoptionspage.h
index 5821df0383..41872d3b1b 100644
--- a/src/plugins/vcsbase/vcsbaseoptionspage.h
+++ b/src/plugins/vcsbase/vcsbaseoptionspage.h
@@ -48,12 +48,15 @@ public:
 
 class VcsBaseClientImpl;
 
-class VCSBASE_EXPORT VcsClientOptionsPageWidget : public QWidget
+class VCSBASE_EXPORT VcsClientOptionsPageWidget : public Core::IOptionsPageWidget
 {
     Q_OBJECT
 
 public:
-    VcsClientOptionsPageWidget(QWidget *parent = nullptr);
+    VcsClientOptionsPageWidget();
+
+    void apply() override {}
+    void finish() override {}
 
     virtual void setSettings(const VcsBaseClientSettings &s) = 0;
     virtual VcsBaseClientSettings settings() const = 0;