From 557957a59f4b24d00bb9716978d0bd0db261669c Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 2 May 2022 12:45:33 +0200 Subject: [PATCH] Core: Remove compatibility code path for 4.13 settings Change-Id: If4449a0de502ad2791befb117c8b3a9c95c2d2d5 Reviewed-by: Eike Ziller --- .../coreplugin/actionmanager/actionmanager.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index 411b7f2cfb9..1c7101d92dc 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -45,7 +45,6 @@ namespace { enum { warnAboutFindFailures = 0 }; } -static const char kKeyboardSettingsKey[] = "KeyboardShortcuts"; static const char kKeyboardSettingsKeyV2[] = "KeyboardShortcutsV2"; using namespace Core; @@ -484,13 +483,8 @@ Action *ActionManagerPrivate::overridableAction(Id id) void ActionManagerPrivate::readUserSettings(Id id, Action *cmd) { - // TODO Settings V2 were introduced in Qt Creator 4.13, remove old settings at some point QSettings *settings = ICore::settings(); - // transfer from old settings if not done before - const QString group = settings->childGroups().contains(kKeyboardSettingsKeyV2) - ? QString(kKeyboardSettingsKeyV2) - : QString(kKeyboardSettingsKey); - settings->beginGroup(group); + settings->beginGroup(kKeyboardSettingsKeyV2); if (settings->contains(id.toString())) { const QVariant v = settings->value(id.toString()); if (QMetaType::Type(v.type()) == QMetaType::QStringList) { @@ -508,16 +502,13 @@ void ActionManagerPrivate::saveSettings(Action *cmd) { const QString id = cmd->id().toString(); const QString settingsKey = QLatin1String(kKeyboardSettingsKeyV2) + '/' + id; - const QString compatSettingsKey = QLatin1String(kKeyboardSettingsKey) + '/' + id; const QList keys = cmd->keySequences(); const QList defaultKeys = cmd->defaultKeySequences(); if (keys != defaultKeys) { if (keys.isEmpty()) { ICore::settings()->setValue(settingsKey, QString()); - ICore::settings()->setValue(compatSettingsKey, QString()); } else if (keys.size() == 1) { ICore::settings()->setValue(settingsKey, keys.first().toString()); - ICore::settings()->setValue(compatSettingsKey, keys.first().toString()); } else { ICore::settings()->setValue(settingsKey, Utils::transform(keys,