From fbfba64f10714223e42d9474195122895ae57c9a Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 10 Jan 2020 18:07:32 +0100
Subject: 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>
---
 src/plugins/subversion/settingspage.cpp | 29 ++++++++++++++++++++++++-----
 src/plugins/subversion/settingspage.h   | 25 +------------------------
 2 files changed, 25 insertions(+), 29 deletions(-)

(limited to 'src/plugins/subversion')

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);
 };
-- 
cgit v1.2.3