feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Simplify SnippetProvider handling

Browse Source 
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>
This commit is contained in:
hjk
2018-02-06 15:59:05 +01:00
parent 0c3aed2549
commit 91c19c2734
13 changed files with 28 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
View File

@@ -31,9 +31,6 @@
#include "cppqtstyleindenter.h"
#include <cppeditor/cppeditorconstants.h>
#include <texteditor/snippets/snippetprovider.h>
#include <extensionsystem/pluginmanager.h>
#include <QLayout>
@@ -121,9 +118,9 @@ TextEditor::Indenter *CppCodeStylePreferencesFactory::createIndenter() const
return new CppQtStyleIndenter();
}
TextEditor::SnippetProvider *CppCodeStylePreferencesFactory::snippetProvider() const
QString CppCodeStylePreferencesFactory::snippetProviderGroupId() const
{
return TextEditor::SnippetProvider::snippetProviderForGroupId(CppEditor::Constants::CPP_SNIPPETS_GROUP_ID);
return CppEditor::Constants::CPP_SNIPPETS_GROUP_ID;
}
QString CppCodeStylePreferencesFactory::previewText() const

2
src/plugins/cpptools/cppcodestylepreferencesfactory.h
View File

@@ -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;
};

6
src/plugins/cpptools/cppcodestylesettingspage.cpp
View File

@@ -493,13 +493,9 @@ void CppCodeStylePreferencesWidget::updatePreview()
void CppCodeStylePreferencesWidget::decorateEditors(const FontSettings &fontSettings)
{
const SnippetProvider *provider =
SnippetProvider::snippetProviderForGroupId(CppEditor::Constants::CPP_SNIPPETS_GROUP_ID);
foreach (SnippetEditorWidget *editor, m_previews) {
editor->textDocument()->setFontSettings(fontSettings);
if (provider)
provider->decorateEditor(editor);
SnippetProvider::decorateEditor(editor, CppEditor::Constants::CPP_SNIPPETS_GROUP_ID);
}
}