Utils: Make PagedSettings::readSettings() calls shorter

Ideally, this would not be needed on the user code side at all, but
there's no way to ensure the settings are read timing before sibling
constructors might need it. So keep the 'poor man's two-phase
initialization', but make it less intrusive.

Change-Id: Ica7f6510cd05072d7286f4e85cd72c494e8f10f8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

10 files changed, 16 insertions, 15 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
index 3996946e47..778e04563d 100644
--- a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
@@ -14,7 +14,6 @@
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 
 #include <projectexplorer/project.h>
@@ -112,7 +111,7 @@ public:
         connect(EditorManager::instance(), &EditorManager::aboutToSave,
                 this, &CMakeFormatterPrivate::applyIfNecessary);
 
-        readSettings(ICore::settings());
+        readSettings();
     }
 
     bool isApplicable(const IDocument *document) const;
diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp b/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp
index 5c22423a40..7875f97ada 100644
--- a/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp
@@ -95,7 +95,7 @@ CMakeSpecificSettings::CMakeSpecificSettings()
     showAdvancedOptionsByDefault.setLabelText(
                 ::CMakeProjectManager::Tr::tr("Show advanced options by default"));
 
-    readSettings(Core::ICore::settings());
+    readSettings();
 }
 
 } // CMakeProjectManager::Internal
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.cpp b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
index 070cc6159b..bb9b80a913 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.cpp
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
@@ -309,4 +309,9 @@ PagedSettings::PagedSettings()
     setAutoApply(false);
 }
 
+void PagedSettings::readSettings()
+{
+    return AspectContainer::readSettings(Core::ICore::settings());
+}
+
 } // Core
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h
index 256f729a9e..96d9b6824a 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.h
@@ -132,6 +132,9 @@ class CORE_EXPORT PagedSettings : public Utils::AspectContainer, public IOptions
 {
 public:
     PagedSettings();
+
+    using AspectContainer::readSettings; // FIXME: Remove.
+    void readSettings(); // Intentionally hides AspectContainer::readSettings()
 };
 
 } // namespace Core
diff --git a/src/plugins/cppcheck/cppcheckoptions.cpp b/src/plugins/cppcheck/cppcheckoptions.cpp
index 46ab82cfee..37f537f2fe 100644
--- a/src/plugins/cppcheck/cppcheckoptions.cpp
+++ b/src/plugins/cppcheck/cppcheckoptions.cpp
@@ -121,7 +121,7 @@ CppcheckOptions::CppcheckOptions()
 
     setLayouter(layouter());
 
-    readSettings(Core::ICore::settings());
+    readSettings();
 }
 
 std::function<void(QWidget *widget)> CppcheckOptions::layouter()
diff --git a/src/plugins/docker/dockersettings.cpp b/src/plugins/docker/dockersettings.cpp
index 4adb98af9c..a43e7a20d3 100644
--- a/src/plugins/docker/dockersettings.cpp
+++ b/src/plugins/docker/dockersettings.cpp
@@ -6,8 +6,6 @@
 #include "dockerconstants.h"
 #include "dockertr.h"
 
-#include <coreplugin/icore.h>
-
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <utils/filepath.h>
@@ -55,7 +53,7 @@ DockerSettings::DockerSettings()
     dockerBinaryPath.setLabelText(Tr::tr("Command:"));
     dockerBinaryPath.setSettingsKey("cli");
 
-    readSettings(Core::ICore::settings());
+    readSettings();
 }
 
 } // Docker::Internal
diff --git a/src/plugins/nim/settings/nimsettings.cpp b/src/plugins/nim/settings/nimsettings.cpp
index d99ae2974b..5e98b0fd53 100644
--- a/src/plugins/nim/settings/nimsettings.cpp
+++ b/src/plugins/nim/settings/nimsettings.cpp
@@ -92,7 +92,7 @@ NimSettings::NimSettings()
     nimSuggestPath.setExpectedKind(PathChooser::ExistingCommand);
     nimSuggestPath.setLabelText(Tr::tr("Path:"));
 
-    readSettings(Core::ICore::settings());
+    readSettings();
 }
 
 NimSettings::~NimSettings()
diff --git a/src/plugins/qmakeprojectmanager/qmakesettings.cpp b/src/plugins/qmakeprojectmanager/qmakesettings.cpp
index 5a05e5904d..292851e444 100644
--- a/src/plugins/qmakeprojectmanager/qmakesettings.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakesettings.cpp
@@ -4,8 +4,6 @@
 #include "qmakesettings.h"
 #include "qmakeprojectmanagertr.h"
 
-#include <coreplugin/icore.h>
-
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <utils/hostosinfo.h>
@@ -63,7 +61,7 @@ QmakeSettings::QmakeSettings()
         }.attachTo(widget);
     });
 
-    readSettings(Core::ICore::settings());
+    readSettings();
 }
 
 } // QmakeProjectManager::Internal
diff --git a/src/plugins/vcpkg/vcpkgsettings.cpp b/src/plugins/vcpkg/vcpkgsettings.cpp
index 16622fe8b3..85b4b6f4fa 100644
--- a/src/plugins/vcpkg/vcpkgsettings.cpp
+++ b/src/plugins/vcpkg/vcpkgsettings.cpp
@@ -5,8 +5,6 @@
 
 #include "vcpkgconstants.h"
 
-#include <coreplugin/icore.h>
-
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
 
 #include <utils/aspects.h>
@@ -67,7 +65,7 @@ VcpkgSettings::VcpkgSettings()
     vcpkgRoot.setExpectedKind(Utils::PathChooser::ExistingDirectory);
     vcpkgRoot.setDefaultValue(Utils::qtcEnvironmentVariable(Constants::ENVVAR_VCPKG_ROOT));
 
-    readSettings(Core::ICore::settings());
+    readSettings();
 }
 
 bool VcpkgSettings::vcpkgRootValid() const
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 527db5387c..9bd83df3c3 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -57,7 +57,7 @@ namespace VcsBase {
 VcsBaseClientImpl::VcsBaseClientImpl(VcsBaseSettings *baseSettings)
     : m_baseSettings(baseSettings)
 {
-    m_baseSettings->readSettings(ICore::settings());
+    m_baseSettings->readSettings();
     connect(ICore::instance(), &ICore::saveSettingsRequested,
             this, &VcsBaseClientImpl::saveSettings);
 }