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>

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;

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

src/plugins/coreplugin/dialogs/ioptionspage.cpp

@@ -309,4 +309,9 @@ PagedSettings::PagedSettings()
     setAutoApply(false);
 }
 
+void PagedSettings::readSettings()
+{
+    return AspectContainer::readSettings(Core::ICore::settings());
+}
+
 } // Core

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

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()

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

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()

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

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

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);
 }