diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-04-24 15:52:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-04-25 12:03:08 +0000 |
| commit | 9443f7104b9db282157ac3098b64f35110328bde (patch) | |
| tree | 6035d4dec89aa878bcc3c8c2b2bdb40629a7cf90 /src/plugins/qmljstools | |
| parent | 46b77013989fec0b529b318ec04012ab0872d504 (diff) | |
| download | qt-creator-9443f7104b9db282157ac3098b64f35110328bde.tar.gz | |
Remove the need to create ISnippetProvider subclasses
Change-Id: I1810aaa945136d9726a66dad41377429a6adc8e1
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/qmljstools')
3 files changed, 8 insertions, 16 deletions
diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp index 657fba3087..60c1cad38f 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp +++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp @@ -28,7 +28,7 @@ #include "qmljstoolsconstants.h" #include "qmljsindenter.h" #include <texteditor/simplecodestylepreferences.h> -#include <texteditor/snippets/isnippetprovider.h> +#include <texteditor/snippets/snippetprovider.h> #include <extensionsystem/pluginmanager.h> #include <qmljseditor/qmljseditorconstants.h> #include <QLayout> @@ -86,10 +86,10 @@ TextEditor::Indenter *QmlJSCodeStylePreferencesFactory::createIndenter() const return new QmlJSEditor::Internal::Indenter(); } -TextEditor::ISnippetProvider *QmlJSCodeStylePreferencesFactory::snippetProvider() const +TextEditor::SnippetProvider *QmlJSCodeStylePreferencesFactory::snippetProvider() const { - return ExtensionSystem::PluginManager::getObject<TextEditor::ISnippetProvider>( - [](TextEditor::ISnippetProvider *provider) { + return ExtensionSystem::PluginManager::getObject<TextEditor::SnippetProvider>( + [](TextEditor::SnippetProvider *provider) { return provider->groupId() == QLatin1String(QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID); }); } diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h index e88ea1ef49..c6764123d8 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::ISnippetProvider *snippetProvider() const; + TextEditor::SnippetProvider *snippetProvider() const; QString previewText() const; }; diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index 7b5f325042..9067f1cac8 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -30,7 +30,7 @@ #include "qmljsindenter.h" #include "qmljsqtstylecodeformatter.h" -#include <texteditor/snippets/isnippetprovider.h> +#include <texteditor/snippets/snippetprovider.h> #include <texteditor/tabsettings.h> #include <texteditor/simplecodestylepreferences.h> #include <texteditor/displaysettings.h> @@ -56,14 +56,6 @@ QmlJSCodeStylePreferencesWidget::QmlJSCodeStylePreferencesWidget(QWidget *parent { m_ui->setupUi(this); - ISnippetProvider *provider = ExtensionSystem::PluginManager::getObject<ISnippetProvider>( - [](ISnippetProvider *provider) { - return provider->groupId() == QLatin1String(QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID); - }); - - if (provider) - provider->decorateEditor(m_ui->previewTextEdit); - decorateEditor(TextEditorSettings::fontSettings()); connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged, this, &QmlJSCodeStylePreferencesWidget::decorateEditor); @@ -91,8 +83,8 @@ void QmlJSCodeStylePreferencesWidget::setPreferences(ICodeStylePreferences *pref void QmlJSCodeStylePreferencesWidget::decorateEditor(const FontSettings &fontSettings) { - const ISnippetProvider *provider = ExtensionSystem::PluginManager::getObject<ISnippetProvider>( - [](ISnippetProvider *current) { + const SnippetProvider *provider = ExtensionSystem::PluginManager::getObject<SnippetProvider>( + [](SnippetProvider *current) { return current->groupId() == QLatin1String(QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID); }); |