Vcs: Register settings aspects more directly

Change-Id: I8049f71456b8e8573a2dcfce68a14fb12545865b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

2 files changed, 5 insertions, 11 deletions

diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp
index dbfd41e500c..e2247f7dbe0 100644
--- a/src/plugins/cvs/cvssettings.cpp
+++ b/src/plugins/cvs/cvssettings.cpp
@@ -33,25 +33,21 @@ CvsSettings::CvsSettings()
     setDisplayName(Tr::tr("CVS"));
     setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
 
-    registerAspect(&binaryPath);
     binaryPath.setDefaultValue("cvs" QTC_HOST_EXE_SUFFIX);
     binaryPath.setExpectedKind(PathChooser::ExistingCommand);
     binaryPath.setHistoryCompleter(QLatin1String("Cvs.Command.History"));
     binaryPath.setDisplayName(Tr::tr("CVS Command"));
     binaryPath.setLabelText(Tr::tr("CVS command:"));
 
-    registerAspect(&cvsRoot);
     cvsRoot.setDisplayStyle(StringAspect::LineEditDisplay);
     cvsRoot.setSettingsKey("Root");
     cvsRoot.setLabelText(Tr::tr("CVS root:"));
 
-    registerAspect(&diffOptions);
     diffOptions.setDisplayStyle(StringAspect::LineEditDisplay);
     diffOptions.setSettingsKey("DiffOptions");
     diffOptions.setDefaultValue("-du");
     diffOptions.setLabelText("Diff options:");
 
-    registerAspect(&describeByCommitId);
     describeByCommitId.setSettingsKey("DescribeByCommitId");
     describeByCommitId.setDefaultValue(true);
     describeByCommitId.setLabelText(Tr::tr("Describe all files matching commit id"));
@@ -59,10 +55,8 @@ CvsSettings::CvsSettings()
         "displayed when clicking on a revision number in the annotation view "
         "(retrieved via commit ID). Otherwise, only the respective file will be displayed."));
 
-    registerAspect(&diffIgnoreWhiteSpace);
     diffIgnoreWhiteSpace.setSettingsKey("DiffIgnoreWhiteSpace");
 
-    registerAspect(&diffIgnoreBlankLines);
     diffIgnoreBlankLines.setSettingsKey("DiffIgnoreBlankLines");
 
     setLayouter([this](QWidget *widget) {
diff --git a/src/plugins/cvs/cvssettings.h b/src/plugins/cvs/cvssettings.h
index 0c2e5442a62..ade9920b2ad 100644
--- a/src/plugins/cvs/cvssettings.h
+++ b/src/plugins/cvs/cvssettings.h
@@ -12,11 +12,11 @@ class CvsSettings : public VcsBase::VcsBaseSettings
 public:
     CvsSettings();
 
-    Utils::StringAspect cvsRoot;
-    Utils::StringAspect diffOptions;
-    Utils::BoolAspect diffIgnoreWhiteSpace;
-    Utils::BoolAspect diffIgnoreBlankLines;
-    Utils::BoolAspect describeByCommitId;
+    Utils::StringAspect cvsRoot{this};
+    Utils::StringAspect diffOptions{this};
+    Utils::BoolAspect diffIgnoreWhiteSpace{this};
+    Utils::BoolAspect diffIgnoreBlankLines{this};
+    Utils::BoolAspect describeByCommitId{this};
 
     QStringList addOptions(const QStringList &args) const;
 };