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

QmlJSEditor: Change way of writing settings for static analyzer

Browse Source 
Instead of writing out a binary blob use a string list when
reading or writing the settings.
The setting is introduced with QC11 the first time, so this
should not harm too much - therefore no transition of old
settings have been added.

Change-Id: Ica4654f49b71478cb07434dff9d42fd9562be87b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Stenger
2023-06-09 13:57:54 +02:00
parent db680ebbb6
commit c377794c35
1 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/qmljseditor/qmljseditingsettingspage.cpp
View File

@@ -67,6 +67,28 @@ void QmlJsEditingSettings::set()
toSettings(Core::ICore::settings()); toSettings(Core::ICore::settings());
} }
static QStringList intListToStringList(const QList<int> &list)
{
return Utils::transform(list, [](int v) { return QString::number(v); });
}
QList<int> intListFromStringList(const QStringList &list)
{
return Utils::transform<QList<int> >(list, [](const QString &v) { return v.toInt(); });
}
static QStringList defaultDisabledMessagesAsString()
{
static const QStringList result = intListToStringList(defaultDisabledMessages());
return result;
}
static QStringList defaultDisabledNonQuickUiAsString()
{
static const QStringList result = intListToStringList(defaultDisabledMessagesNonQuickUi());
return result;
}
void QmlJsEditingSettings::fromSettings(QSettings *settings) void QmlJsEditingSettings::fromSettings(QSettings *settings)
{ {
settings->beginGroup(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML); settings->beginGroup(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
@@ -84,14 +106,13 @@ void QmlJsEditingSettings::fromSettings(QSettings *settings)
m_useCustomFormatCommand = settings->value(CUSTOM_COMMAND, QVariant(false)).toBool(); m_useCustomFormatCommand = settings->value(CUSTOM_COMMAND, QVariant(false)).toBool();
m_useCustomAnalyzer = settings->value(CUSTOM_ANALYZER, QVariant(false)).toBool(); m_useCustomAnalyzer = settings->value(CUSTOM_ANALYZER, QVariant(false)).toBool();
m_disabledMessages = Utils::transform<QSet>( m_disabledMessages = Utils::toSet(
settings->value(DISABLED_MESSAGES, intListFromStringList(settings->value(DISABLED_MESSAGES,
QVariant::fromValue(defaultDisabledMessages())).toList(), defaultDisabledMessagesAsString()).toStringList()));
[](const QVariant &v){ return v.toInt(); });
m_disabledMessagesForNonQuickUi = Utils::transform<QSet>( m_disabledMessagesForNonQuickUi = Utils::toSet(
settings->value(DISABLED_MESSAGES_NONQUICKUI, intListFromStringList(settings->value(DISABLED_MESSAGES_NONQUICKUI,
QVariant::fromValue(defaultDisabledMessagesNonQuickUi())).toList(), defaultDisabledNonQuickUiAsString()).toStringList()));
[](const QVariant &v) { return v.toInt(); });
settings->endGroup(); settings->endGroup();
} }
@@ -122,12 +143,12 @@ void QmlJsEditingSettings::toSettings(QSettings *settings) const
false); false);
Utils::QtcSettings::setValueWithDefault(settings, Utils::QtcSettings::setValueWithDefault(settings,
DISABLED_MESSAGES, DISABLED_MESSAGES,
Utils::sorted(Utils::toList(m_disabledMessages)), intListToStringList(Utils::sorted(Utils::toList(m_disabledMessages))),
defaultDisabledMessages()); defaultDisabledMessagesAsString());
Utils::QtcSettings::setValueWithDefault(settings, Utils::QtcSettings::setValueWithDefault(settings,
DISABLED_MESSAGES_NONQUICKUI, DISABLED_MESSAGES_NONQUICKUI,
Utils::sorted(Utils::toList(m_disabledMessagesForNonQuickUi)), intListToStringList(Utils::sorted(Utils::toList(m_disabledMessagesForNonQuickUi))),
defaultDisabledMessagesNonQuickUi()); defaultDisabledNonQuickUiAsString());
settings->endGroup(); settings->endGroup();
QmllsSettingsManager::instance()->checkForChanges(); QmllsSettingsManager::instance()->checkForChanges();
} }