CVS: Use the new AspectContainer::applied signal

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

src/plugins/cvs/cvsplugin.cpp

@@ -364,7 +364,7 @@ private:
     QAction *m_menuAction = nullptr;
     bool m_submitActionTriggered = false;
 
-    CvsSettingsPage m_settingsPage{[this] { configurationChanged(); }, &m_settings};
+    CvsSettingsPage m_settingsPage{&m_settings};
 
 public:
     VcsSubmitEditorFactory submitEditorFactory {
@@ -736,6 +736,8 @@ CvsPluginPrivate::CvsPluginPrivate()
     connect(m_revertRepositoryAction, &QAction::triggered, this, &CvsPluginPrivate::revertAll);
     cvsMenu->addAction(command);
     m_commandLocator->appendCommand(command);
+
+    connect(&m_settings, &AspectContainer::applied, this, &IVersionControl::configurationChanged);
 }
 
 void CvsPluginPrivate::vcsDescribe(const QString &source, const QString &changeNr)

src/plugins/cvs/cvssettings.cpp

@@ -33,7 +33,6 @@
 #include <vcsbase/vcsbaseconstants.h>
 
 using namespace Utils;
-using namespace VcsBase;
 
 namespace Cvs {
 namespace Internal {
@@ -91,38 +90,27 @@ QStringList CvsSettings::addOptions(const QStringList &args) const
     return rc;
 }
 
-// CvsSettingsPage
+CvsSettingsPage::CvsSettingsPage(CvsSettings *settings)
-
-class CvsSettingsPageWidget final : public Core::IOptionsPageWidget
 {
-    Q_DECLARE_TR_FUNCTIONS(Cvs::Internal::SettingsPageWidget)
+    setId(VcsBase::Constants::VCS_ID_CVS);
+    setDisplayName(CvsSettings::tr("CVS"));
+    setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
+    setSettings(settings);
 
-public:
+    setLayouter([settings](QWidget *widget) {
-    CvsSettingsPageWidget(const std::function<void()> & onApply, CvsSettings *settings);
-
-    void apply() final;
-
-private:
-    std::function<void()> m_onApply;
-    CvsSettings *m_settings;
-};
-
-CvsSettingsPageWidget::CvsSettingsPageWidget(const std::function<void()> &onApply, CvsSettings *settings)
-    : m_onApply(onApply), m_settings(settings)
-{
         CvsSettings &s = *settings;
         using namespace Layouting;
 
         Column {
             Group {
-            Title(tr("Configuration")),
+                Title(CvsSettings::tr("Configuration")),
                 Form {
                     s.binaryPath,
                     s.cvsRoot
                 }
             },
             Group {
-            Title(tr("Miscellaneous")),
+                Title(CvsSettings::tr("Miscellaneous")),
                 Form {
                     s.timeout,
                     s.diffOptions,
@@ -131,23 +119,8 @@ CvsSettingsPageWidget::CvsSettingsPageWidget(const std::function<void()> &onAppl
                 s.describeByCommitId,
             },
             Stretch()
-    }.attachTo(this);
+        }.attachTo(widget);
-}
+    });
-
-void CvsSettingsPageWidget::apply()
-{
-    if (m_settings->isDirty()) {
-        m_settings->apply();
-        m_onApply();
-    }
-}
-
-CvsSettingsPage::CvsSettingsPage(const std::function<void()> &onApply, CvsSettings *settings)
-{
-    setId(VcsBase::Constants::VCS_ID_CVS);
-    setDisplayName(CvsSettingsPageWidget::tr("CVS"));
-    setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
-    setWidgetCreator([onApply, settings] { return new CvsSettingsPageWidget(onApply, settings); });
 }
 
 } // Internal

src/plugins/cvs/cvssettings.h

@@ -51,7 +51,7 @@ public:
 class CvsSettingsPage final : public Core::IOptionsPage
 {
 public:
-    CvsSettingsPage(const std::function<void()> &onApply, CvsSettings *settings);
+    explicit CvsSettingsPage(CvsSettings *settings);
 };
 
 } // namespace Internal