Utils, all: Standardize on QtcSettings

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

3 files changed, 12 insertions, 10 deletions

diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index 6557be0db6..64be4075ee 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -61,7 +61,7 @@ static void startFlashingWizard()
 
 static bool isFlashActionDisabled()
 {
-    QSettings * const settings = Core::ICore::settings();
+    QtcSettings * const settings = Core::ICore::settings();
     settings->beginGroup(settingsGroupKey());
     bool disabled = settings->value("flashActionDisabled", false).toBool();
     settings->endGroup();
diff --git a/src/plugins/boot2qt/qdbutils.cpp b/src/plugins/boot2qt/qdbutils.cpp
index fcc6e38da2..922f0838f7 100644
--- a/src/plugins/boot2qt/qdbutils.cpp
+++ b/src/plugins/boot2qt/qdbutils.cpp
@@ -34,7 +34,7 @@ FilePath findTool(QdbTool tool)
     QString filePath = Utils::qtcEnvironmentVariable(overridingEnvironmentVariable(tool));
 
     if (filePath.isEmpty()) {
-        QSettings * const settings = Core::ICore::settings();
+        QtcSettings * const settings = Core::ICore::settings();
         settings->beginGroup(settingsGroupKey());
         filePath = settings->value(settingsKey(tool)).toString();
         settings->endGroup();
@@ -72,20 +72,21 @@ void showMessage(const QString &message, bool important)
         Core::MessageManager::writeSilently(fullMessage);
 }
 
-QString settingsGroupKey()
+Key settingsGroupKey()
 {
-    return QLatin1String("Boot2Qt");
+    return "Boot2Qt";
 }
 
-QString settingsKey(QdbTool tool)
+Key settingsKey(QdbTool tool)
 {
     switch (tool) {
     case QdbTool::FlashingWizard:
-        return QLatin1String("flashingWizardFilePath");
+        return "flashingWizardFilePath";
     case QdbTool::Qdb:
-        return QLatin1String("qdbFilePath");
+        return "qdbFilePath";
     }
-    QTC_ASSERT(false, return QString());
+    QTC_CHECK(false);
+    return {};
 }
 
 } // Qdb::Internal
diff --git a/src/plugins/boot2qt/qdbutils.h b/src/plugins/boot2qt/qdbutils.h
index 1a04007218..61b8ab7143 100644
--- a/src/plugins/boot2qt/qdbutils.h
+++ b/src/plugins/boot2qt/qdbutils.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <utils/filepath.h>
+#include <utils/storekey.h>
 
 namespace Qdb::Internal {
 
@@ -15,7 +16,7 @@ enum class QdbTool {
 Utils::FilePath findTool(QdbTool tool);
 QString overridingEnvironmentVariable(QdbTool tool);
 void showMessage(const QString &message, bool important = false);
-QString settingsGroupKey();
-QString settingsKey(QdbTool tool);
+Utils::Key settingsGroupKey();
+Utils::Key settingsKey(QdbTool tool);
 
 } // Qdb::Internal