diff options
author | hjk <hjk@qt.io> | 2020-01-10 18:07:32 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-01-15 07:56:06 +0000 |
commit | fbfba64f10714223e42d9474195122895ae57c9a (patch) | |
tree | 01a0dccd261d48851c18e835d137add3f08e24b4 /src/plugins/subversion | |
parent | 1b9f0a6d911cb6f01983c12eda7a3d094a654432 (diff) |
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>
Diffstat (limited to 'src/plugins/subversion')
-rw-r--r-- | src/plugins/subversion/settingspage.cpp | 29 | ||||
-rw-r--r-- | src/plugins/subversion/settingspage.h | 25 |
2 files changed, 25 insertions, 29 deletions
diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp index 43bcbe0488..225181f13a 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 13befb535d..60e1976c24 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); }; |