From a0a461668c1cb024629f6a6fe0e8431df1509621 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 18 Jul 2023 13:52:01 +0200 Subject: [PATCH] Vcs: Distribute readSettings() calls to individual settings Isn't a benefit here, but what the other settings do, so it's easier to ponder more centralized solutions later. Change-Id: I3837e5bedc8771dd56b8bacda8c23e40281b4fe3 Reviewed-by: Orgad Shaneh --- src/plugins/bazaar/bazaarsettings.cpp | 2 ++ src/plugins/cvs/cvssettings.cpp | 2 ++ src/plugins/fossil/fossilsettings.cpp | 2 ++ src/plugins/git/gitsettings.cpp | 2 ++ src/plugins/mercurial/mercurialsettings.cpp | 2 ++ src/plugins/subversion/subversionsettings.cpp | 2 ++ src/plugins/vcsbase/vcsbaseclient.cpp | 1 - 7 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/plugins/bazaar/bazaarsettings.cpp b/src/plugins/bazaar/bazaarsettings.cpp index 090d5209fa3..6683036d5ee 100644 --- a/src/plugins/bazaar/bazaarsettings.cpp +++ b/src/plugins/bazaar/bazaarsettings.cpp @@ -86,6 +86,8 @@ BazaarSettings::BazaarSettings() st }; }); + + readSettings(); } // BazaarSettingsPage diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp index 775a393df3e..a03e8a74089 100644 --- a/src/plugins/cvs/cvssettings.cpp +++ b/src/plugins/cvs/cvssettings.cpp @@ -78,6 +78,8 @@ CvsSettings::CvsSettings() st }; }); + + readSettings(); } QStringList CvsSettings::addOptions(const QStringList &args) const diff --git a/src/plugins/fossil/fossilsettings.cpp b/src/plugins/fossil/fossilsettings.cpp index 1a2960a0e5c..2443e61c8f0 100644 --- a/src/plugins/fossil/fossilsettings.cpp +++ b/src/plugins/fossil/fossilsettings.cpp @@ -115,6 +115,8 @@ FossilSettings::FossilSettings() st }; }); + + readSettings(); } // FossilSettingsPage diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp index f10dd3d9638..b0cedb300c7 100644 --- a/src/plugins/git/gitsettings.cpp +++ b/src/plugins/git/gitsettings.cpp @@ -145,6 +145,8 @@ GitSettings::GitSettings() }); connect(&binaryPath, &BaseAspect::changed, this, [this] { tryResolve = true; }); connect(&path, &BaseAspect::changed, this, [this] { tryResolve = true; }); + + readSettings(); } FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const diff --git a/src/plugins/mercurial/mercurialsettings.cpp b/src/plugins/mercurial/mercurialsettings.cpp index 048d7345813..05c96672f90 100644 --- a/src/plugins/mercurial/mercurialsettings.cpp +++ b/src/plugins/mercurial/mercurialsettings.cpp @@ -70,6 +70,8 @@ MercurialSettings::MercurialSettings() st }; }); + + readSettings(); } // MercurialSettingsPage diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp index c22f847f89e..6fb5a83ff57 100644 --- a/src/plugins/subversion/subversionsettings.cpp +++ b/src/plugins/subversion/subversionsettings.cpp @@ -94,6 +94,8 @@ SubversionSettings::SubversionSettings() st }; }); + + readSettings(); } bool SubversionSettings::hasAuthentication() const diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index de3565dd531..b58524209d0 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -57,7 +57,6 @@ namespace VcsBase { VcsBaseClientImpl::VcsBaseClientImpl(VcsBaseSettings *baseSettings) : m_baseSettings(baseSettings) { - m_baseSettings->readSettings(); connect(ICore::instance(), &ICore::saveSettingsRequested, this, &VcsBaseClientImpl::saveSettings); }