From 7d1e27a921a2928eb5d4104c715bfb19592d4dae Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 12 Sep 2014 11:32:52 +0200 Subject: [PATCH] QmlJSEditor: cleaning up dependencies to QmlDesigner QmlJSEditor does not depend on QmlDesigner. There is no reason that the settings for the Qt Quick ToolBar are stored in the group of QmlDesigner. This patch removes all includes of qmldesignerconstants.h in QmlJSEditor. Change-Id: Ie692d9179e0239c3307420001547ba658911d39b Reviewed-by: Eike Ziller --- src/plugins/qmldesigner/qmldesignerconstants.h | 2 -- src/plugins/qmljseditor/qmljseditor.cpp | 1 - src/plugins/qmljseditor/qmljseditorconstants.h | 3 +++ src/plugins/qmljseditor/qmljseditorplugin.cpp | 2 -- .../qmljseditor/quicktoolbarsettingspage.cpp | 17 ++++++----------- .../qmljstools/qmljscodestylesettingspage.cpp | 1 - 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h index deb20fd44d9..05b2d46bc87 100644 --- a/src/plugins/qmldesigner/qmldesignerconstants.h +++ b/src/plugins/qmldesigner/qmldesignerconstants.h @@ -58,8 +58,6 @@ const char QML_ITEMSPACING_KEY[] = "ItemSpacing"; const char QML_CONTAINERPADDING_KEY[] = "ContainerPadding"; const char QML_CANVASWIDTH_KEY[] = "CanvasWidth"; const char QML_CANVASHEIGHT_KEY[] = "CanvasHeight"; -const char QML_CONTEXTPANE_KEY[] = "ContextPaneEnabled"; -const char QML_CONTEXTPANEPIN_KEY[] = "ContextPanePinned"; const char QML_WARNIN_FOR_FEATURES_IN_DESIGNER_KEY[] = "WarnAboutQtQuickFeaturesInDesigner"; const char QML_WARNIN_FOR_DESIGNER_FEATURES_IN_EDITOR_KEY[] = "WarnAboutQtQuickDesignerFeaturesInCodeEditor"; const char QML_SHOW_DEBUGVIEW[] = "ShowQtQuickDesignerDebugView"; diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 4b41dd8b8d7..27ad698e745 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -45,7 +45,6 @@ #include #include -#include #include #include diff --git a/src/plugins/qmljseditor/qmljseditorconstants.h b/src/plugins/qmljseditor/qmljseditorconstants.h index f29e42974a6..875d094470e 100644 --- a/src/plugins/qmljseditor/qmljseditorconstants.h +++ b/src/plugins/qmljseditor/qmljseditorconstants.h @@ -59,6 +59,9 @@ const char TASK_CATEGORY_QML_ANALYSIS[] = "Task.Category.QmlAnalysis"; const char QML_SNIPPETS_GROUP_ID[] = "QML"; +const char QML_CONTEXTPANE_KEY[] = "QmlJSEditor.ContextPaneEnabled"; +const char QML_CONTEXTPANEPIN_KEY[] = "QmlJSEditor.ContextPanePinned"; + } // namespace Constants } // namespace QmlJSEditor diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index e36c490437c..1ac7d4488d0 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -49,8 +49,6 @@ #include #include -#include - #include #include #include diff --git a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp index 925fb5117a0..2c2092f7126 100644 --- a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp +++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp @@ -30,7 +30,6 @@ #include "quicktoolbarsettingspage.h" #include "qmljseditorconstants.h" -#include #include #include @@ -55,23 +54,19 @@ void QuickToolBarSettings::set() void QuickToolBarSettings::fromSettings(QSettings *settings) { - settings->beginGroup(QLatin1String(QmlDesigner::Constants::QML_SETTINGS_GROUP)); - settings->beginGroup(QLatin1String(QmlDesigner::Constants::QML_DESIGNER_SETTINGS_GROUP)); + settings->beginGroup(QLatin1String(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML)); enableContextPane = settings->value( - QLatin1String(QmlDesigner::Constants::QML_CONTEXTPANE_KEY), QVariant(false)).toBool(); + QLatin1String(QmlJSEditor::Constants::QML_CONTEXTPANE_KEY), QVariant(false)).toBool(); pinContextPane = settings->value( - QLatin1String(QmlDesigner::Constants::QML_CONTEXTPANEPIN_KEY), QVariant(false)).toBool(); - settings->endGroup(); + QLatin1String(QmlJSEditor::Constants::QML_CONTEXTPANEPIN_KEY), QVariant(false)).toBool(); settings->endGroup(); } void QuickToolBarSettings::toSettings(QSettings *settings) const { - settings->beginGroup(QLatin1String(QmlDesigner::Constants::QML_SETTINGS_GROUP)); - settings->beginGroup(QLatin1String(QmlDesigner::Constants::QML_DESIGNER_SETTINGS_GROUP)); - settings->setValue(QLatin1String(QmlDesigner::Constants::QML_CONTEXTPANE_KEY), enableContextPane); - settings->setValue(QLatin1String(QmlDesigner::Constants::QML_CONTEXTPANEPIN_KEY), pinContextPane); - settings->endGroup(); + settings->beginGroup(QLatin1String(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML)); + settings->setValue(QLatin1String(QmlJSEditor::Constants::QML_CONTEXTPANE_KEY), enableContextPane); + settings->setValue(QLatin1String(QmlJSEditor::Constants::QML_CONTEXTPANEPIN_KEY), pinContextPane); settings->endGroup(); } diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index a554542f8b1..94edbb26e8c 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #include #include