Utils, all: Standardize on QtcSettings

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

3 files changed, 29 insertions, 24 deletions

diff --git a/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp b/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp
index d88c4cf409b..05db597c5b8 100644
--- a/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp
+++ b/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp
@@ -8,8 +8,11 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/dialogs/restartdialog.h>
 #include <coreplugin/icore.h>
+
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
+
+#include <utils/qtcsettings.h>
 #include <utils/theme/theme.h>
 
 #include <QApplication>
@@ -23,6 +26,8 @@
 #include <QStyleFactory>
 #include <QVBoxLayout>
 
+using namespace Utils;
+
 namespace QmlDesigner {
 
 namespace {
@@ -53,9 +58,9 @@ bool hideToolsMenuSetting()
     return Core::ICore::settings()->value(Core::Constants::SETTINGS_MENU_HIDE_TOOLS, false).toBool();
 }
 
-void setSettingIfDifferent(const QString &key, bool value, bool &dirty)
+void setSettingIfDifferent(const Key &key, bool value, bool &dirty)
 {
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     if (s->value(key, false).toBool() != value) {
         dirty = true;
         s->setValue(key, value);
@@ -175,7 +180,7 @@ void StudioSettingsPage::apply()
         restartDialog.exec();
     }
 
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     const QString value = m_pathChooserExamples->filePath().toString();
 
     if (s->value(Paths::exampleDownloadPath, false).toString() != value) {
diff --git a/src/plugins/qmldesignerbase/utils/designersettings.cpp b/src/plugins/qmldesignerbase/utils/designersettings.cpp
index 8157712437b..87248bbc207 100644
--- a/src/plugins/qmldesignerbase/utils/designersettings.cpp
+++ b/src/plugins/qmldesignerbase/utils/designersettings.cpp
@@ -3,7 +3,9 @@
 
 #include "designersettings.h"
 
-#include <QSettings>
+#include <utils/qtcsettings.h>
+
+using namespace Utils;
 
 namespace QmlDesigner {
 
@@ -12,7 +14,7 @@ namespace DesignerSettingsGroupKey {
     const char QML_DESIGNER_SETTINGS_GROUP[] = "Designer";
 }
 
-DesignerSettings::DesignerSettings(QSettings *settings) :
+DesignerSettings::DesignerSettings(QtcSettings *settings) :
     m_settings(settings)
 {
     fromSettings(settings);
@@ -38,15 +40,15 @@ QVariant DesignerSettings::value(const QByteArray &key, const QVariant &defaultV
     return m_cache.value(key, defaultValue);
 }
 
-void DesignerSettings::restoreValue(QSettings *settings, const QByteArray &key, const QVariant &defaultValue)
+void DesignerSettings::restoreValue(QtcSettings *settings, const QByteArray &key, const QVariant &defaultValue)
 {
-    m_cache.insert(key, settings->value(QString::fromLatin1(key), defaultValue));
+    m_cache.insert(key, settings->value(key, defaultValue));
 }
 
-void DesignerSettings::fromSettings(QSettings *settings)
+void DesignerSettings::fromSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String(DesignerSettingsGroupKey::QML_SETTINGS_GROUP));
-    settings->beginGroup(QLatin1String(DesignerSettingsGroupKey::QML_DESIGNER_SETTINGS_GROUP));
+    settings->beginGroup(DesignerSettingsGroupKey::QML_SETTINGS_GROUP);
+    settings->beginGroup(DesignerSettingsGroupKey::QML_DESIGNER_SETTINGS_GROUP);
 
     restoreValue(settings, DesignerSettingsKey::ITEMSPACING, 6);
     restoreValue(settings, DesignerSettingsKey::CONTAINERPADDING, 8);
@@ -103,17 +105,17 @@ void DesignerSettings::fromSettings(QSettings *settings)
     settings->endGroup();
 }
 
-void DesignerSettings::storeValue(QSettings *settings, const QByteArray &key, const QVariant &value) const
+void DesignerSettings::storeValue(QtcSettings *settings, const QByteArray &key, const QVariant &value) const
 {
     if (key.isEmpty())
         return;
-    settings->setValue(QString::fromLatin1(key), value);
+    settings->setValue(key, value);
 }
 
-void DesignerSettings::toSettings(QSettings *settings) const
+void DesignerSettings::toSettings(QtcSettings *settings) const
 {
-    settings->beginGroup(QLatin1String(DesignerSettingsGroupKey::QML_SETTINGS_GROUP));
-    settings->beginGroup(QLatin1String(DesignerSettingsGroupKey::QML_DESIGNER_SETTINGS_GROUP));
+    settings->beginGroup(DesignerSettingsGroupKey::QML_SETTINGS_GROUP);
+    settings->beginGroup(DesignerSettingsGroupKey::QML_DESIGNER_SETTINGS_GROUP);
 
     QHash<QByteArray, QVariant>::const_iterator i = m_cache.constBegin();
     while (i != m_cache.constEnd()) {
diff --git a/src/plugins/qmldesignerbase/utils/designersettings.h b/src/plugins/qmldesignerbase/utils/designersettings.h
index 850e2a43a06..aaeec55ec37 100644
--- a/src/plugins/qmldesignerbase/utils/designersettings.h
+++ b/src/plugins/qmldesignerbase/utils/designersettings.h
@@ -10,9 +10,7 @@
 #include <QByteArray>
 #include <QMutex>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace QmlDesigner {
 
@@ -74,21 +72,21 @@ inline constexpr char CONTENT_LIBRARY_NEW_FLAG_EXPIRATION_DAYS[] = "ContentLibra
 class QMLDESIGNERBASE_EXPORT DesignerSettings
 {
 public:
-    DesignerSettings(QSettings *settings);
+    DesignerSettings(Utils::QtcSettings *settings);
 
     void insert(const QByteArray &key, const QVariant &value);
     void insert(const QHash<QByteArray, QVariant> &settingsHash);
     QVariant value(const QByteArray &key, const QVariant &defaultValue = {}) const;
 
 private:
-    void fromSettings(QSettings *);
-    void toSettings(QSettings *) const;
+    void fromSettings(Utils::QtcSettings *);
+    void toSettings(Utils::QtcSettings *) const;
 
-    void restoreValue(QSettings *settings, const QByteArray &key,
+    void restoreValue(Utils::QtcSettings *settings, const QByteArray &key,
         const QVariant &defaultValue = QVariant());
-    void storeValue(QSettings *settings, const QByteArray &key, const QVariant &value) const;
+    void storeValue(Utils::QtcSettings *settings, const QByteArray &key, const QVariant &value) const;
 
-    QSettings *m_settings;
+    Utils::QtcSettings *m_settings;
     QHash<QByteArray, QVariant> m_cache;
     mutable QMutex m_mutex;
 };