Vcs: Convert settings pages to latest style

Last change in that area for this year.

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

2 files changed, 20 insertions, 9 deletions

diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index d9980328fc9..47d1256528c 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -288,7 +288,6 @@ private:
     bool commit(const QString &messageFile, const QStringList &subVersionFileList);
     void cleanCommitMessageFile();
 
-    CvsSettings m_setting;
     CvsClient *m_client = nullptr;
 
     QString m_commitMessageFileName;
diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp
index 9e1523486fa..775a393df3e 100644
--- a/src/plugins/cvs/cvssettings.cpp
+++ b/src/plugins/cvs/cvssettings.cpp
@@ -5,6 +5,7 @@
 
 #include "cvstr.h"
 
+#include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
 
 #include <utils/hostosinfo.h>
@@ -17,22 +18,17 @@ using namespace Utils;
 
 namespace Cvs::Internal {
 
-static CvsSettings *theSettings;
-
 CvsSettings &settings()
 {
-    return *theSettings;
+    static CvsSettings theSettings;
+    return theSettings;
 }
 
 CvsSettings::CvsSettings()
 {
-    theSettings = this;
+    setAutoApply(false);
     setSettingsGroup("CVS");
 
-    setId(VcsBase::Constants::VCS_ID_CVS);
-    setDisplayName(Tr::tr("CVS"));
-    setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
-
     binaryPath.setDefaultValue("cvs" QTC_HOST_EXE_SUFFIX);
     binaryPath.setExpectedKind(PathChooser::ExistingCommand);
     binaryPath.setHistoryCompleter(QLatin1String("Cvs.Command.History"));
@@ -97,4 +93,20 @@ QStringList CvsSettings::addOptions(const QStringList &args) const
     return rc;
 }
 
+// CvsSettingsPage
+
+class CvsSettingsPage final : Core::IOptionsPage
+{
+public:
+    CvsSettingsPage()
+    {
+        setId(VcsBase::Constants::VCS_ID_CVS);
+        setDisplayName(Tr::tr("CVS"));
+        setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
+        setSettingsProvider([] { return &settings(); });
+    }
+};
+
+const CvsSettingsPage settingsPage;
+
 } // Cvs::Internal