Vcs: Use PagedSettings for common settings

Also restrict the Reset VCS Cache button to the second
column, as it was earlier.

Change-Id: I291fdceb11df4ecdfdc0887fd521288d0b4544f3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

src/plugins/vcsbase/commonvcssettings.h

@@ -4,15 +4,12 @@
 #pragma once
 
 #include <coreplugin/dialogs/ioptionspage.h>
-
-#include <utils/aspects.h>
+#include <coreplugin/iversioncontrol.h>
 
 namespace VcsBase::Internal {
 
-class CommonVcsSettings : public Utils::AspectContainer
+class CommonVcsSettings : public Core::PagedSettings
 {
-    Q_OBJECT
-
 public:
     CommonVcsSettings();
 
@@ -26,20 +23,8 @@ public:
 
     Utils::BoolAspect lineWrap{this};
     Utils::IntegerAspect lineWrapWidth{this};
-
-signals:
-    void settingsChanged();
 };
 
-class CommonOptionsPage final : public Core::IOptionsPage
-{
-public:
-    CommonOptionsPage();
-
-    CommonVcsSettings &settings() { return m_settings; }
-
-private:
-    CommonVcsSettings m_settings;
-};
+CommonVcsSettings &commonSettings();
 
 } // VcsBase::Internal