Vcs: Move Settings widget definitions to .cpp files

In preparation of replacing the VcsBase* layer by the new
IOption* functions, which are almost the same now.

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

10 files changed, 115 insertions, 141 deletions

diff --git a/src/plugins/bazaar/optionspage.cpp b/src/plugins/bazaar/optionspage.cpp
index a3dc0f4a324..2cf5be9dd98 100644
--- a/src/plugins/bazaar/optionspage.cpp
+++ b/src/plugins/bazaar/optionspage.cpp
@@ -27,16 +27,30 @@
 #include "bazaarclient.h"
 #include "bazaarsettings.h"
 #include "bazaarplugin.h"
+#include "ui_optionspage.h"
 
 #include <coreplugin/icore.h>
 #include <vcsbase/vcsbaseconstants.h>
 
-#include <QTextStream>
-
-using namespace Bazaar::Internal;
-using namespace Bazaar;
 using namespace VcsBase;
 
+namespace Bazaar {
+namespace Internal {
+
+class OptionsPageWidget final : public VcsBase::VcsClientOptionsPageWidget
+{
+    Q_DECLARE_TR_FUNCTIONS(Bazaar::Internal::OptionsPageWidget)
+
+public:
+    OptionsPageWidget();
+
+    VcsBase::VcsBaseClientSettings settings() const final;
+    void setSettings(const VcsBase::VcsBaseClientSettings &s) final;
+
+private:
+    Ui::OptionsPage m_ui;
+};
+
 OptionsPageWidget::OptionsPageWidget()
 {
     m_ui.setupUi(this);
@@ -69,6 +83,9 @@ OptionsPage::OptionsPage(Core::IVersionControl *control, QObject *parent) :
     VcsClientOptionsPage(control, BazaarPlugin::instance()->client(), parent)
 {
     setId(VcsBase::Constants::VCS_ID_BAZAAR);
-    setDisplayName(tr("Bazaar"));
-    setWidgetFactory([]() { return new OptionsPageWidget; });
+    setDisplayName(OptionsPageWidget::tr("Bazaar"));
+    setWidgetFactory([] { return new OptionsPageWidget; });
 }
+
+} // Internal
+} // Bazaar
diff --git a/src/plugins/bazaar/optionspage.h b/src/plugins/bazaar/optionspage.h
index 3465ff6f25f..b2ccaee5caf 100644
--- a/src/plugins/bazaar/optionspage.h
+++ b/src/plugins/bazaar/optionspage.h
@@ -25,34 +25,13 @@
 
 #pragma once
 
-#include "ui_optionspage.h"
-
 #include <vcsbase/vcsbaseoptionspage.h>
 
-namespace VcsBase { class VcsBaseClientSettings; }
-
 namespace Bazaar {
 namespace Internal {
 
-class OptionsPageWidget : public VcsBase::VcsClientOptionsPageWidget
+class OptionsPage final : public VcsBase::VcsClientOptionsPage
 {
-    Q_OBJECT
-
-public:
-    OptionsPageWidget();
-
-    VcsBase::VcsBaseClientSettings settings() const override;
-    void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
-
-private:
-    Ui::OptionsPage m_ui;
-};
-
-
-class OptionsPage : public VcsBase::VcsClientOptionsPage
-{
-    Q_OBJECT
-
 public:
     OptionsPage(Core::IVersionControl *control, QObject *parent);
 };
diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp
index 6d5759dd171..4914e53d82d 100644
--- a/src/plugins/cvs/settingspage.cpp
+++ b/src/plugins/cvs/settingspage.cpp
@@ -28,6 +28,7 @@
 #include "cvsclient.h"
 #include "cvssettings.h"
 #include "cvsplugin.h"
+#include "ui_settingspage.h"
 
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
@@ -35,13 +36,27 @@
 #include <utils/pathchooser.h>
 
 #include <QCoreApplication>
-#include <QTextStream>
-#include <QFileDialog>
 
-using namespace Cvs::Internal;
 using namespace Utils;
 using namespace VcsBase;
 
+namespace Cvs {
+namespace Internal {
+
+class SettingsPageWidget final : public VcsBase::VcsClientOptionsPageWidget
+{
+    Q_DECLARE_TR_FUNCTIONS(Cvs::Internal::SettingsPageWidget)
+
+public:
+    SettingsPageWidget();
+
+    VcsBase::VcsBaseClientSettings settings() const final;
+    void setSettings(const VcsBase::VcsBaseClientSettings &) final;
+
+private:
+    Ui::SettingsPage m_ui;
+};
+
 SettingsPageWidget::SettingsPageWidget()
 {
     m_ui.setupUi(this);
@@ -76,6 +91,9 @@ SettingsPage::SettingsPage(Core::IVersionControl *control, QObject *parent) :
     VcsClientOptionsPage(control, CvsPlugin::instance()->client(), parent)
 {
     setId(VcsBase::Constants::VCS_ID_CVS);
-    setDisplayName(tr("CVS"));
-    setWidgetFactory([]() { return new SettingsPageWidget; });
+    setDisplayName(SettingsPageWidget::tr("CVS"));
+    setWidgetFactory([] { return new SettingsPageWidget; });
 }
+
+} // Internal
+} // Cvs
diff --git a/src/plugins/cvs/settingspage.h b/src/plugins/cvs/settingspage.h
index aac992c4f89..6967abad6b9 100644
--- a/src/plugins/cvs/settingspage.h
+++ b/src/plugins/cvs/settingspage.h
@@ -25,34 +25,13 @@
 
 #pragma once
 
-#include "ui_settingspage.h"
-
 #include <vcsbase/vcsbaseoptionspage.h>
 
-namespace VcsBase { class VcsBaseClientSettings; }
-
 namespace Cvs {
 namespace Internal {
 
-class SettingsPageWidget : public VcsBase::VcsClientOptionsPageWidget
+class SettingsPage final : public VcsBase::VcsClientOptionsPage
 {
-    Q_OBJECT
-
-public:
-    SettingsPageWidget();
-
-    VcsBase::VcsBaseClientSettings settings() const override;
-    void setSettings(const VcsBase::VcsBaseClientSettings &) override;
-
-private:
-    Ui::SettingsPage m_ui;
-};
-
-
-class SettingsPage : public VcsBase::VcsClientOptionsPage
-{
-    Q_OBJECT
-
 public:
     SettingsPage(Core::IVersionControl *control, QObject *parent);
 };
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp
index 8a2a047ed50..6fbc3df22ab 100644
--- a/src/plugins/git/settingspage.cpp
+++ b/src/plugins/git/settingspage.cpp
@@ -28,6 +28,8 @@
 #include "gitplugin.h"
 #include "gitclient.h"
 
+#include "ui_settingspage.h"
+
 #include <coreplugin/icore.h>
 #include <coreplugin/messagebox.h>
 #include <vcsbase/vcsbaseconstants.h>
@@ -36,14 +38,28 @@
 #include <utils/hostosinfo.h>
 
 #include <QDir>
-#include <QDebug>
-#include <QTextStream>
 
 using namespace VcsBase;
 
 namespace Git {
 namespace Internal {
 
+class SettingsPageWidget final : public VcsBase::VcsClientOptionsPageWidget
+{
+    Q_DECLARE_TR_FUNCTIONS(Git::Internal::SettingsPageWidget)
+
+public:
+    SettingsPageWidget();
+
+    VcsBase::VcsBaseClientSettings settings() const final;
+    void setSettings(const VcsBase::VcsBaseClientSettings &s) final;
+
+private:
+    void updateNoteField();
+
+    Ui::SettingsPage m_ui;
+};
+
 SettingsPageWidget::SettingsPageWidget()
 {
     m_ui.setupUi(this);
@@ -106,12 +122,13 @@ void SettingsPageWidget::updateNoteField()
 }
 
 // -------- SettingsPage
+
 SettingsPage::SettingsPage(Core::IVersionControl *control, QObject *parent) :
     VcsClientOptionsPage(control, GitPlugin::client(), parent)
 {
     setId(VcsBase::Constants::VCS_ID_GIT);
-    setDisplayName(tr("Git"));
-    setWidgetFactory([]() { return new SettingsPageWidget; });
+    setDisplayName(SettingsPageWidget::tr("Git"));
+    setWidgetFactory([] { return new SettingsPageWidget; });
 }
 
 void SettingsPage::apply()
diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h
index c6ac3b9c2c2..f1999ba80a7 100644
--- a/src/plugins/git/settingspage.h
+++ b/src/plugins/git/settingspage.h
@@ -27,40 +27,14 @@
 
 #include <vcsbase/vcsbaseoptionspage.h>
 
-#include "ui_settingspage.h"
-
-#include <QPointer>
-#include <QWidget>
-
-namespace VcsBase {
-class VcsBaseClientSettings;
-} // namespace VcsBase
-
 namespace Git {
 namespace Internal {
 
-class SettingsPageWidget : public VcsBase::VcsClientOptionsPageWidget {
-    Q_OBJECT
-
-public:
-    SettingsPageWidget();
-
-    VcsBase::VcsBaseClientSettings settings() const override;
-    void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
-
-private:
-    void updateNoteField();
-
-    Ui::SettingsPage m_ui;
-};
-
-class SettingsPage : public VcsBase::VcsClientOptionsPage
+class SettingsPage final : public VcsBase::VcsClientOptionsPage
 {
-    Q_OBJECT
-
 public:
     SettingsPage(Core::IVersionControl *control, QObject *parent);
-    void apply() override;
+    void apply() final;
 };
 
 } // namespace Internal
diff --git a/src/plugins/mercurial/optionspage.cpp b/src/plugins/mercurial/optionspage.cpp
index f7d4a0efc4f..592e2596362 100644
--- a/src/plugins/mercurial/optionspage.cpp
+++ b/src/plugins/mercurial/optionspage.cpp
@@ -28,18 +28,32 @@
 #include "mercurialclient.h"
 #include "mercurialsettings.h"
 #include "mercurialplugin.h"
+#include "ui_optionspage.h"
+#include "ui_optionspage.h"
 
 #include <coreplugin/icore.h>
 #include <utils/pathchooser.h>
 #include <vcsbase/vcsbaseconstants.h>
 
-#include <QTextStream>
-
 using namespace VcsBase;
 
 namespace Mercurial {
 namespace Internal  {
 
+class OptionsPageWidget final : public VcsBase::VcsClientOptionsPageWidget
+{
+    Q_DECLARE_TR_FUNCTIONS(Mercurial::Internal::OptionsPageWidget)
+
+public:
+    OptionsPageWidget();
+
+    VcsBase::VcsBaseClientSettings settings() const final;
+    void setSettings(const VcsBase::VcsBaseClientSettings &s) final;
+
+private:
+    Ui::OptionsPage m_ui;
+};
+
 OptionsPageWidget::OptionsPageWidget()
 {
     m_ui.setupUi(this);
@@ -72,8 +86,8 @@ OptionsPage::OptionsPage(Core::IVersionControl *control, QObject *parent) :
     VcsClientOptionsPage(control, MercurialPlugin::client(), parent)
 {
     setId(VcsBase::Constants::VCS_ID_MERCURIAL);
-    setDisplayName(tr("Mercurial"));
-    setWidgetFactory([]() { return new OptionsPageWidget; });
+    setDisplayName(OptionsPageWidget::tr("Mercurial"));
+    setWidgetFactory([] { return new OptionsPageWidget; });
 }
 
 } // namespace Internal
diff --git a/src/plugins/mercurial/optionspage.h b/src/plugins/mercurial/optionspage.h
index be963bba0a8..8c3fc425917 100644
--- a/src/plugins/mercurial/optionspage.h
+++ b/src/plugins/mercurial/optionspage.h
@@ -25,33 +25,13 @@
 
 #pragma once
 
-#include "ui_optionspage.h"
-
 #include <vcsbase/vcsbaseoptionspage.h>
 
-namespace VcsBase { class VcsBaseClientSettings; }
-
 namespace Mercurial {
 namespace Internal {
 
-class OptionsPageWidget : public VcsBase::VcsClientOptionsPageWidget
-{
-    Q_OBJECT
-
-public:
-    OptionsPageWidget();
-
-    VcsBase::VcsBaseClientSettings settings() const override;
-    void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
-
-private:
-    Ui::OptionsPage m_ui;
-};
-
-class OptionsPage : public VcsBase::VcsClientOptionsPage
+class OptionsPage final : public VcsBase::VcsClientOptionsPage
 {
-    Q_OBJECT
-
 public:
     OptionsPage(Core::IVersionControl *control, QObject *parent);
 };
diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp
index 43bcbe04885..225181f13ac 100644
--- a/src/plugins/subversion/settingspage.cpp
+++ b/src/plugins/subversion/settingspage.cpp
@@ -29,19 +29,35 @@
 #include "subversionplugin.h"
 #include "subversionsettings.h"
 
+#include "ui_settingspage.h"
+
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
 #include <vcsbase/vcsbaseconstants.h>
 #include <utils/pathchooser.h>
 
 #include <QCoreApplication>
-#include <QTextStream>
-#include <QFileDialog>
 
-using namespace Subversion::Internal;
 using namespace Utils;
 using namespace VcsBase;
 
+namespace Subversion {
+namespace Internal {
+
+class SettingsPageWidget final : public VcsBase::VcsClientOptionsPageWidget
+{
+    Q_DECLARE_TR_FUNCTIONS(Subversion::Internal::SettingsPageWidget)
+
+public:
+    SettingsPageWidget();
+
+    VcsBase::VcsBaseClientSettings settings() const final;
+    void setSettings(const VcsBase::VcsBaseClientSettings &s) final;
+
+private:
+    Ui::SettingsPage m_ui;
+};
+
 SettingsPageWidget::SettingsPageWidget()
 {
     m_ui.setupUi(this);
@@ -84,6 +100,9 @@ SettingsPage::SettingsPage(Core::IVersionControl *control, QObject *parent) :
     VcsClientOptionsPage(control, SubversionPlugin::instance()->client(), parent)
 {
     setId(VcsBase::Constants::VCS_ID_SUBVERSION);
-    setDisplayName(tr("Subversion"));
-    setWidgetFactory([]() { return new SettingsPageWidget; });
+    setDisplayName(SettingsPageWidget::tr("Subversion"));
+    setWidgetFactory([] { return new SettingsPageWidget; });
 }
+
+} // Internal
+} // Subversion
diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h
index 13befb535d3..60e1976c246 100644
--- a/src/plugins/subversion/settingspage.h
+++ b/src/plugins/subversion/settingspage.h
@@ -25,36 +25,13 @@
 
 #pragma once
 
-#include "ui_settingspage.h"
-
 #include <vcsbase/vcsbaseoptionspage.h>
 
-#include <QWidget>
-#include <QPointer>
-#include <QString>
-
 namespace Subversion {
 namespace Internal {
 
-class SettingsPageWidget : public VcsBase::VcsClientOptionsPageWidget
+class SettingsPage final : public VcsBase::VcsClientOptionsPage
 {
-    Q_OBJECT
-
-public:
-    SettingsPageWidget();
-
-    VcsBase::VcsBaseClientSettings settings() const override;
-    void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
-
-private:
-    Ui::SettingsPage m_ui;
-};
-
-
-class SettingsPage : public VcsBase::VcsClientOptionsPage
-{
-    Q_OBJECT
-
 public:
     SettingsPage(Core::IVersionControl *control, QObject *parent);
 };