feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Remove compatibility code path for 4.13 settings

Browse Source 
Change-Id: If4449a0de502ad2791befb117c8b3a9c95c2d2d5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2022-05-02 12:45:33 +02:00
parent bd6e75c171
commit 557957a59f
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/actionmanager/actionmanager.cpp
View File

@@ -45,7 +45,6 @@ namespace {
enum { warnAboutFindFailures = 0 }; enum { warnAboutFindFailures = 0 };
} }
static const char kKeyboardSettingsKey[] = "KeyboardShortcuts";
static const char kKeyboardSettingsKeyV2[] = "KeyboardShortcutsV2"; static const char kKeyboardSettingsKeyV2[] = "KeyboardShortcutsV2";
using namespace Core; using namespace Core;
@@ -484,13 +483,8 @@ Action *ActionManagerPrivate::overridableAction(Id id)
void ActionManagerPrivate::readUserSettings(Id id, Action *cmd) 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(); QSettings *settings = ICore::settings();
// transfer from old settings if not done before settings->beginGroup(kKeyboardSettingsKeyV2);
const QString group = settings->childGroups().contains(kKeyboardSettingsKeyV2)
? QString(kKeyboardSettingsKeyV2)
: QString(kKeyboardSettingsKey);
settings->beginGroup(group);
if (settings->contains(id.toString())) { if (settings->contains(id.toString())) {
const QVariant v = settings->value(id.toString()); const QVariant v = settings->value(id.toString());
if (QMetaType::Type(v.type()) == QMetaType::QStringList) { if (QMetaType::Type(v.type()) == QMetaType::QStringList) {
@@ -508,16 +502,13 @@ void ActionManagerPrivate::saveSettings(Action *cmd)
{ {
const QString id = cmd->id().toString(); const QString id = cmd->id().toString();
const QString settingsKey = QLatin1String(kKeyboardSettingsKeyV2) + '/' + id; const QString settingsKey = QLatin1String(kKeyboardSettingsKeyV2) + '/' + id;
const QString compatSettingsKey = QLatin1String(kKeyboardSettingsKey) + '/' + id;
const QList<QKeySequence> keys = cmd->keySequences(); const QList<QKeySequence> keys = cmd->keySequences();
const QList<QKeySequence> defaultKeys = cmd->defaultKeySequences(); const QList<QKeySequence> defaultKeys = cmd->defaultKeySequences();
if (keys != defaultKeys) { if (keys != defaultKeys) {
if (keys.isEmpty()) { if (keys.isEmpty()) {
ICore::settings()->setValue(settingsKey, QString()); ICore::settings()->setValue(settingsKey, QString());
ICore::settings()->setValue(compatSettingsKey, QString());
} else if (keys.size() == 1) { } else if (keys.size() == 1) {
ICore::settings()->setValue(settingsKey, keys.first().toString()); ICore::settings()->setValue(settingsKey, keys.first().toString());
ICore::settings()->setValue(compatSettingsKey, keys.first().toString());
} else { } else {
ICore::settings()->setValue(settingsKey, ICore::settings()->setValue(settingsKey,
Utils::transform<QStringList>(keys, Utils::transform<QStringList>(keys,