Utils: More forward declarations / drop unused headers [S]

Round 1 - focus on headers.
For classes with initial in range [S].
Try to keep the same separators between different kind of headers.

SmallString[xxx] classes skipped for now.

Change-Id: Ie5c8edcb028e33eb8f9619e646afc462b91dca73
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp
index 791b9523ae..784e685812 100644
--- a/src/libs/utils/settingsaccessor.cpp
+++ b/src/libs/utils/settingsaccessor.cpp
@@ -27,6 +27,7 @@
 
 #include "algorithm.h"
 #include "qtcassert.h"
+#include "persistentsettings.h"
 
 #include <QApplication>
 #include <QDir>
@@ -72,6 +73,8 @@ applicationDisplayName(applicationDisplayName)
     QTC_CHECK(!applicationDisplayName.isEmpty());
 }
 
+SettingsAccessor::~SettingsAccessor() = default;
+
 /*!
  * Restore settings from disk and report any issues in a message box centered on \a parent.
  */
@@ -299,7 +302,7 @@ BackingUpSettingsAccessor::writeData(const FilePath &path, const QVariantMap &da
 
 FilePaths BackingUpSettingsAccessor::readFileCandidates(const FilePath &path) const
 {
-    FilePaths result = Utils::filteredUnique(m_strategy->readFileCandidates(path));
+    FilePaths result = filteredUnique(m_strategy->readFileCandidates(path));
     if (result.removeOne(baseFilePath()))
         result.prepend(baseFilePath());
 
@@ -746,7 +749,7 @@ static QVariant mergeQVariantMapsRecursion(const QVariantMap &mainTree, const QV
                                            const SettingsMergeFunction &merge)
 {
     QVariantMap result;
-    const QList<QString> allKeys = Utils::filteredUnique(mainSubtree.keys() + secondarySubtree.keys());
+    const QList<QString> allKeys = filteredUnique(mainSubtree.keys() + secondarySubtree.keys());
 
     MergingSettingsAccessor::SettingsMergeData global = {mainTree, secondaryTree, QString()};
     MergingSettingsAccessor::SettingsMergeData local = {mainSubtree, secondarySubtree, QString()};