From 8d0aa34bfcd5604b9b93a8c002169b361db4316c Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 24 Aug 2023 16:14:26 +0200 Subject: Plugins: A bit more Keys and Store Change-Id: Iee55eeaa881dd9f2047fdbe95ad8d827f4ba34e0 Reviewed-by: Marcus Tillmanns --- src/plugins/android/androidconfigurations.cpp | 82 +++++++++++----------- src/plugins/baremetal/baremetaldevice.cpp | 4 +- .../clangtools/clangtoolsprojectsettings.cpp | 19 ++--- .../cmakebuildconfiguration.cpp | 29 ++++---- src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 13 ++-- .../cmakeprojectmanager/cmakesettingspage.cpp | 4 +- src/plugins/cmakeprojectmanager/cmaketool.cpp | 6 +- src/plugins/cmakeprojectmanager/cmaketool.h | 2 +- .../cmaketoolsettingsaccessor.cpp | 20 +++--- .../cmaketoolsettingsaccessor.h | 3 +- src/plugins/copilot/copilotsettings.cpp | 6 +- src/plugins/cppeditor/cppcodemodelsettings.cpp | 10 +-- src/plugins/cppeditor/cppcodestylesettingspage.cpp | 6 +- src/plugins/cppeditor/cppeditordocument.cpp | 6 +- src/plugins/cppeditor/cppfilesettingspage.cpp | 2 +- src/plugins/cppeditor/cppincludehierarchy.cpp | 4 +- src/plugins/cppeditor/cppinsertvirtualmethods.cpp | 15 ++-- src/plugins/cppeditor/cpppreprocessordialog.cpp | 4 +- .../cppeditor/cppquickfixprojectsettings.cpp | 4 +- src/plugins/cppeditor/cpptoolssettings.cpp | 10 +-- src/plugins/cvs/cvssettings.cpp | 2 +- src/plugins/debugger/commonoptionspage.cpp | 4 +- src/plugins/debugger/debuggeractions.cpp | 8 +-- src/plugins/debugger/debuggeritem.cpp | 6 +- src/plugins/debugger/debuggeritem.h | 2 +- src/plugins/debugger/debuggeritemmanager.cpp | 12 ++-- src/plugins/docker/dockerdevice.cpp | 4 +- src/plugins/incredibuild/buildconsolebuildstep.cpp | 4 +- src/plugins/incredibuild/commandbuilder.cpp | 15 ++-- src/plugins/incredibuild/commandbuilder.h | 2 +- .../languageclient/languageclientsettings.cpp | 14 ++-- src/plugins/mesonprojectmanager/mesonwrapper.h | 10 +-- src/plugins/mesonprojectmanager/ninjawrapper.h | 10 +-- .../mesonprojectmanager/toolitemsettings.cpp | 2 +- .../mesonprojectmanager/toolssettingsaccessor.cpp | 23 +++--- src/plugins/mesonprojectmanager/toolwrapper.cpp | 2 + src/plugins/mesonprojectmanager/toolwrapper.h | 39 +++++----- src/plugins/nim/nimconstants.h | 6 +- .../nim/settings/nimcodestylesettingspage.cpp | 4 +- .../customwidgetwizard/classdefinition.cpp | 2 +- .../qmakebuildconfiguration.cpp | 4 +- .../qmljseditor/qmljscomponentnamedialog.cpp | 2 +- .../qmljstools/qmljscodestylepreferences.cpp | 6 +- src/plugins/qmljstools/qmljscodestylesettings.cpp | 2 +- .../qmljstools/qmljscodestylesettingspage.cpp | 6 +- src/plugins/qmljstools/qmljstoolssettings.cpp | 2 +- src/plugins/qmlpreview/qmlpreviewruncontrol.cpp | 2 +- .../qmlprojectmanager/qmlmultilanguageaspect.cpp | 2 +- src/plugins/qtsupport/baseqtversion.cpp | 6 +- .../qtsupport/gettingstartedwelcomepage.cpp | 2 +- src/plugins/qtsupport/qtversionfactory.h | 4 +- src/plugins/qtsupport/qtversionmanager.cpp | 30 ++++---- src/plugins/terminal/terminalsettings.cpp | 2 +- 53 files changed, 247 insertions(+), 243 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 1aff2e32c1..cef297ac31 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -89,52 +89,50 @@ const char LinuxOsKey[] = "linux"; const char WindowsOsKey[] = "windows"; const char macOsKey[] = "mac"; +const char SettingsGroup[] = "AndroidConfigurations"; +const char SDKLocationKey[] = "SDKLocation"; +const char CustomNdkLocationsKey[] = "CustomNdkLocations"; +const char DefaultNdkLocationKey[] = "DefaultNdkLocation"; +const char SdkFullyConfiguredKey[] = "AllEssentialsInstalled"; +const char SDKManagerToolArgsKey[] = "SDKManagerToolArgs"; +const char OpenJDKLocationKey[] = "OpenJDKLocation"; +const char OpenSslPriLocationKey[] = "OpenSSLPriLocation"; +const char AutomaticKitCreationKey[] = "AutomatiKitCreation"; +const char EmulatorArgsKey[] = "EmulatorArgs"; -namespace { - const QLatin1String SettingsGroup("AndroidConfigurations"); - const QLatin1String SDKLocationKey("SDKLocation"); - const QLatin1String CustomNdkLocationsKey("CustomNdkLocations"); - const QLatin1String DefaultNdkLocationKey("DefaultNdkLocation"); - const QLatin1String SdkFullyConfiguredKey("AllEssentialsInstalled"); - const QLatin1String SDKManagerToolArgsKey("SDKManagerToolArgs"); - const QLatin1String OpenJDKLocationKey("OpenJDKLocation"); - const QLatin1String OpenSslPriLocationKey("OpenSSLPriLocation"); - const QLatin1String AutomaticKitCreationKey("AutomatiKitCreation"); - const QLatin1String EmulatorArgsKey("EmulatorArgs"); - - const QLatin1String ArmToolchainPrefix("arm-linux-androideabi"); - const QLatin1String X86ToolchainPrefix("x86"); - const QLatin1String AArch64ToolchainPrefix("aarch64-linux-android"); - const QLatin1String X86_64ToolchainPrefix("x86_64"); - - const QLatin1String ArmToolsPrefix("arm-linux-androideabi"); - const QLatin1String X86ToolsPrefix("i686-linux-android"); - const QLatin1String AArch64ToolsPrefix("aarch64-linux-android"); - const QLatin1String X86_64ToolsPrefix("x86_64-linux-android"); - - const QLatin1String ArmToolsDisplayName("arm"); - const QLatin1String X86ToolsDisplayName("i686"); - const QLatin1String AArch64ToolsDisplayName("aarch64"); - const QLatin1String X86_64ToolsDisplayName("x86_64"); - - const QLatin1String Unknown("unknown"); - const QLatin1String keytoolName("keytool"); - const QLatin1String changeTimeStamp("ChangeTimeStamp"); - - const QLatin1String sdkToolsVersionKey("Pkg.Revision"); - const QLatin1String ndkRevisionKey("Pkg.Revision"); - - static QString sdkSettingsFileName() - { - return Core::ICore::installerResourcePath("android.xml").toString(); - } +const QLatin1String ArmToolchainPrefix("arm-linux-androideabi"); +const QLatin1String X86ToolchainPrefix("x86"); +const QLatin1String AArch64ToolchainPrefix("aarch64-linux-android"); +const QLatin1String X86_64ToolchainPrefix("x86_64"); - static QString ndkPackageMarker() - { - return QLatin1String(Constants::ndkPackageName) + ";"; - } +const QLatin1String ArmToolsPrefix ("arm-linux-androideabi"); +const QLatin1String X86ToolsPrefix("i686-linux-android"); +const QLatin1String AArch64ToolsPrefix("aarch64-linux-android"); +const QLatin1String X86_64ToolsPrefix("x86_64-linux-android"); + +const QLatin1String ArmToolsDisplayName("arm"); +const QLatin1String X86ToolsDisplayName("i686"); +const QLatin1String AArch64ToolsDisplayName("aarch64"); +const QLatin1String X86_64ToolsDisplayName("x86_64"); + +const QLatin1String Unknown("unknown"); +const QLatin1String keytoolName("keytool"); +const QLatin1String changeTimeStamp("ChangeTimeStamp"); + +const char sdkToolsVersionKey[] = "Pkg.Revision"; +const char ndkRevisionKey[] = "Pkg.Revision"; + +static QString sdkSettingsFileName() +{ + return Core::ICore::installerResourcePath("android.xml").toString(); +} + +static QString ndkPackageMarker() +{ + return QLatin1String(Constants::ndkPackageName) + ";"; } + ////////////////////////////////// // AndroidConfig ////////////////////////////////// diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp index 4e90826a99..e0d271f259 100644 --- a/src/plugins/baremetal/baremetaldevice.cpp +++ b/src/plugins/baremetal/baremetaldevice.cpp @@ -79,9 +79,9 @@ void BareMetalDevice::fromMap(const Store &map) } } -QVariantMap BareMetalDevice::toMap() const +Store BareMetalDevice::toMap() const { - QVariantMap map = IDevice::toMap(); + Store map = IDevice::toMap(); map.insert(debugServerProviderIdKeyC, debugServerProviderId()); return map; } diff --git a/src/plugins/clangtools/clangtoolsprojectsettings.cpp b/src/plugins/clangtools/clangtoolsprojectsettings.cpp index 581a8ca57b..67b49dff70 100644 --- a/src/plugins/clangtools/clangtoolsprojectsettings.cpp +++ b/src/plugins/clangtools/clangtoolsprojectsettings.cpp @@ -8,6 +8,9 @@ #include #include +#include + +using namespace Utils; namespace ClangTools { namespace Internal { @@ -97,10 +100,10 @@ void ClangToolsProjectSettings::removeAllSuppressedDiagnostics() emit suppressedDiagnosticsChanged(); } -static QVariantMap convertToMapFromVersionBefore410(ProjectExplorer::Project *p) +static Store convertToMapFromVersionBefore410(ProjectExplorer::Project *p) { // These keys haven't changed. - const QStringList keys = { + const Key keys[] = { SETTINGS_KEY_SELECTED_DIRS, SETTINGS_KEY_SELECTED_FILES, SETTINGS_KEY_SUPPRESSED_DIAGS, @@ -108,8 +111,8 @@ static QVariantMap convertToMapFromVersionBefore410(ProjectExplorer::Project *p) "ClangTools.BuildBeforeAnalysis", }; - QVariantMap map; - for (const QString &key : keys) + Store map; + for (const Key &key : keys) map.insert(key, p->namedSettings(key)); map.insert(SETTINGS_PREFIX + QString(diagnosticConfigIdKey), @@ -121,7 +124,7 @@ static QVariantMap convertToMapFromVersionBefore410(ProjectExplorer::Project *p) void ClangToolsProjectSettings::load() { // Load map - QVariantMap map = m_project->namedSettings(SETTINGS_KEY_MAIN).toMap(); + Store map = m_project->namedSettings(SETTINGS_KEY_MAIN).toMap(); bool write = false; if (map.isEmpty()) { @@ -145,7 +148,7 @@ void ClangToolsProjectSettings::load() const QVariantList list = map.value(SETTINGS_KEY_SUPPRESSED_DIAGS).toList(); for (const QVariant &v : list) { - const QVariantMap diag = v.toMap(); + const Store diag = v.toMap(); const QString fp = diag.value(SETTINGS_KEY_SUPPRESSED_DIAGS_FILEPATH).toString(); if (fp.isEmpty()) continue; @@ -172,7 +175,7 @@ void ClangToolsProjectSettings::load() void ClangToolsProjectSettings::store() { - QVariantMap map; + Store map; map.insert(SETTINGS_KEY_USE_GLOBAL_SETTINGS, m_useGlobalSettings); const QStringList dirs = Utils::transform(m_selectedDirs, &Utils::FilePath::toString); @@ -183,7 +186,7 @@ void ClangToolsProjectSettings::store() QVariantList list; for (const SuppressedDiagnostic &diag : std::as_const(m_suppressedDiagnostics)) { - QVariantMap diagMap; + Store diagMap; diagMap.insert(SETTINGS_KEY_SUPPRESSED_DIAGS_FILEPATH, diag.filePath.toString()); diagMap.insert(SETTINGS_KEY_SUPPRESSED_DIAGS_MESSAGE, diag.description); diagMap.insert(SETTINGS_KEY_SUPPRESSED_DIAGS_UNIQIFIER, diag.uniquifier); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 6fab3af48d..75a4b44073 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -1433,7 +1433,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id) setInitializer([this, target](const BuildInfo &info) { const Kit *k = target->kit(); const QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(k); - const QVariantMap extraInfoMap = info.extraInfo.value(); + const Store extraInfoMap = info.extraInfo.value(); const QString buildType = extraInfoMap.contains(CMAKE_BUILD_TYPE) ? extraInfoMap.value(CMAKE_BUILD_TYPE).toString() : info.typeName; @@ -1939,7 +1939,7 @@ BuildInfo CMakeBuildConfigurationFactory::createBuildInfo(BuildType buildType) info.typeName = "Debug"; info.displayName = ::ProjectExplorer::Tr::tr("Debug"); info.buildType = BuildConfiguration::Debug; - QVariantMap extraInfo; + Store extraInfo; // enable QML debugging by default extraInfo.insert(Constants::QML_DEBUG_SETTING, TriState::Enabled.toVariant()); info.extraInfo = extraInfo; @@ -1964,7 +1964,7 @@ BuildInfo CMakeBuildConfigurationFactory::createBuildInfo(BuildType buildType) info.typeName = "Profile"; info.displayName = Tr::tr("Profile"); info.buildType = BuildConfiguration::Profile; - QVariantMap extraInfo; + Store extraInfo; // override CMake build type, which defaults to info.typeName extraInfo.insert(CMAKE_BUILD_TYPE, "RelWithDebInfo"); // enable QML debugging by default @@ -2234,32 +2234,29 @@ ConfigureEnvironmentAspect::ConfigureEnvironmentAspect(AspectContainer *containe void ConfigureEnvironmentAspect::fromMap(const Store &map) { // Match the key values from Qt Creator 9.0.0/1 to the ones from EnvironmentAspect - const bool cleanSystemEnvironment = map.value(QLatin1String(CLEAR_SYSTEM_ENVIRONMENT_KEY)) - .toBool(); + const bool cleanSystemEnvironment = map.value(CLEAR_SYSTEM_ENVIRONMENT_KEY).toBool(); const QStringList userEnvironmentChanges - = map.value(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY)).toStringList(); + = map.value(USER_ENVIRONMENT_CHANGES_KEY).toStringList(); - const int baseEnvironmentIndex - = map.value(QLatin1String(BASE_ENVIRONMENT_KEY), baseEnvironmentBase()).toInt(); + const int baseEnvironmentIndex = map.value(BASE_ENVIRONMENT_KEY, baseEnvironmentBase()).toInt(); - QVariantMap tmpMap; - tmpMap.insert(QLatin1String(BASE_KEY), cleanSystemEnvironment ? 0 : baseEnvironmentIndex); - tmpMap.insert(QLatin1String(CHANGES_KEY), userEnvironmentChanges); + Store tmpMap; + tmpMap.insert(BASE_KEY, cleanSystemEnvironment ? 0 : baseEnvironmentIndex); + tmpMap.insert(CHANGES_KEY, userEnvironmentChanges); ProjectExplorer::EnvironmentAspect::fromMap(tmpMap); } void ConfigureEnvironmentAspect::toMap(Store &map) const { - QVariantMap tmpMap; + Store tmpMap; ProjectExplorer::EnvironmentAspect::toMap(tmpMap); const int baseKey = tmpMap.value(BASE_KEY).toInt(); - map.insert(QLatin1String(CLEAR_SYSTEM_ENVIRONMENT_KEY), baseKey == 0); - map.insert(QLatin1String(BASE_ENVIRONMENT_KEY), baseKey); - map.insert(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY), - tmpMap.value(CHANGES_KEY).toStringList()); + map.insert(CLEAR_SYSTEM_ENVIRONMENT_KEY, baseKey == 0); + map.insert(BASE_ENVIRONMENT_KEY, baseKey); + map.insert(USER_ENVIRONMENT_CHANGES_KEY, tmpMap.value(CHANGES_KEY).toStringList()); } } // namespace Internal diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 8ab20703aa..4f31179d12 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -277,23 +277,22 @@ void CMakeBuildStep::toMap(Utils::Store &map) const { CMakeAbstractProcessStep::toMap(map); map.insert(BUILD_TARGETS_KEY, m_buildTargets); - map.insert(QLatin1String(CLEAR_SYSTEM_ENVIRONMENT_KEY), m_clearSystemEnvironment); - map.insert(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY), EnvironmentItem::toStringList(m_userEnvironmentChanges)); - map.insert(QLatin1String(BUILD_PRESET_KEY), m_buildPreset); + map.insert(CLEAR_SYSTEM_ENVIRONMENT_KEY, m_clearSystemEnvironment); + map.insert(USER_ENVIRONMENT_CHANGES_KEY, EnvironmentItem::toStringList(m_userEnvironmentChanges)); + map.insert(BUILD_PRESET_KEY, m_buildPreset); } void CMakeBuildStep::fromMap(const Utils::Store &map) { setBuildTargets(map.value(BUILD_TARGETS_KEY).toStringList()); - m_clearSystemEnvironment = map.value(QLatin1String(CLEAR_SYSTEM_ENVIRONMENT_KEY)) - .toBool(); + m_clearSystemEnvironment = map.value(CLEAR_SYSTEM_ENVIRONMENT_KEY).toBool(); m_userEnvironmentChanges = EnvironmentItem::fromStringList( - map.value(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY)).toStringList()); + map.value(USER_ENVIRONMENT_CHANGES_KEY).toStringList()); updateAndEmitEnvironmentChanged(); - m_buildPreset = map.value(QLatin1String(BUILD_PRESET_KEY)).toString(); + m_buildPreset = map.value(BUILD_PRESET_KEY).toString(); BuildStep::fromMap(map); } diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index ab950ebc82..1bfb6cee65 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -409,14 +409,14 @@ CMakeToolItemConfigWidget::CMakeToolItemConfigWidget(CMakeToolItemModel *model) m_binaryChooser = new PathChooser(this); m_binaryChooser->setExpectedKind(PathChooser::ExistingCommand); m_binaryChooser->setMinimumWidth(400); - m_binaryChooser->setHistoryCompleter(QLatin1String("Cmake.Command.History")); + m_binaryChooser->setHistoryCompleter("Cmake.Command.History"); m_binaryChooser->setCommandVersionArguments({"--version"}); m_binaryChooser->setAllowPathFromDevice(true); m_qchFileChooser = new PathChooser(this); m_qchFileChooser->setExpectedKind(PathChooser::File); m_qchFileChooser->setMinimumWidth(400); - m_qchFileChooser->setHistoryCompleter(QLatin1String("Cmake.qchFile.History")); + m_qchFileChooser->setHistoryCompleter("Cmake.qchFile.History"); m_qchFileChooser->setPromptDialogFilter("*.qch"); m_qchFileChooser->setPromptDialogTitle(Tr::tr("CMake .qch File")); diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index 9239ea5417..580db21250 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -105,7 +105,7 @@ CMakeTool::CMakeTool(Detection d, const Id &id) QTC_ASSERT(m_id.isValid(), m_id = Id::fromString(QUuid::createUuid().toString())); } -CMakeTool::CMakeTool(const QVariantMap &map, bool fromSdk) : +CMakeTool::CMakeTool(const Store &map, bool fromSdk) : CMakeTool(fromSdk ? CMakeTool::AutoDetection : CMakeTool::ManualDetection, Id::fromSetting(map.value(CMAKE_INFORMATION_ID))) { @@ -175,9 +175,9 @@ void CMakeTool::runCMake(Process &cmake, const QStringList &args, int timeoutS) cmake.runBlocking(); } -QVariantMap CMakeTool::toMap() const +Store CMakeTool::toMap() const { - QVariantMap data; + Store data; data.insert(CMAKE_INFORMATION_DISPLAYNAME, m_displayName); data.insert(CMAKE_INFORMATION_ID, m_id.toSetting()); data.insert(CMAKE_INFORMATION_COMMAND, m_executable.toString()); diff --git a/src/plugins/cmakeprojectmanager/cmaketool.h b/src/plugins/cmakeprojectmanager/cmaketool.h index 5243ef0652..838e9cf07e 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.h +++ b/src/plugins/cmakeprojectmanager/cmaketool.h @@ -52,7 +52,7 @@ public: using PathMapper = std::function; explicit CMakeTool(Detection d, const Utils::Id &id); - explicit CMakeTool(const QVariantMap &map, bool fromSdk); + explicit CMakeTool(const Utils::Store &map, bool fromSdk); ~CMakeTool(); static Utils::Id createId(); diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp index 5b7b6aec9b..6780163de7 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp @@ -30,7 +30,7 @@ public: CMakeToolSettingsUpgraderV0() : VersionUpgrader(0, "4.6") { } // NOOP - QVariantMap upgrade(const QVariantMap &data) final { return data; } + Store upgrade(const Store &data) final { return data; } }; // -------------------------------------------------------------------- @@ -170,8 +170,8 @@ void CMakeToolSettingsAccessor::saveCMakeTools(const QList &cmakeTo const Id &defaultId, QWidget *parent) { - QVariantMap data; - data.insert(QLatin1String(CMAKE_TOOL_DEFAULT_KEY), defaultId.toSetting()); + Store data; + data.insert(CMAKE_TOOL_DEFAULT_KEY, defaultId.toSetting()); int count = 0; const bool autoRun = settings().autorunCMake(); @@ -183,30 +183,30 @@ void CMakeToolSettingsAccessor::saveCMakeTools(const QList &cmakeTo item->setAutorun(autoRun); if (fi.needsDevice() || fi.isExecutableFile()) { // be graceful for device related stuff - QVariantMap tmp = item->toMap(); + Store tmp = item->toMap(); if (tmp.isEmpty()) continue; - data.insert(QString::fromLatin1(CMAKE_TOOL_DATA_KEY) + QString::number(count), tmp); + data.insert(CMAKE_TOOL_DATA_KEY + Key::number(count), QVariant::fromValue(tmp)); ++count; } } - data.insert(QLatin1String(CMAKE_TOOL_COUNT_KEY), count); + data.insert(CMAKE_TOOL_COUNT_KEY, count); saveSettings(data, parent); } CMakeToolSettingsAccessor::CMakeTools -CMakeToolSettingsAccessor::cmakeTools(const QVariantMap &data, bool fromSdk) const +CMakeToolSettingsAccessor::cmakeTools(const Store &data, bool fromSdk) const { CMakeTools result; - int count = data.value(QLatin1String(CMAKE_TOOL_COUNT_KEY), 0).toInt(); + int count = data.value(CMAKE_TOOL_COUNT_KEY, 0).toInt(); for (int i = 0; i < count; ++i) { - const QString key = QString::fromLatin1(CMAKE_TOOL_DATA_KEY) + QString::number(i); + const Key key = CMAKE_TOOL_DATA_KEY + Key::number(i); if (!data.contains(key)) continue; - const QVariantMap dbMap = data.value(key).toMap(); + const Store dbMap = data.value(key).value(); auto item = std::make_unique(dbMap, fromSdk); const FilePath cmakeExecutable = item->cmakeExecutable(); if (item->isAutoDetected() && !cmakeExecutable.needsDevice() && !cmakeExecutable.isExecutableFile()) { diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.h b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.h index e750770390..e67ab6c032 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.h +++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.h @@ -5,6 +5,7 @@ #include #include +#include namespace CMakeProjectManager { @@ -29,7 +30,7 @@ public: QWidget *parent); private: - CMakeTools cmakeTools(const QVariantMap &data, bool fromSdk) const; + CMakeTools cmakeTools(const Utils::Store &data, bool fromSdk) const; }; } // namespace Internal diff --git a/src/plugins/copilot/copilotsettings.cpp b/src/plugins/copilot/copilotsettings.cpp index 74988ca774..ec98469267 100644 --- a/src/plugins/copilot/copilotsettings.cpp +++ b/src/plugins/copilot/copilotsettings.cpp @@ -233,7 +233,7 @@ CopilotProjectSettings::CopilotProjectSettings(ProjectExplorer::Project *project initEnableAspect(enableCopilot); - QVariantMap map = project->namedSettings(Constants::COPILOT_PROJECT_SETTINGS_ID).toMap(); + Store map = project->namedSettings(Constants::COPILOT_PROJECT_SETTINGS_ID).value(); fromMap(map); connect(&enableCopilot, &BaseAspect::changed, this, [this, project] { save(project); }); @@ -254,9 +254,9 @@ bool CopilotProjectSettings::isEnabled() const void CopilotProjectSettings::save(ProjectExplorer::Project *project) { - QVariantMap map; + Store map; toMap(map); - project->setNamedSettings(Constants::COPILOT_PROJECT_SETTINGS_ID, map); + project->setNamedSettings(Constants::COPILOT_PROJECT_SETTINGS_ID, QVariant::fromValue(map)); // This triggers a restart of the Copilot language server. settings().apply(); diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp index d7f4888b07..6265c57b5b 100644 --- a/src/plugins/cppeditor/cppcodemodelsettings.cpp +++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp @@ -498,7 +498,7 @@ void ClangdProjectSettings::loadSettings() { if (!m_project) return; - const QVariantMap data = m_project->namedSettings(clangdSettingsKey()).toMap(); + const Store data = m_project->namedSettings(clangdSettingsKey()).value(); m_useGlobalSettings = data.value(clangdUseGlobalSettingsKey(), true).toBool(); m_blockIndexing = data.value(clangdblockIndexingSettingsKey(), false).toBool(); if (!m_useGlobalSettings) @@ -509,17 +509,17 @@ void ClangdProjectSettings::saveSettings() { if (!m_project) return; - QVariantMap data; + Store data; if (!m_useGlobalSettings) data = m_customSettings.toMap(); data.insert(clangdUseGlobalSettingsKey(), m_useGlobalSettings); data.insert(clangdblockIndexingSettingsKey(), m_blockIndexing); - m_project->setNamedSettings(clangdSettingsKey(), data); + m_project->setNamedSettings(clangdSettingsKey(), QVariant::fromValue(data)); } -QVariantMap ClangdSettings::Data::toMap() const +Store ClangdSettings::Data::toMap() const { - QVariantMap map; + Store map; map.insert(useClangdKey(), useClangd); map.insert(clangdPathKey(), executableFilePath != fallbackClangdFilePath() ? executableFilePath.toString() diff --git a/src/plugins/cppeditor/cppcodestylesettingspage.cpp b/src/plugins/cppeditor/cppcodestylesettingspage.cpp index d580f4dd99..383efef58d 100644 --- a/src/plugins/cppeditor/cppcodestylesettingspage.cpp +++ b/src/plugins/cppeditor/cppcodestylesettingspage.cpp @@ -591,15 +591,15 @@ public: CppCodeStylePreferences *originalCppCodeStylePreferences = CppToolsSettings::cppCodeStyle(); if (originalCppCodeStylePreferences->codeStyleSettings() != m_pageCppCodeStylePreferences->codeStyleSettings()) { originalCppCodeStylePreferences->setCodeStyleSettings(m_pageCppCodeStylePreferences->codeStyleSettings()); - originalCppCodeStylePreferences->toSettings(QLatin1String(CppEditor::Constants::CPP_SETTINGS_ID)); + originalCppCodeStylePreferences->toSettings(CppEditor::Constants::CPP_SETTINGS_ID); } if (originalCppCodeStylePreferences->tabSettings() != m_pageCppCodeStylePreferences->tabSettings()) { originalCppCodeStylePreferences->setTabSettings(m_pageCppCodeStylePreferences->tabSettings()); - originalCppCodeStylePreferences->toSettings(QLatin1String(CppEditor::Constants::CPP_SETTINGS_ID)); + originalCppCodeStylePreferences->toSettings(CppEditor::Constants::CPP_SETTINGS_ID); } if (originalCppCodeStylePreferences->currentDelegate() != m_pageCppCodeStylePreferences->currentDelegate()) { originalCppCodeStylePreferences->setCurrentDelegate(m_pageCppCodeStylePreferences->currentDelegate()); - originalCppCodeStylePreferences->toSettings(QLatin1String(CppEditor::Constants::CPP_SETTINGS_ID)); + originalCppCodeStylePreferences->toSettings(CppEditor::Constants::CPP_SETTINGS_ID); } m_codeStyleEditor->apply(); diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp index 3559fb7da7..16cae978a8 100644 --- a/src/plugins/cppeditor/cppeditordocument.cpp +++ b/src/plugins/cppeditor/cppeditordocument.cpp @@ -210,7 +210,7 @@ void CppEditorDocument::reparseWithPreferredParseContext(const QString &parseCon setPreferredParseContext(parseContextId); // Remember the setting - const QString key = Constants::PREFERRED_PARSE_CONTEXT + filePath().toString(); + const Key key = Constants::PREFERRED_PARSE_CONTEXT + keyFromString(filePath().toString()); Core::SessionManager::setValue(key, parseContextId); // Reprocess @@ -277,7 +277,7 @@ void CppEditorDocument::applyPreferredParseContextFromSettings() if (filePath().isEmpty()) return; - const QString key = Constants::PREFERRED_PARSE_CONTEXT + filePath().toString(); + const Key key = Constants::PREFERRED_PARSE_CONTEXT + keyFromString(filePath().toString()); const QString parseContextId = Core::SessionManager::value(key).toString(); setPreferredParseContext(parseContextId); @@ -288,7 +288,7 @@ void CppEditorDocument::applyExtraPreprocessorDirectivesFromSettings() if (filePath().isEmpty()) return; - const QString key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + filePath().toString(); + const Key key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + keyFromString(filePath().toString()); const QByteArray directives = Core::SessionManager::value(key).toString().toUtf8(); setExtraPreprocessorDirectives(directives); diff --git a/src/plugins/cppeditor/cppfilesettingspage.cpp b/src/plugins/cppeditor/cppfilesettingspage.cpp index 6b9bad8c9c..a506dff8b8 100644 --- a/src/plugins/cppeditor/cppfilesettingspage.cpp +++ b/src/plugins/cppeditor/cppfilesettingspage.cpp @@ -336,7 +336,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings) m_headerSuffixComboBox->addItem(suffix); } m_licenseTemplatePathChooser->setExpectedKind(PathChooser::File); - m_licenseTemplatePathChooser->setHistoryCompleter(QLatin1String("Cpp.LicenseTemplate.History")); + m_licenseTemplatePathChooser->setHistoryCompleter("Cpp.LicenseTemplate.History"); m_licenseTemplatePathChooser->addButton(Tr::tr("Edit..."), this, [this] { slotEdit(); }); setSettings(*m_settings); diff --git a/src/plugins/cppeditor/cppincludehierarchy.cpp b/src/plugins/cppeditor/cppincludehierarchy.cpp index 6b543f6163..51c03797fd 100644 --- a/src/plugins/cppeditor/cppincludehierarchy.cpp +++ b/src/plugins/cppeditor/cppincludehierarchy.cpp @@ -432,13 +432,13 @@ const bool kSyncDefault = false; void CppIncludeHierarchyWidget::saveSettings(QSettings *settings, int position) { - const QString key = QString("IncludeHierarchy.%1.SyncWithEditor").arg(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) { - const QString key = QString("IncludeHierarchy.%1.SyncWithEditor").arg(position); + const Key key = keyFromString(QString("IncludeHierarchy.%1.SyncWithEditor").arg(position)); m_toggleSync->setChecked(settings->value(key, kSyncDefault).toBool()); } diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp index 5fba144c0e..6b8f77a036 100644 --- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp +++ b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp @@ -334,14 +334,13 @@ public: bool insertOverrideReplacement = kInsertOVerrideReplacementDefault; private: - using _ = QLatin1String; - static QString group() { return _("QuickFix/InsertVirtualMethods"); } - static QString insertVirtualKeywordKey() { return _("insertKeywordVirtual"); } - static QString insertOverrideReplacementKey() { return _("insertOverrideReplacement"); } - static QString overrideReplacementIndexKey() { return _("overrideReplacementIndex"); } - static QString userAddedOverrideReplacementsKey() { return _("userAddedOverrideReplacements"); } - static QString implementationModeKey() { return _("implementationMode"); } - static QString hideReimplementedFunctionsKey() { return _("hideReimplementedFunctions"); } + static Key group() { return "QuickFix/InsertVirtualMethods"; } + static Key insertVirtualKeywordKey() { return "insertKeywordVirtual"; } + static Key insertOverrideReplacementKey() { return "insertOverrideReplacement"; } + static Key overrideReplacementIndexKey() { return "overrideReplacementIndex"; } + static Key userAddedOverrideReplacementsKey() { return "userAddedOverrideReplacements"; } + static Key implementationModeKey() { return "implementationMode"; } + static Key hideReimplementedFunctionsKey() { return "hideReimplementedFunctions"; } }; class InsertVirtualMethodsModel : public QAbstractItemModel diff --git a/src/plugins/cppeditor/cpppreprocessordialog.cpp b/src/plugins/cppeditor/cpppreprocessordialog.cpp index 87afd9761a..a7a39750e9 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.cpp +++ b/src/plugins/cppeditor/cpppreprocessordialog.cpp @@ -26,7 +26,7 @@ CppPreProcessorDialog::CppPreProcessorDialog(const FilePath &filePath, QWidget * resize(400, 300); setWindowTitle(Tr::tr("Additional C++ Preprocessor Directives")); - const QString key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + m_filePath.toString(); + const Key key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + keyFromString(m_filePath.toString()); const QString directives = Core::SessionManager::value(key).toString(); m_editWidget = new TextEditor::SnippetEditorWidget; @@ -55,7 +55,7 @@ int CppPreProcessorDialog::exec() if (QDialog::exec() == Rejected) return Rejected; - const QString key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + m_filePath.toString(); + const Key key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + keyFromString(m_filePath.toString()); Core::SessionManager::setValue(key, extraPreprocessorDirectives()); return Accepted; diff --git a/src/plugins/cppeditor/cppquickfixprojectsettings.cpp b/src/plugins/cppeditor/cppquickfixprojectsettings.cpp index d4d0f9b1de..6c4c6cfbe6 100644 --- a/src/plugins/cppeditor/cppquickfixprojectsettings.cpp +++ b/src/plugins/cppeditor/cppquickfixprojectsettings.cpp @@ -13,6 +13,8 @@ #include #include +using namespace Utils; + namespace CppEditor { namespace Internal { @@ -64,7 +66,7 @@ const Utils::FilePath &CppQuickFixProjectsSettings::filePathOfSettingsFile() con CppQuickFixProjectsSettings::CppQuickFixProjectsSettingsPtr CppQuickFixProjectsSettings::getSettings( ProjectExplorer::Project *project) { - const QString key = "CppQuickFixProjectsSettings"; + const Key key = "CppQuickFixProjectsSettings"; QVariant v = project->extraData(key); if (v.isNull()) { v = QVariant::fromValue( diff --git a/src/plugins/cppeditor/cpptoolssettings.cpp b/src/plugins/cppeditor/cpptoolssettings.cpp index da01d9c09e..49ceb0c963 100644 --- a/src/plugins/cppeditor/cpptoolssettings.cpp +++ b/src/plugins/cppeditor/cpptoolssettings.cpp @@ -25,6 +25,7 @@ const bool kSortEditorDocumentOutlineDefault = true; using namespace Core; using namespace TextEditor; +using namespace Utils; namespace CppEditor { namespace Internal { @@ -128,7 +129,7 @@ CppToolsSettings::CppToolsSettings() pool->loadCustomCodeStyles(); // load global settings (after built-in settings are added to the pool) - d->m_globalCodeStyle->fromSettings(QLatin1String(Constants::CPP_SETTINGS_ID)); + d->m_globalCodeStyle->fromSettings(Constants::CPP_SETTINGS_ID); // mimetypes to be handled TextEditorSettings::registerMimeTypeForLanguageId(Constants::C_SOURCE_MIMETYPE, Constants::CPP_SETTINGS_ID); @@ -158,11 +159,10 @@ CppCodeStylePreferences *CppToolsSettings::cppCodeStyle() return d->m_globalCodeStyle; } -static QString sortEditorDocumentOutlineKey() +static Key sortEditorDocumentOutlineKey() { - return QLatin1String(Constants::CPPEDITOR_SETTINGSGROUP) - + QLatin1Char('/') - + QLatin1String(Constants::CPPEDITOR_SORT_EDITOR_DOCUMENT_OUTLINE); + return Key(Constants::CPPEDITOR_SETTINGSGROUP) + + '/' + Constants::CPPEDITOR_SORT_EDITOR_DOCUMENT_OUTLINE; } bool CppToolsSettings::sortedEditorDocumentOutline() diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp index c6f9350b25..3a653d3804 100644 --- a/src/plugins/cvs/cvssettings.cpp +++ b/src/plugins/cvs/cvssettings.cpp @@ -31,7 +31,7 @@ CvsSettings::CvsSettings() binaryPath.setDefaultValue("cvs" QTC_HOST_EXE_SUFFIX); binaryPath.setExpectedKind(PathChooser::ExistingCommand); - binaryPath.setHistoryCompleter(QLatin1String("Cvs.Command.History")); + binaryPath.setHistoryCompleter("Cvs.Command.History"); binaryPath.setDisplayName(Tr::tr("CVS Command")); binaryPath.setLabelText(Tr::tr("CVS command:")); diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index 9418c704d6..bb24d674a0 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -34,7 +34,7 @@ CommonSettings &commonSettings() CommonSettings::CommonSettings() { setAutoApply(false); - const QString debugModeGroup("DebugMode"); + const Key debugModeGroup("DebugMode"); useAlternatingRowColors.setSettingsKey(debugModeGroup, "UseAlternatingRowColours"); useAlternatingRowColors.setLabelText(Tr::tr("Use alternating row colors in debug views")); @@ -220,7 +220,7 @@ LocalsAndExpressionsSettings::LocalsAndExpressionsSettings() { setAutoApply(false); - const QString debugModeGroup("DebugMode"); + const Key debugModeGroup("DebugMode"); useDebuggingHelpers.setSettingsKey(debugModeGroup, "UseDebuggingHelper"); useDebuggingHelpers.setDefaultValue(true); diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index c6f9119239..ab9d29eabf 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -86,8 +86,8 @@ DebuggerSettings::DebuggerSettings() : displayStringLimit{localsAndExpressionSettings().displayStringLimit}, defaultArraySize{localsAndExpressionSettings().defaultArraySize} { - const QString debugModeGroup("DebugMode"); - const QString cdbSettingsGroup("CDB2"); + const Key debugModeGroup("DebugMode"); + const Key cdbSettingsGroup("CDB2"); settingsDialog.setLabelText(Tr::tr("Configure Debugger...")); @@ -238,7 +238,7 @@ DebuggerSettings::DebuggerSettings() : // // QML Tools // - const QString qmlInspectorGroup = "QML.Inspector"; + const Key qmlInspectorGroup = "QML.Inspector"; showAppOnTop.setSettingsKey(qmlInspectorGroup, "QmlInspector.ShowAppOnTop"); @@ -288,7 +288,7 @@ QString DebuggerSettings::dump() { QStringList msg; settings().all.forEachAspect([&msg](BaseAspect *aspect) { - QString key = aspect->settingsKey(); + Key key = aspect->settingsKey(); if (!key.isEmpty()) { const int pos = key.indexOf('/'); if (pos >= 0) diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index 241ac32ecd..c80ce3deb1 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -78,7 +78,7 @@ DebuggerItem::DebuggerItem(const QVariant &id) m_id = id; } -DebuggerItem::DebuggerItem(const QVariantMap &data) +DebuggerItem::DebuggerItem(const Store &data) { m_id = data.value(DEBUGGER_INFORMATION_ID).toString(); m_command = FilePath::fromSettings(data.value(DEBUGGER_INFORMATION_COMMAND)); @@ -345,9 +345,9 @@ bool DebuggerItem::operator==(const DebuggerItem &other) const && m_workingDirectory == other.m_workingDirectory; } -QVariantMap DebuggerItem::toMap() const +Store DebuggerItem::toMap() const { - QVariantMap data; + Store data; data.insert(DEBUGGER_INFORMATION_DISPLAYNAME, m_unexpandedDisplayName); data.insert(DEBUGGER_INFORMATION_ID, m_id); data.insert(DEBUGGER_INFORMATION_COMMAND, m_command.toSettings()); diff --git a/src/plugins/debugger/debuggeritem.h b/src/plugins/debugger/debuggeritem.h index e32ded91f8..dcdd80ad7c 100644 --- a/src/plugins/debugger/debuggeritem.h +++ b/src/plugins/debugger/debuggeritem.h @@ -30,7 +30,7 @@ class DEBUGGER_EXPORT DebuggerItem { public: DebuggerItem(); - DebuggerItem(const QVariantMap &data); + DebuggerItem(const Utils::Store &data); void createId(); bool canClone() const { return true; } diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index dccc18290e..64ec70193c 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -755,7 +755,7 @@ void DebuggerItemModel::readDebuggers(const FilePath &fileName, bool isSystem) PersistentSettingsReader reader; if (!reader.load(fileName)) return; - QVariantMap data = reader.restoreValues(); + Store data = reader.restoreValues(); // Check version int version = data.value(DEBUGGER_FILE_VERSION_KEY, 0).toInt(); @@ -764,10 +764,10 @@ void DebuggerItemModel::readDebuggers(const FilePath &fileName, bool isSystem) int count = data.value(DEBUGGER_COUNT_KEY, 0).toInt(); for (int i = 0; i < count; ++i) { - const QString key = DEBUGGER_DATA_KEY + QString::number(i); + const Key key = DEBUGGER_DATA_KEY + Key::number(i); if (!data.contains(key)) continue; - const QVariantMap dbMap = data.value(key).toMap(); + const Store dbMap = data.value(key).value(); DebuggerItem item(dbMap); if (isSystem) { item.setAutoDetected(true); @@ -811,7 +811,7 @@ void DebuggerItemModel::restoreDebuggers() void DebuggerItemModel::saveDebuggers() { - QVariantMap data; + Store data; data.insert(DEBUGGER_FILE_VERSION_KEY, 1); int count = 0; @@ -819,9 +819,9 @@ void DebuggerItemModel::saveDebuggers() if (item.isGeneric()) // do not store generic debuggers, these get added automatically return; if (item.isValid() && item.engineType() != NoEngineType) { - QVariantMap tmp = item.toMap(); + Store tmp = item.toMap(); if (!tmp.isEmpty()) { - data.insert(DEBUGGER_DATA_KEY + QString::number(count), tmp); + data.insert(DEBUGGER_DATA_KEY + Key::number(count), QVariant::fromValue(tmp)); ++count; } } diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index e37381f18d..b8e0f1344f 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -795,9 +795,9 @@ void DockerDevice::fromMap(const Store &map) d->setData(data); } -QVariantMap DockerDevice::toMap() const +Store DockerDevice::toMap() const { - QVariantMap map = ProjectExplorer::IDevice::toMap(); + Store map = ProjectExplorer::IDevice::toMap(); DockerDeviceData data = d->data(); map.insert(DockerDeviceDataRepoKey, data.repo); diff --git a/src/plugins/incredibuild/buildconsolebuildstep.cpp b/src/plugins/incredibuild/buildconsolebuildstep.cpp index 19ac73dd0c..61b40a8b2f 100644 --- a/src/plugins/incredibuild/buildconsolebuildstep.cpp +++ b/src/plugins/incredibuild/buildconsolebuildstep.cpp @@ -155,7 +155,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id monFile.setLabelText(Tr::tr("Save IncrediBuild monitor file:")); monFile.setExpectedKind(PathChooser::Kind::Any); monFile.setBaseFileName(PathChooser::homePath()); - monFile.setHistoryCompleter(QLatin1String("IncrediBuild.BuildConsole.MonFile.History")); + monFile.setHistoryCompleter("IncrediBuild.BuildConsole.MonFile.History"); monFile.setToolTip(Tr::tr("Writes a copy of the build progress file (.ib_mon) to the specified " "location. If only a folder name is given, a generated GUID will serve " "as the file name. The full path of the saved Build Monitor will be " @@ -169,7 +169,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id logFile.setLabelText(Tr::tr("Output Log file:")); logFile.setExpectedKind(PathChooser::Kind::SaveFile); logFile.setBaseFileName(PathChooser::homePath()); - logFile.setHistoryCompleter(QLatin1String("IncrediBuild.BuildConsole.LogFile.History")); + logFile.setHistoryCompleter("IncrediBuild.BuildConsole.LogFile.History"); logFile.setToolTip(Tr::tr("Writes build output to a file.")); showCmd.setSettingsKey("IncrediBuild.BuildConsole.ShowCmd"); diff --git a/src/plugins/incredibuild/commandbuilder.cpp b/src/plugins/incredibuild/commandbuilder.cpp index ffe2f2f8c0..5d99ed2e8a 100644 --- a/src/plugins/incredibuild/commandbuilder.cpp +++ b/src/plugins/incredibuild/commandbuilder.cpp @@ -12,6 +12,11 @@ namespace IncrediBuild::Internal { const char CUSTOMCOMMANDBUILDER_COMMAND[] = "IncrediBuild.BuildConsole.%1.Command"; const char CUSTOMCOMMANDBUILDER_ARGS[] = "IncrediBuild.BuildConsole.%1.Arguments"; +static Key key(const QString &pattern, const QString &id) +{ + return keyFromString(pattern.arg(id)); +} + QString CommandBuilder::displayName() const { return Tr::tr("Custom Command"); @@ -19,14 +24,14 @@ QString CommandBuilder::displayName() const void CommandBuilder::fromMap(const Store &map) { - m_command = FilePath::fromSettings(map.value(QString(CUSTOMCOMMANDBUILDER_COMMAND).arg(id()))); - m_args = map.value(QString(CUSTOMCOMMANDBUILDER_ARGS).arg(id())).toString(); + m_command = FilePath::fromSettings(map.value(key(CUSTOMCOMMANDBUILDER_COMMAND, id()))); + m_args = map.value(key(CUSTOMCOMMANDBUILDER_ARGS, id())).toString(); } -void CommandBuilder::toMap(QVariantMap *map) const +void CommandBuilder::toMap(Store *map) const { - (*map)[QString(CUSTOMCOMMANDBUILDER_COMMAND).arg(id())] = m_command.toSettings(); - (*map)[QString(CUSTOMCOMMANDBUILDER_ARGS).arg(id())] = QVariant(m_args); + map->insert(key(CUSTOMCOMMANDBUILDER_COMMAND, id()), m_command.toSettings()); + map->insert(key(CUSTOMCOMMANDBUILDER_ARGS, id()), QVariant(m_args)); } void CommandBuilder::setCommand(const FilePath &command) diff --git a/src/plugins/incredibuild/commandbuilder.h b/src/plugins/incredibuild/commandbuilder.h index 2a2115344f..bebc0934f1 100644 --- a/src/plugins/incredibuild/commandbuilder.h +++ b/src/plugins/incredibuild/commandbuilder.h @@ -21,7 +21,7 @@ public: virtual QString displayName() const; virtual void fromMap(const Utils::Store &map); - virtual void toMap(QVariantMap *map) const; + virtual void toMap(Utils::Store *map) const; virtual Utils::FilePath defaultCommand() const { return {}; } virtual QString defaultArguments() const { return QString(); } diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index 200f6772d2..1b1ff9e29c 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -563,9 +563,9 @@ Client *BaseSettings::createClient(BaseClientInterface *interface) const return new Client(interface); } -QVariantMap BaseSettings::toMap() const +Store BaseSettings::toMap() const { - QVariantMap map; + Store map; map.insert(typeIdKey, m_settingsTypeId.toSetting()); map.insert(nameKey, m_name); map.insert(idKey, m_id); @@ -612,8 +612,8 @@ QList LanguageClientSettings::fromSettings(QSettings *settingsIn for (auto varList : {settingsIn->value(clientsKey).toList(), settingsIn->value(typedClientsKey).toList()}) { for (const QVariant &var : varList) { - const QMap &map = var.toMap(); - Utils::Id typeId = Utils::Id::fromSetting(map.value(typeIdKey)); + const Store map = var.value(); + Id typeId = Id::fromSetting(map.value(typeIdKey)); if (!typeId.isValid()) typeId = Constants::LANGUAGECLIENT_STDIO_SETTINGS_ID; if (BaseSettings *settings = generateSettings(typeId)) { @@ -659,7 +659,7 @@ void LanguageClientSettings::toSettings(QSettings *settings, settings->beginGroup(settingsGroupKey); auto transform = [](const QList &settings) { return Utils::transform(settings, [](const BaseSettings *setting) { - return QVariant(setting->toMap()); + return QVariant::fromValue(setting->toMap()); }); }; auto isStdioSetting = Utils::equal(&BaseSettings::m_settingsTypeId, @@ -714,9 +714,9 @@ bool StdIOSettings::isValid() const return BaseSettings::isValid() && !m_executable.isEmpty(); } -QVariantMap StdIOSettings::toMap() const +Store StdIOSettings::toMap() const { - QVariantMap map = BaseSettings::toMap(); + Store map = BaseSettings::toMap(); map.insert(executableKey, m_executable.toSettings()); map.insert(argumentsKey, m_arguments); return map; diff --git a/src/plugins/mesonprojectmanager/mesonwrapper.h b/src/plugins/mesonprojectmanager/mesonwrapper.h index 6ec1e57a0f..4312a63c34 100644 --- a/src/plugins/mesonprojectmanager/mesonwrapper.h +++ b/src/plugins/mesonprojectmanager/mesonwrapper.h @@ -78,18 +78,18 @@ public: Command introspect(const Utils::FilePath &sourceDirectory) const; - static inline std::optional find() + static std::optional find() { return ToolWrapper::findTool({"meson.py", "meson"}); } - static inline QString toolName() { return {"Meson"}; }; + static QString toolName() { return {"Meson"}; } }; template<> -inline QVariantMap toVariantMap(const MesonWrapper &meson) +inline Utils::Store toVariantMap(const MesonWrapper &meson) { - QVariantMap data; + Utils::Store data; data.insert(Constants::ToolsSettings::NAME_KEY, meson.m_name); data.insert(Constants::ToolsSettings::EXE_KEY, meson.m_exe.toSettings()); data.insert(Constants::ToolsSettings::AUTO_DETECTED_KEY, meson.m_autoDetected); @@ -98,7 +98,7 @@ inline QVariantMap toVariantMap(const MesonWrapper &meson) return data; } template<> -inline MesonWrapper *fromVariantMap(const QVariantMap &data) +inline MesonWrapper *fromVariantMap(const Utils::Store &data) { return new MesonWrapper(data[Constants::ToolsSettings::NAME_KEY].toString(), Utils::FilePath::fromSettings(data[Constants::ToolsSettings::EXE_KEY]), diff --git a/src/plugins/mesonprojectmanager/ninjawrapper.h b/src/plugins/mesonprojectmanager/ninjawrapper.h index 4b99fdf402..93339d37f9 100644 --- a/src/plugins/mesonprojectmanager/ninjawrapper.h +++ b/src/plugins/mesonprojectmanager/ninjawrapper.h @@ -14,17 +14,17 @@ class NinjaWrapper final : public ToolWrapper public: using ToolWrapper::ToolWrapper; - static inline std::optional find() + static std::optional find() { return ToolWrapper::findTool({"ninja", "ninja-build"}); } - static inline QString toolName() { return {"Ninja"}; }; + static QString toolName() { return {"Ninja"}; } }; template<> -inline QVariantMap toVariantMap(const NinjaWrapper &meson) +inline Utils::Store toVariantMap(const NinjaWrapper &meson) { - QVariantMap data; + Utils::Store data; data.insert(Constants::ToolsSettings::NAME_KEY, meson.m_name); data.insert(Constants::ToolsSettings::EXE_KEY, meson.m_exe.toSettings()); data.insert(Constants::ToolsSettings::AUTO_DETECTED_KEY, meson.m_autoDetected); @@ -33,7 +33,7 @@ inline QVariantMap toVariantMap(const NinjaWrapper &meson) return data; } template<> -inline NinjaWrapper *fromVariantMap(const QVariantMap &data) +inline NinjaWrapper *fromVariantMap(const Utils::Store &data) { return new NinjaWrapper(data[Constants::ToolsSettings::NAME_KEY].toString(), Utils::FilePath::fromSettings(data[Constants::ToolsSettings::EXE_KEY]), diff --git a/src/plugins/mesonprojectmanager/toolitemsettings.cpp b/src/plugins/mesonprojectmanager/toolitemsettings.cpp index a0591b905c..1b66cc2d03 100644 --- a/src/plugins/mesonprojectmanager/toolitemsettings.cpp +++ b/src/plugins/mesonprojectmanager/toolitemsettings.cpp @@ -22,7 +22,7 @@ ToolItemSettings::ToolItemSettings(QWidget *parent) m_mesonPathChooser = new PathChooser; m_mesonPathChooser->setExpectedKind(PathChooser::ExistingCommand); - m_mesonPathChooser->setHistoryCompleter(QLatin1String("Meson.Command.History")); + m_mesonPathChooser->setHistoryCompleter("Meson.Command.History"); using namespace Layouting; diff --git a/src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp b/src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp index 539e5c1124..92dc4f41d0 100644 --- a/src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp +++ b/src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp @@ -7,20 +7,23 @@ #include "mesonprojectmanagertr.h" #include -#include + +#include +#include #include -#include #include #include +using namespace Utils; + namespace MesonProjectManager { namespace Internal { -static QString entryName(int index) +static Key entryName(int index) { - return QString("%1%2").arg(Constants::ToolsSettings::ENTRY_KEY).arg(index); + return Constants::ToolsSettings::ENTRY_KEY + Key::number(index); } ToolsSettingsAccessor::ToolsSettingsAccessor() @@ -34,16 +37,16 @@ void ToolsSettingsAccessor::saveMesonTools(const std::vector QWidget *parent) { using namespace Constants; - QVariantMap data; + Store data; int entry_count = 0; for (const MesonTools::Tool_t &tool : tools) { auto asMeson = std::dynamic_pointer_cast(tool); if (asMeson) - data.insert(entryName(entry_count), toVariantMap(*asMeson)); + data.insert(entryName(entry_count), QVariant::fromValue(toVariantMap(*asMeson))); else { auto asNinja = std::dynamic_pointer_cast(tool); if (asNinja) - data.insert(entryName(entry_count), toVariantMap(*asNinja)); + data.insert(entryName(entry_count), QVariant::fromValue(toVariantMap(*asNinja))); } entry_count++; } @@ -58,14 +61,14 @@ std::vector ToolsSettingsAccessor::loadMesonTools(QWidget *p auto entry_count = data.value(ToolsSettings::ENTRY_COUNT, 0).toInt(); std::vector result; for (auto toolIndex = 0; toolIndex < entry_count; toolIndex++) { - auto name = entryName(toolIndex); + Key name = entryName(toolIndex); if (data.contains(name)) { const auto map = data[name].toMap(); auto type = map.value(ToolsSettings::TOOL_TYPE_KEY, ToolsSettings::TOOL_TYPE_MESON); if (type == ToolsSettings::TOOL_TYPE_NINJA) - result.emplace_back(fromVariantMap(data[name].toMap())); + result.emplace_back(fromVariantMap(data[name].value())); else - result.emplace_back(fromVariantMap(data[name].toMap())); + result.emplace_back(fromVariantMap(data[name].value())); } } return result; diff --git a/src/plugins/mesonprojectmanager/toolwrapper.cpp b/src/plugins/mesonprojectmanager/toolwrapper.cpp index 83ed27f495..632465c219 100644 --- a/src/plugins/mesonprojectmanager/toolwrapper.cpp +++ b/src/plugins/mesonprojectmanager/toolwrapper.cpp @@ -5,6 +5,8 @@ #include +#include + namespace MesonProjectManager { namespace Internal { diff --git a/src/plugins/mesonprojectmanager/toolwrapper.h b/src/plugins/mesonprojectmanager/toolwrapper.h index be7bbb5a11..47fe583eff 100644 --- a/src/plugins/mesonprojectmanager/toolwrapper.h +++ b/src/plugins/mesonprojectmanager/toolwrapper.h @@ -7,14 +7,9 @@ #include #include -#include #include #include - -#include -#include -#include -#include +#include #include @@ -32,17 +27,17 @@ public: : m_cmd{exe, args} , m_workDir{workDir} {} - inline const Utils::CommandLine &cmdLine() const { return m_cmd; } - inline const Utils::FilePath &workDir() const { return m_workDir; } - inline Utils::FilePath executable() const { return m_cmd.executable(); } - inline QStringList arguments() const { return m_cmd.splitArguments(); } - inline QString toUserOutput() const { return m_cmd.toUserOutput(); }; + const Utils::CommandLine &cmdLine() const { return m_cmd; } + const Utils::FilePath &workDir() const { return m_workDir; } + Utils::FilePath executable() const { return m_cmd.executable(); } + QStringList arguments() const { return m_cmd.splitArguments(); } + QString toUserOutput() const { return m_cmd.toUserOutput(); } }; class ToolWrapper { public: - virtual ~ToolWrapper(){}; + virtual ~ToolWrapper() {} ToolWrapper() = delete; ToolWrapper(const QString &name, const Utils::FilePath &path, bool autoDetected = false); ToolWrapper(const QString &name, @@ -54,12 +49,12 @@ public: ToolWrapper &operator=(const ToolWrapper &other) = default; ToolWrapper &operator=(ToolWrapper &&other) = default; - inline const Version &version() const noexcept { return m_version; }; - inline bool isValid() const noexcept { return m_isValid; }; - inline bool autoDetected() const noexcept { return m_autoDetected; }; - inline Utils::Id id() const noexcept { return m_id; }; - inline Utils::FilePath exe() const noexcept { return m_exe; }; - inline QString name() const noexcept { return m_name; }; + const Version &version() const noexcept { return m_version; } + bool isValid() const noexcept { return m_isValid; } + bool autoDetected() const noexcept { return m_autoDetected; } + Utils::Id id() const noexcept { return m_id; } + Utils::FilePath exe() const noexcept { return m_exe; } + QString name() const noexcept { return m_name; } inline void setName(const QString &newName) { m_name = newName; } virtual void setExe(const Utils::FilePath &newExe); @@ -69,9 +64,9 @@ public: static std::optional findTool(const QStringList &exeNames); template - friend QVariantMap toVariantMap(const T &); + friend Utils::Store toVariantMap(const T &); template - friend T fromVariantMap(const QVariantMap &); + friend T fromVariantMap(const Utils::Store &); protected: Version m_version; @@ -83,9 +78,9 @@ protected: }; template -QVariantMap toVariantMap(const T &); +Utils::Store toVariantMap(const T &); template -T fromVariantMap(const QVariantMap &); +T fromVariantMap(const Utils::Store &); } // namespace Internal } // namespace MesonProjectManager diff --git a/src/plugins/nim/nimconstants.h b/src/plugins/nim/nimconstants.h index 3c0b6f4cb3..31dfd8c469 100644 --- a/src/plugins/nim/nimconstants.h +++ b/src/plugins/nim/nimconstants.h @@ -35,9 +35,9 @@ const char C_NIMBLETASKSTEP_TASKARGS[] = "Nim.NimbleTaskStep.TaskArgs"; // NimCompilerBuildStep const char C_NIMCOMPILERBUILDSTEP_ID[] = "Nim.NimCompilerBuildStep"; -const QString C_NIMCOMPILERBUILDSTEP_USERCOMPILEROPTIONS = QStringLiteral("Nim.NimCompilerBuildStep.UserCompilerOptions"); -const QString C_NIMCOMPILERBUILDSTEP_DEFAULTBUILDOPTIONS = QStringLiteral("Nim.NimCompilerBuildStep.DefaultBuildOptions"); -const QString C_NIMCOMPILERBUILDSTEP_TARGETNIMFILE = QStringLiteral("Nim.NimCompilerBuildStep.TargetNimFile"); +const char C_NIMCOMPILERBUILDSTEP_USERCOMPILEROPTIONS[] = "Nim.NimCompilerBuildStep.UserCompilerOptions"; +const char C_NIMCOMPILERBUILDSTEP_DEFAULTBUILDOPTIONS[] = "Nim.NimCompilerBuildStep.DefaultBuildOptions"; +const char C_NIMCOMPILERBUILDSTEP_TARGETNIMFILE[] = "Nim.NimCompilerBuildStep.TargetNimFile"; // NimCompilerCleanStep const char C_NIMCOMPILERCLEANSTEP_ID[] = "Nim.NimCompilerCleanStep"; diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.cpp b/src/plugins/nim/settings/nimcodestylesettingspage.cpp index c2b0d6d194..270097508f 100644 --- a/src/plugins/nim/settings/nimcodestylesettingspage.cpp +++ b/src/plugins/nim/settings/nimcodestylesettingspage.cpp @@ -67,7 +67,7 @@ static void createGlobalCodeStyle() pool->loadCustomCodeStyles(); // load global settings (after built-in settings are added to the pool) - m_globalCodeStyle->fromSettings(QLatin1String(Nim::Constants::C_NIMLANGUAGE_ID)); + m_globalCodeStyle->fromSettings(Nim::Constants::C_NIMLANGUAGE_ID); TextEditorSettings::registerMimeTypeForLanguageId(Nim::Constants::C_NIM_MIMETYPE, Nim::Constants::C_NIMLANGUAGE_ID); @@ -111,7 +111,7 @@ public: void apply() final { QTC_ASSERT(m_globalCodeStyle, return); - m_globalCodeStyle->toSettings(QLatin1String(Nim::Constants::C_NIMLANGUAGE_ID)); + m_globalCodeStyle->toSettings(Nim::Constants::C_NIMLANGUAGE_ID); } private: diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp index 22958e0819..d3c543ab9d 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp @@ -43,7 +43,7 @@ ClassDefinition::ClassDefinition(QWidget *parent) : m_pluginSourceEdit = new QLineEdit; m_iconPathChooser = new Utils::PathChooser; m_iconPathChooser->setExpectedKind(Utils::PathChooser::File); - m_iconPathChooser->setHistoryCompleter(QLatin1String("Qmake.Icon.History")); + m_iconPathChooser->setHistoryCompleter("Qmake.Icon.History"); m_iconPathChooser->setPromptDialogTitle(Tr::tr("Select Icon")); m_iconPathChooser->setPromptDialogFilter(Tr::tr("Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)")); Form { diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 4fb123079e..8806e2a79b 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -190,7 +190,7 @@ QmakeBuildConfiguration::~QmakeBuildConfiguration() void QmakeBuildConfiguration::toMap(Store &map) const { BuildConfiguration::toMap(map); - map.insert(QLatin1String(BUILD_CONFIGURATION_KEY), int(m_qmakeBuildConfiguration)); + map.insert(BUILD_CONFIGURATION_KEY, int(m_qmakeBuildConfiguration)); } void QmakeBuildConfiguration::fromMap(const Store &map) @@ -199,7 +199,7 @@ void QmakeBuildConfiguration::fromMap(const Store &map) if (hasError()) return; - m_qmakeBuildConfiguration = QtVersion::QmakeBuildConfigs(map.value(QLatin1String(BUILD_CONFIGURATION_KEY)).toInt()); + m_qmakeBuildConfiguration = QtVersion::QmakeBuildConfigs(map.value(BUILD_CONFIGURATION_KEY).toInt()); m_lastKitState = LastKitState(kit()); } diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp index ad7b664431..4917e8c59a 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp @@ -75,7 +75,7 @@ bool ComponentNameDialog::go(QString *proposedName, *proposedName = QLatin1String("MyComponent"); d.m_componentNameEdit->setText(*proposedName); d.m_pathEdit->setExpectedKind(Utils::PathChooser::ExistingDirectory); - d.m_pathEdit->setHistoryCompleter(QLatin1String("QmlJs.Component.History")); + d.m_pathEdit->setHistoryCompleter("QmlJs.Component.History"); d.m_pathEdit->setPath(*proposedPath); d.m_label->setText(Tr::tr("Property assignments for %1:").arg(oldFileName)); d.m_checkBox->setChecked(isUiFile); diff --git a/src/plugins/qmljstools/qmljscodestylepreferences.cpp b/src/plugins/qmljstools/qmljscodestylepreferences.cpp index 4186197431..f19c40a7b8 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferences.cpp +++ b/src/plugins/qmljstools/qmljscodestylepreferences.cpp @@ -69,11 +69,11 @@ void QmlJSCodeStylePreferences::slotCurrentValueChanged(const QVariant &value) emit currentCodeStyleSettingsChanged(value.value()); } -QVariantMap QmlJSCodeStylePreferences::toMap() const +Store QmlJSCodeStylePreferences::toMap() const { - QVariantMap map = ICodeStylePreferences::toMap(); + Store map = ICodeStylePreferences::toMap(); if (!currentDelegate()) { - const QVariantMap dataMap = m_data.toMap(); + const Store dataMap = m_data.toMap(); for (auto it = dataMap.begin(), end = dataMap.end(); it != end; ++it) map.insert(it.key(), it.value()); } diff --git a/src/plugins/qmljstools/qmljscodestylesettings.cpp b/src/plugins/qmljstools/qmljscodestylesettings.cpp index cce1f4112f..e08575af66 100644 --- a/src/plugins/qmljstools/qmljscodestylesettings.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettings.cpp @@ -27,7 +27,7 @@ namespace QmlJSTools { QmlJSCodeStyleSettings::QmlJSCodeStyleSettings() = default; -QVariantMap QmlJSCodeStyleSettings::toMap() const +Store QmlJSCodeStyleSettings::toMap() const { return { {lineLengthKey, lineLength} diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index a48ce825ea..f332f1ad0d 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -147,15 +147,15 @@ public: QmlJSCodeStylePreferences *originalPreferences = QmlJSToolsSettings::globalCodeStyle(); if (originalPreferences->codeStyleSettings() != m_preferences.codeStyleSettings()) { originalPreferences->setCodeStyleSettings(m_preferences.codeStyleSettings()); - originalPreferences->toSettings(QLatin1String(QmlJSTools::Constants::QML_JS_SETTINGS_ID)); + originalPreferences->toSettings(QmlJSTools::Constants::QML_JS_SETTINGS_ID); } if (originalPreferences->tabSettings() != m_preferences.tabSettings()) { originalPreferences->setTabSettings(m_preferences.tabSettings()); - originalPreferences->toSettings(QLatin1String(QmlJSTools::Constants::QML_JS_SETTINGS_ID)); + originalPreferences->toSettings(QmlJSTools::Constants::QML_JS_SETTINGS_ID); } if (originalPreferences->currentDelegate() != m_preferences.currentDelegate()) { originalPreferences->setCurrentDelegate(m_preferences.currentDelegate()); - originalPreferences->toSettings(QLatin1String(QmlJSTools::Constants::QML_JS_SETTINGS_ID)); + originalPreferences->toSettings(QmlJSTools::Constants::QML_JS_SETTINGS_ID); } } diff --git a/src/plugins/qmljstools/qmljstoolssettings.cpp b/src/plugins/qmljstools/qmljstoolssettings.cpp index 5a7e0ac309..bb4c813ce0 100644 --- a/src/plugins/qmljstools/qmljstoolssettings.cpp +++ b/src/plugins/qmljstools/qmljstoolssettings.cpp @@ -68,7 +68,7 @@ QmlJSToolsSettings::QmlJSToolsSettings() pool->loadCustomCodeStyles(); // load global settings (after built-in settings are added to the pool) - m_globalCodeStyle->fromSettings(QLatin1String(QmlJSTools::Constants::QML_JS_SETTINGS_ID)); + m_globalCodeStyle->fromSettings(QmlJSTools::Constants::QML_JS_SETTINGS_ID); // mimetypes to be handled TextEditorSettings::registerMimeTypeForLanguageId(Constants::QML_MIMETYPE, Constants::QML_JS_SETTINGS_ID); diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp index 4c56cf316f..19bf396ce7 100644 --- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp +++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp @@ -27,7 +27,7 @@ using namespace QmlPreview::Internal; namespace QmlPreview { -static const QString QmlServerUrl = "QmlServerUrl"; +static const Key QmlServerUrl = "QmlServerUrl"; class QmlPreviewRunner : public ProjectExplorer::RunWorker { diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp index cee980479c..8ca68acbc3 100644 --- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp @@ -62,7 +62,7 @@ QmlMultiLanguageAspect::QmlMultiLanguageAspect(AspectContainer *container) setToolTip(Tr::tr("Reads translations from MultiLanguage plugin.")); setDefaultValue(!databaseFilePath().isEmpty()); - QVariantMap getDefaultValues; + Store getDefaultValues; fromMap(getDefaultValues); addDataExtractor(this, &QmlMultiLanguageAspect::origin, &Data::origin); diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 248eabfdd3..046154af64 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -682,9 +682,9 @@ void QtVersion::fromMap(const Store &map, const FilePath &filePath) d->m_qmlRuntimePath.clear(); } -QVariantMap QtVersion::toMap() const +Store QtVersion::toMap() const { - QVariantMap result; + Store result; result.insert(Constants::QTVERSIONID, uniqueId()); d->m_data.unexpandedDisplayName.toMap(result, Constants::QTVERSIONNAME); @@ -2323,7 +2323,7 @@ bool QtVersionFactory::canRestore(const QString &type) return type == m_supportedType; } -QtVersion *QtVersionFactory::restore(const QString &type, const QVariantMap &data, const FilePath &filePath) +QtVersion *QtVersionFactory::restore(const QString &type, const Store &data, const FilePath &filePath) { QTC_ASSERT(canRestore(type), return nullptr); QTC_ASSERT(m_creator, return nullptr); diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 7bc7192185..5e0292c757 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -96,7 +96,7 @@ FilePath ExamplesWelcomePage::copyToAlternativeLocation(const FilePath &proFile, auto chooser = new PathChooser; txt->setBuddy(chooser); chooser->setExpectedKind(PathChooser::ExistingDirectory); - chooser->setHistoryCompleter(QLatin1String("Qt.WritableExamplesDir.History")); + chooser->setHistoryCompleter("Qt.WritableExamplesDir.History"); const FilePath defaultRootDirectory = DocumentManager::projectsDirectory(); QtcSettings *settings = ICore::settings(); chooser->setFilePath( diff --git a/src/plugins/qtsupport/qtversionfactory.h b/src/plugins/qtsupport/qtversionfactory.h index 1f29cf0394..2832fe55fb 100644 --- a/src/plugins/qtsupport/qtversionfactory.h +++ b/src/plugins/qtsupport/qtversionfactory.h @@ -5,7 +5,7 @@ #include "qtsupport_global.h" -#include +#include namespace Utils { class FilePath; } @@ -22,7 +22,7 @@ public: static const QList allQtVersionFactories(); bool canRestore(const QString &type); - QtVersion *restore(const QString &type, const QVariantMap &data, const Utils::FilePath &workingDirectory); + QtVersion *restore(const QString &type, const Utils::Store &data, const Utils::FilePath &workingDirectory); /// factories with higher priority are asked first to identify /// a qtversion, the priority of the desktop factory is 0 and diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index b00291e604..d8cb2407fc 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -169,17 +169,17 @@ static bool restoreQtVersions() if (!reader.load(filename)) return false; - QVariantMap data = reader.restoreValues(); + Store data = reader.restoreValues(); // Check version: const int version = data.value(QTVERSION_FILE_VERSION_KEY, 0).toInt(); if (version < 1) return false; - const QString keyPrefix(QTVERSION_DATA_KEY); - const QVariantMap::ConstIterator dcend = data.constEnd(); - for (QVariantMap::ConstIterator it = data.constBegin(); it != dcend; ++it) { - const QString &key = it.key(); + const Key keyPrefix(QTVERSION_DATA_KEY); + const Store::ConstIterator dcend = data.constEnd(); + for (Store::ConstIterator it = data.constBegin(); it != dcend; ++it) { + const Key &key = it.key(); if (!key.startsWith(keyPrefix)) continue; bool ok; @@ -187,7 +187,7 @@ static bool restoreQtVersions() if (!ok || count < 0) continue; - const QVariantMap qtversionMap = it.value().toMap(); + const Store qtversionMap = it.value().value(); const QString type = qtversionMap.value(QTVERSION_TYPE_KEY).toString(); bool restored = false; @@ -234,7 +234,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal) const QList factories = QtVersionFactory::allQtVersionFactories(); PersistentSettingsReader reader; - QVariantMap data; + Store data; if (reader.load(path)) data = reader.restoreValues(); @@ -250,10 +250,10 @@ void QtVersionManager::updateFromInstaller(bool emitSignal) QStringList sdkVersions; - const QString keyPrefix(QTVERSION_DATA_KEY); - const QVariantMap::ConstIterator dcend = data.constEnd(); - for (QVariantMap::ConstIterator it = data.constBegin(); it != dcend; ++it) { - const QString &key = it.key(); + const Key keyPrefix(QTVERSION_DATA_KEY); + const Store::ConstIterator dcend = data.constEnd(); + for (Store::ConstIterator it = data.constBegin(); it != dcend; ++it) { + const Key &key = it.key(); if (!key.startsWith(keyPrefix)) continue; bool ok; @@ -261,7 +261,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal) if (!ok || count < 0) continue; - QVariantMap qtversionMap = it.value().toMap(); + Store qtversionMap = it.value().value(); const QString type = qtversionMap.value(QTVERSION_TYPE_KEY).toString(); const QString autoDetectionSource = qtversionMap.value("autodetectionSource").toString(); sdkVersions << autoDetectionSource; @@ -350,16 +350,16 @@ static void saveQtVersions() if (!m_writer) return; - QVariantMap data; + Store data; data.insert(QTVERSION_FILE_VERSION_KEY, 1); int count = 0; for (QtVersion *qtv : std::as_const(m_versions)) { - QVariantMap tmp = qtv->toMap(); + Store tmp = qtv->toMap(); if (tmp.isEmpty()) continue; tmp.insert(QTVERSION_TYPE_KEY, qtv->type()); - data.insert(QString::fromLatin1(QTVERSION_DATA_KEY) + QString::number(count), tmp); + data.insert(QTVERSION_DATA_KEY + Key::number(count), QVariant::fromValue(tmp)); ++count; } m_writer->save(data, Core::ICore::dialogParent()); diff --git a/src/plugins/terminal/terminalsettings.cpp b/src/plugins/terminal/terminalsettings.cpp index 46fe21426d..ea7d48762f 100644 --- a/src/plugins/terminal/terminalsettings.cpp +++ b/src/plugins/terminal/terminalsettings.cpp @@ -67,7 +67,7 @@ void setupColor(TerminalSettings *settings, const QString &label, const QColor &defaultColor) { - color.setSettingsKey(label); + color.setSettingsKey(keyFromString(label)); color.setDefaultValue(defaultColor); color.setToolTip(Tr::tr("The color used for %1.").arg(label)); settings->registerAspect(&color); -- cgit v1.2.3