Utils: Use QtcSettings

Fixes compile errors with Qt 6.2.4.

Change-Id: Ia97d5fcbeb80ee1242fd4c2425bc7f325dad8953
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

src/libs/utils/qtcsettings.h

@@ -16,6 +16,10 @@ class QTCREATOR_UTILS_EXPORT QtcSettings : public QSettings
 public:
     using QSettings::QSettings;
 
+    void beginGroup(const Key &prefix) { QSettings::beginGroup(stringFromKey(prefix)); }
+    void beginGroup(const QString &prefix) { QSettings::beginGroup(prefix); }
+    void beginGroup(const char *prefix) { QSettings::beginGroup(stringFromKey(prefix)); }
+
     QVariant value(const Key &key) const { return QSettings::value(stringFromKey(key)); }
     QVariant value(const Key &key, const QVariant &def) const { return QSettings::value(stringFromKey(key), def); }
     void setValue(const Key &key, const QVariant &value) { QSettings::setValue(stringFromKey(key), value); }

src/libs/utils/settingsutils.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "store.h"
+#include "qtcsettings.h"
 
 #include <QSettings>
 #include <QStringList>
@@ -14,7 +15,7 @@ namespace Utils {
 template <class SettingsClassT>
 void fromSettings(const Key &postFix,
                   const Key &category,
-                  QSettings *s,
+                  QtcSettings *s,
                   SettingsClassT *obj)
 {
     Store map;
@@ -29,7 +30,7 @@ void fromSettings(const Key &postFix,
 template <class SettingsClassT>
 void toSettings(const Key &postFix,
                 const Key &category,
-                QSettings *s,
+                QtcSettings *s,
                 const SettingsClassT *obj)
 {
     Key group = postFix;

src/plugins/clangtools/clangtoolssettings.cpp

@@ -147,7 +147,7 @@ void ClangToolsSettings::readSettings()
 
     AspectContainer::readSettings();
 
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     s->beginGroup(Constants::SETTINGS_ID);
     m_diagnosticConfigs.append(diagnosticConfigsFromSettings(s));
 
@@ -180,7 +180,7 @@ void ClangToolsSettings::writeSettings() const
 {
     AspectContainer::writeSettings();
 
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     s->beginGroup(Constants::SETTINGS_ID);
 
     diagnosticConfigsToSettings(s, m_diagnosticConfigs);

src/plugins/coreplugin/mainwindow.cpp

@@ -1152,7 +1152,7 @@ void MainWindow::aboutToShutdown()
 
 void MainWindow::readSettings()
 {
-    QSettings *settings = PluginManager::settings();
+    QtcSettings *settings = PluginManager::settings();
     settings->beginGroup(QLatin1String(settingsGroup));
 
     if (m_overrideColor.isValid()) {
@@ -1160,7 +1160,7 @@ void MainWindow::readSettings()
         // Get adapted base color.
         m_overrideColor = StyleHelper::baseColor();
     } else {
-        StyleHelper::setBaseColor(settings->value(QLatin1String(colorKey),
+        StyleHelper::setBaseColor(settings->value(colorKey,
                                   QColor(StyleHelper::DEFAULT_BASE_COLOR)).value<QColor>());
     }
 

src/plugins/coreplugin/navigationwidget.cpp

@@ -407,7 +407,7 @@ void NavigationWidget::saveSettings(QtcSettings *settings)
     }
 }
 
-void NavigationWidget::restoreSettings(QSettings *settings)
+void NavigationWidget::restoreSettings(QtcSettings *settings)
 {
     if (!d->m_factoryModel->rowCount()) {
         // We have no widgets to show!
@@ -475,7 +475,7 @@ void NavigationWidget::restoreSettings(QSettings *settings)
         if (!key.startsWith(activationKey))
             continue;
 
-        int position = settings->value(key).toInt();
+        int position = settings->value(keyFromString(key)).toInt();
         Id factoryId = Id::fromString(key.mid(activationKey.length()));
         NavigationWidgetPrivate::updateActivationsMap(factoryId, {d->m_side, position});
     }

src/plugins/coreplugin/navigationwidget.h

@@ -72,7 +72,7 @@ public:
 
     Utils::Key settingsGroup() const;
     void saveSettings(Utils::QtcSettings *settings);
-    void restoreSettings(QSettings *settings);
+    void restoreSettings(Utils::QtcSettings *settings);
 
     QWidget *activateSubWidget(Utils::Id factoryId, int preferredPosition);
     void closeSubWidgets();

src/plugins/cppeditor/cppcodemodelsettings.cpp

@@ -68,7 +68,7 @@ static FilePath fallbackClangdFilePath()
     return Environment::systemEnvironment().searchInPath("clangd");
 }
 
-void CppCodeModelSettings::fromSettings(QSettings *s)
+void CppCodeModelSettings::fromSettings(QtcSettings *s)
 {
     s->beginGroup(QLatin1String(Constants::CPPEDITOR_SETTINGSGROUP));
 
@@ -100,7 +100,7 @@ void CppCodeModelSettings::fromSettings(QSettings *s)
     emit changed();
 }
 
-void CppCodeModelSettings::toSettings(QSettings *s)
+void CppCodeModelSettings::toSettings(QtcSettings *s)
 {
     s->beginGroup(QLatin1String(Constants::CPPEDITOR_SETTINGSGROUP));
 

src/plugins/cppeditor/cppcodemodelsettings.h

@@ -10,15 +10,12 @@
 #include <utils/filepath.h>
 #include <utils/id.h>
 #include <utils/store.h>
+#include <utils/qtcsettings.h>
 
 #include <QObject>
 #include <QStringList>
 #include <QVersionNumber>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
-
 namespace ProjectExplorer { class Project; }
 
 namespace CppEditor {
@@ -34,8 +31,8 @@ public:
     };
 
 public:
-    void fromSettings(QSettings *s);
+    void fromSettings(Utils::QtcSettings *s);
-    void toSettings(QSettings *s);
+    void toSettings(Utils::QtcSettings *s);
 
 public:
     bool enableLowerClazyLevels() const;

src/plugins/cppeditor/cppincludehierarchy.cpp

@@ -333,8 +333,8 @@ public:
 
     void perform();
 
-    void saveSettings(QSettings *settings, int position);
+    void saveSettings(QtcSettings *settings, int position);
-    void restoreSettings(QSettings *settings, int position);
+    void restoreSettings(QtcSettings *settings, int position);
 
 private:
     void onItemActivated(const QModelIndex &index);
@@ -430,13 +430,13 @@ void CppIncludeHierarchyWidget::perform()
 
 const bool kSyncDefault = false;
 
-void CppIncludeHierarchyWidget::saveSettings(QSettings *settings, int position)
+void CppIncludeHierarchyWidget::saveSettings(QtcSettings *settings, int position)
 {
     const Key key = keyFromString(QString("IncludeHierarchy.%1.SyncWithEditor").arg(position));
     QtcSettings::setValueWithDefault(settings, key, m_toggleSync->isChecked(), kSyncDefault);
 }
 
-void CppIncludeHierarchyWidget::restoreSettings(QSettings *settings, int position)
+void CppIncludeHierarchyWidget::restoreSettings(QtcSettings *settings, int position)
 {
     const Key key = keyFromString(QString("IncludeHierarchy.%1.SyncWithEditor").arg(position));
     m_toggleSync->setChecked(settings->value(key, kSyncDefault).toBool());

src/plugins/cppeditor/cppinsertvirtualmethods.cpp

@@ -286,7 +286,7 @@ class VirtualMethodsSettings
 public:
     void read()
     {
-        QSettings *s = Core::ICore::settings();
+        QtcSettings *s = Core::ICore::settings();
         s->beginGroup(group());
         insertVirtualKeyword = s->value(insertVirtualKeywordKey(), kInsertVirtualKeywordDefault)
                                    .toBool();
@@ -304,7 +304,7 @@ public:
 
     void write() const
     {
-        Utils::QtcSettings *s = Core::ICore::settings();
+        QtcSettings *s = Core::ICore::settings();
         s->beginGroup(group());
         s->setValueWithDefault(insertVirtualKeywordKey(),
                                insertVirtualKeyword,

src/plugins/mcusupport/settingshandler.cpp

@@ -18,7 +18,7 @@ const Key automaticKitCreationSettingsKey = Key(Constants::SETTINGS_GROUP) + '/'
             + Constants::SETTINGS_KEY_AUTOMATIC_KIT_CREATION;
 
 static FilePath packagePathFromSettings(const Key &settingsKey,
-                                        QSettings &settings,
+                                        QtcSettings &settings,
                                         const FilePath &defaultPath)
 {
     const Key key = Key(Constants::SETTINGS_GROUP) + '/'
@@ -55,14 +55,14 @@ bool SettingsHandler::write(const Key &settingsKey,
 
 bool SettingsHandler::isAutomaticKitCreationEnabled() const
 {
-    QSettings *settings = Core::ICore::settings(QSettings::UserScope);
+    QtcSettings *settings = Core::ICore::settings(QSettings::UserScope);
     const bool automaticKitCreation = settings->value(automaticKitCreationSettingsKey, true).toBool();
     return automaticKitCreation;
 }
 
 void SettingsHandler::setAutomaticKitCreation(bool isEnabled)
 {
-    QSettings *settings = Core::ICore::settings(QSettings::UserScope);
+    QtcSettings *settings = Core::ICore::settings(QSettings::UserScope);
     settings->setValue(automaticKitCreationSettingsKey, isEnabled);
 }
 

src/plugins/projectexplorer/projectexplorer.cpp

@@ -1628,7 +1628,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
             dd->updateWelcomePage();
     });
 
-    QSettings *s = ICore::settings();
+    QtcSettings *s = ICore::settings();
     const QStringList fileNames = s->value(Constants::RECENTPROJECTS_FILE_NAMES_KEY).toStringList();
     const QStringList displayNames = s->value(Constants::RECENTPROJECTS_DISPLAY_NAMES_KEY)
                                          .toStringList();

src/plugins/projectexplorer/toolchainmanager.cpp

@@ -82,7 +82,7 @@ ToolChainManager::ToolChainManager(QObject *parent) :
     connect(this, &ToolChainManager::toolChainRemoved, this, &ToolChainManager::toolChainsChanged);
     connect(this, &ToolChainManager::toolChainUpdated, this, &ToolChainManager::toolChainsChanged);
 
-    QSettings * const s = Core::ICore::settings();
+    QtcSettings * const s = Core::ICore::settings();
     d->m_detectionSettings.detectX64AsX32
         = s->value(DETECT_X64_AS_X32_KEY, ToolchainDetectionSettings().detectX64AsX32).toBool();
     d->m_badToolchains = BadToolchains::fromVariant(s->value(badToolchainsKey()));

src/plugins/texteditor/tabsettings.cpp

@@ -33,12 +33,12 @@ TabSettings::TabSettings(TabSettings::TabPolicy tabPolicy,
 
 }
 
-void TabSettings::toSettings(const Key &category, QSettings *s) const
+void TabSettings::toSettings(const Key &category, QtcSettings *s) const
 {
     Utils::toSettings(groupPostfix, category, s, this);
 }
 
-void TabSettings::fromSettings(const Key &category, QSettings *s)
+void TabSettings::fromSettings(const Key &category, QtcSettings *s)
 {
     *this = TabSettings(); // Assign defaults
     Utils::fromSettings(groupPostfix, category, s, this);

src/plugins/texteditor/tabsettings.h

@@ -6,13 +6,10 @@
 #include "texteditor_global.h"
 
 #include <utils/store.h>
+#include <utils/qtcsettings.h>
 
 #include <QTextBlock>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
-
 namespace TextEditor {
 
 // Tab settings: Data type the GeneralSettingsPage acts on
@@ -38,8 +35,8 @@ public:
     TabSettings(TabPolicy tabPolicy, int tabSize,
                 int indentSize, ContinuationAlignBehavior continuationAlignBehavior);
 
-    void toSettings(const Utils::Key &category, QSettings *s) const;
+    void toSettings(const Utils::Key &category, Utils::QtcSettings *s) const;
-    void fromSettings(const Utils::Key &category, QSettings *s);
+    void fromSettings(const Utils::Key &category, Utils::QtcSettings *s);
 
     Utils::Store toMap() const;
     void fromMap(const Utils::Store &map);