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/cpptools | |
| 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/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppcodestylepreferencesfactory.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppcodestylepreferencesfactory.h | 2 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppcodestylesettingspage.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp index 33e844bd56..633668aabf 100644 --- a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp +++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp @@ -31,7 +31,7 @@ #include "cppqtstyleindenter.h" #include <cppeditor/cppeditorconstants.h> -#include <texteditor/snippets/isnippetprovider.h> +#include <texteditor/snippets/snippetprovider.h> #include <extensionsystem/pluginmanager.h> @@ -121,10 +121,10 @@ TextEditor::Indenter *CppCodeStylePreferencesFactory::createIndenter() const return new CppQtStyleIndenter(); } -TextEditor::ISnippetProvider *CppCodeStylePreferencesFactory::snippetProvider() const +TextEditor::SnippetProvider *CppCodeStylePreferencesFactory::snippetProvider() const { - return ExtensionSystem::PluginManager::getObject<TextEditor::ISnippetProvider>( - [](TextEditor::ISnippetProvider *provider) { + return ExtensionSystem::PluginManager::getObject<TextEditor::SnippetProvider>( + [](TextEditor::SnippetProvider *provider) { return provider->groupId() == QLatin1String(CppEditor::Constants::CPP_SNIPPETS_GROUP_ID); }); } diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.h b/src/plugins/cpptools/cppcodestylepreferencesfactory.h index 05f28ede6e..17e179e121 100644 --- a/src/plugins/cpptools/cppcodestylepreferencesfactory.h +++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.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/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp index 541d950fdd..21eadbea4f 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.cpp +++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp @@ -37,7 +37,7 @@ #include <texteditor/codestyleeditor.h> #include <texteditor/textdocument.h> #include <texteditor/displaysettings.h> -#include <texteditor/snippets/isnippetprovider.h> +#include <texteditor/snippets/snippetprovider.h> #include <texteditor/texteditorsettings.h> #include <cplusplus/Overview.h> @@ -493,8 +493,8 @@ void CppCodeStylePreferencesWidget::updatePreview() void CppCodeStylePreferencesWidget::decorateEditors(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(CppEditor::Constants::CPP_SNIPPETS_GROUP_ID); }); |