diff --git a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp b/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
index 383279bcf4b..770ca520215 100644
--- a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
@@ -137,9 +137,7 @@ Utils::CrumblePath *CrumbleBar::crumblePath()
void CrumbleBar::showSaveDialog()
{
- DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
-
- if (settings.value(DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR).toBool()) {
+ if (DesignerSettings::getValue(DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR).toBool()) {
Core::DocumentManager::saveModifiedDocumentSilently(currentDesignDocument()->editor()->document());
} else {
bool alwaysSave;
@@ -151,6 +149,7 @@ void CrumbleBar::showSaveDialog()
tr("Always save when leaving subcomponent"),
&alwaysSave);
+ DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
settings.insert(DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR, alwaysSave);
QmlDesignerPlugin::instance()->setSettings(settings);
}
diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp
index df5d935ba6e..50556a42cc3 100644
--- a/src/plugins/qmldesigner/components/debugview/debugview.cpp
+++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp
@@ -40,13 +40,13 @@ const QString lineBreak = QStringLiteral("
");
bool isDebugViewEnabled()
{
- return QmlDesigner::QmlDesignerPlugin::instance()->settings().value(
+ return QmlDesigner::DesignerSettings::getValue(
QmlDesigner::DesignerSettingsKey::ENABLE_DEBUGVIEW).toBool();
}
bool isDebugViewShown()
{
- return QmlDesigner::QmlDesignerPlugin::instance()->settings().value(
+ return QmlDesigner::DesignerSettings::getValue(
QmlDesigner::DesignerSettingsKey::SHOW_DEBUGVIEW).toBool();
}
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
index 26cc35f1d67..b833dc52515 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
@@ -91,14 +91,12 @@ FormEditorItem* FormEditorScene::itemForQmlItemNode(const QmlItemNode &qmlItemNo
double FormEditorScene::canvasWidth() const
{
- DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
- return settings.value(DesignerSettingsKey::CANVASWIDTH).toDouble();
+ return DesignerSettings::getValue(DesignerSettingsKey::CANVASWIDTH).toDouble();
}
double FormEditorScene::canvasHeight() const
{
- DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
- return settings.value(DesignerSettingsKey::CANVASHEIGHT).toDouble();
+ return DesignerSettings::getValue(DesignerSettingsKey::CANVASHEIGHT).toDouble();
}
QList FormEditorScene::itemsForQmlItemNodes(const QList &nodeList) const
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index 73a99217e51..57c326b937e 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
@@ -331,14 +331,12 @@ ToolBox *FormEditorWidget::toolBox() const
double FormEditorWidget::spacing() const
{
- DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
- return settings.value(DesignerSettingsKey::ITEMSPACING).toDouble();
+ return DesignerSettings::getValue(DesignerSettingsKey::ITEMSPACING).toDouble();
}
double FormEditorWidget::containerPadding() const
{
- DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
- return settings.value(DesignerSettingsKey::CONTAINERPADDING).toDouble();
+ return DesignerSettings::getValue(DesignerSettingsKey::CONTAINERPADDING).toDouble();
}
diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp
index 233d58bbfd4..2901ea87661 100644
--- a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp
+++ b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp
@@ -210,15 +210,13 @@ void TextEditorView::reformatFile()
QByteArray editorState = m_widget->textEditor()->saveState();
- DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
-
auto document =
qobject_cast(Core::EditorManager::instance()->currentDocument());
/* Reformat document if we have a .ui.qml file */
if (document
&& document->filePath().toString().endsWith(".ui.qml")
- && settings.value(DesignerSettingsKey::REFORMAT_UI_QML_FILES).toBool()) {
+ && DesignerSettings::getValue(DesignerSettingsKey::REFORMAT_UI_QML_FILES).toBool()) {
const QString &newText = QmlJS::reformat(document->semanticInfo().document);
QTextCursor tc(document->document());
diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp
index 9e06deab976..5008948f075 100644
--- a/src/plugins/qmldesigner/designersettings.cpp
+++ b/src/plugins/qmldesigner/designersettings.cpp
@@ -25,6 +25,8 @@
#include "designersettings.h"
+#include
+
#include
namespace QmlDesigner {
@@ -96,4 +98,10 @@ void DesignerSettings::toSettings(QSettings *settings) const
settings->endGroup();
}
+QVariant DesignerSettings::getValue(const QByteArray &key)
+{
+ DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
+ return settings.value(key);
+}
+
} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h
index 0756be0d974..72698609937 100644
--- a/src/plugins/qmldesigner/designersettings.h
+++ b/src/plugins/qmldesigner/designersettings.h
@@ -70,6 +70,7 @@ public:
void fromSettings(QSettings *);
void toSettings(QSettings *) const;
+ static QVariant getValue(const QByteArray &key);
private:
void restoreValue(QSettings *settings, const QByteArray &key,
const QVariant &defaultValue = QVariant());
diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp
index 56246a09a87..be0be89c361 100644
--- a/src/plugins/qmldesigner/documentwarningwidget.cpp
+++ b/src/plugins/qmldesigner/documentwarningwidget.cpp
@@ -198,8 +198,7 @@ void DocumentWarningWidget::emitGotoCodeClicked(const DocumentMessage &message)
bool DocumentWarningWidget::warningsEnabled() const
{
- DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
- return settings.value(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool();
+ return DesignerSettings::getValue(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool();
}
void DocumentWarningWidget::ignoreCheckBoxToggled(bool b)
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index c35a0e8eaa2..b42304e7f5b 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -138,14 +138,12 @@ static bool useTextEditInDesignMode()
static bool warningsForQmlFilesInsteadOfUiQmlEnabled()
{
- DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
- return settings.value(DesignerSettingsKey::WARNING_FOR_QML_FILES_INSTEAD_OF_UIQML_FILES).toBool();
+ return DesignerSettings::getValue(DesignerSettingsKey::WARNING_FOR_QML_FILES_INSTEAD_OF_UIQML_FILES).toBool();
}
static bool showWarningsForFeaturesInDesigner()
{
- DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
- return settings.value(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool();
+ return DesignerSettings::getValue(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool();
}
QmlDesignerPlugin::QmlDesignerPlugin()