diff options
| author | hjk <hjk@qt.io> | 2018-02-06 15:59:05 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-02-07 07:59:05 +0000 |
| commit | 91c19c2734246dbf528a6076a57b72d924bf0484 (patch) | |
| tree | 26881f338de3e7f1ffe8229d08915f694b6fe13f /src/plugins/qmljstools | |
| parent | 0c3aed25497267b655794dfb4b3f8b72dfb01d13 (diff) | |
| download | qt-creator-91c19c2734246dbf528a6076a57b72d924bf0484.tar.gz | |
TextEditor: Simplify SnippetProvider handling
The group identifier is as good as the actual object, so use that
on the generator and the consumer side.
Change-Id: I6ccd54a2362631af0b50583f12563b8e41a5dd78
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/qmljstools')
3 files changed, 8 insertions, 11 deletions
diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp index 42a42d4d1f..f5c259dca0 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp +++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp @@ -27,10 +27,11 @@ #include "qmljscodestylesettingspage.h" #include "qmljstoolsconstants.h" #include "qmljsindenter.h" + #include <texteditor/simplecodestylepreferences.h> -#include <texteditor/snippets/snippetprovider.h> -#include <extensionsystem/pluginmanager.h> + #include <qmljseditor/qmljseditorconstants.h> + #include <QLayout> using namespace QmlJSTools; @@ -86,10 +87,9 @@ TextEditor::Indenter *QmlJSCodeStylePreferencesFactory::createIndenter() const return new QmlJSEditor::Internal::Indenter(); } -TextEditor::SnippetProvider *QmlJSCodeStylePreferencesFactory::snippetProvider() const +QString QmlJSCodeStylePreferencesFactory::snippetProviderGroupId() const { - return TextEditor::SnippetProvider::snippetProviderForGroupId - (QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID); + return QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID; } QString QmlJSCodeStylePreferencesFactory::previewText() const diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h index c6764123d8..0061843485 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h +++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h @@ -40,7 +40,7 @@ public: QWidget *createEditor(TextEditor::ICodeStylePreferences *settings, QWidget *parent) const; TextEditor::Indenter *createIndenter() const; - TextEditor::SnippetProvider *snippetProvider() const; + QString snippetProviderGroupId() const; QString previewText() const; }; diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index 04bbb007e5..cb43db2d17 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -82,12 +82,9 @@ void QmlJSCodeStylePreferencesWidget::setPreferences(ICodeStylePreferences *pref void QmlJSCodeStylePreferencesWidget::decorateEditor(const FontSettings &fontSettings) { - const SnippetProvider *provider = - SnippetProvider::snippetProviderForGroupId(QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID); - m_ui->previewTextEdit->textDocument()->setFontSettings(fontSettings); - if (provider) - provider->decorateEditor(m_ui->previewTextEdit); + SnippetProvider::decorateEditor(m_ui->previewTextEdit, + QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID); } void QmlJSCodeStylePreferencesWidget::setVisualizeWhitespace(bool on) |