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

TextEditor: Consolidate document access functions.

Browse Source 
There was document(), textDocument() and baseTextDocument().
Two should be enough...

Change-Id: Id9e41c8d857c5cb3269a9fce5ab594d34448c982
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2014-08-01 23:31:56 +02:00
committed by Tobias Hunger
parent a9b7045803
commit d7c2b0b681
54 changed files with 154 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/snippets/snippeteditor.cpp
View File

@@ -52,7 +52,7 @@ SnippetEditor::SnippetEditor(SnippetEditorWidget *editor)
SnippetEditorWidget::SnippetEditorWidget(QWidget *parent)
: BaseTextEditorWidget(new BaseTextDocument, parent)
{
baseTextDocument()->setId(Constants::SNIPPET_EDITOR_ID);
textDocument()->setId(Constants::SNIPPET_EDITOR_ID);
setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
setHighlightCurrentLine(false);
setLineNumbersVisible(false);
@@ -61,7 +61,7 @@ SnippetEditorWidget::SnippetEditorWidget(QWidget *parent)
void SnippetEditorWidget::setSyntaxHighlighter(TextEditor::SyntaxHighlighter *highlighter)
{
baseTextDocument()->setSyntaxHighlighter(highlighter);
textDocument()->setSyntaxHighlighter(highlighter);
}
void SnippetEditorWidget::focusOutEvent(QFocusEvent *event)

4
src/plugins/texteditor/snippets/snippetssettingspage.cpp
View File

@@ -336,7 +336,7 @@ void SnippetsSettingsPagePrivate::configureUi(QWidget *w)
foreach (ISnippetProvider *provider, providers) {
m_ui.groupCombo->addItem(provider->displayName(), provider->groupId());
SnippetEditorWidget *snippetEditor = new SnippetEditorWidget(w);
snippetEditor->baseTextDocument()->setFontSettings(TextEditorSettings::fontSettings());
snippetEditor->textDocument()->setFontSettings(TextEditorSettings::fontSettings());
provider->decorateEditor(snippetEditor);
m_ui.snippetsEditorStack->insertWidget(m_ui.groupCombo->count() - 1, snippetEditor);
connect(snippetEditor, SIGNAL(snippetContentChanged()), this, SLOT(setSnippetContent()));
@@ -537,7 +537,7 @@ void SnippetsSettingsPagePrivate::decorateEditors(const TextEditor::FontSettings
ExtensionSystem::PluginManager::getObjects<ISnippetProvider>();
for (int i = 0; i < m_ui.groupCombo->count(); ++i) {
SnippetEditorWidget *snippetEditor = editorAt(i);
snippetEditor->baseTextDocument()->setFontSettings(fontSettings);
snippetEditor->textDocument()->setFontSettings(fontSettings);
const QString &id = m_ui.groupCombo->itemData(i).toString();
// This list should be quite short... Re-iterating over it is ok.
foreach (const ISnippetProvider *provider, providers) {