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/diffeditor/diffeditor.cpp
View File

@@ -264,14 +264,14 @@ void DiffEditor::ctor()
SLOT(setDisplaySettings(TextEditor::DisplaySettings)));
connect(TextEditorSettings::instance(),
SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
m_descriptionWidget->baseTextDocument(),
m_descriptionWidget->textDocument(),
SLOT(setFontSettings(TextEditor::FontSettings)));
m_descriptionWidget->setDisplaySettings(
TextEditorSettings::displaySettings());
m_descriptionWidget->setCodeStyle(
TextEditorSettings::codeStyle());
m_descriptionWidget->baseTextDocument()->setFontSettings(
m_descriptionWidget->textDocument()->setFontSettings(
TextEditorSettings::fontSettings());
m_controller = m_document->controller();

6
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -348,7 +348,7 @@ void SideDiffEditorWidget::setDisplaySettings(const DisplaySettings &ds)
void SideDiffEditorWidget::applyFontSettings()
{
SelectableTextEditorWidget::applyFontSettings();
const TextEditor::FontSettings &fs = baseTextDocument()->fontSettings();
const TextEditor::FontSettings &fs = textDocument()->fontSettings();
m_fileLineForeground = fs.formatFor(C_DIFF_FILE_LINE).foreground();
m_chunkLineForeground = fs.formatFor(C_DIFF_CONTEXT_LINE).foreground();
m_textForeground = fs.toTextCharFormat(C_TEXT).foreground().color();
@@ -1161,8 +1161,8 @@ void SideBySideDiffEditorWidget::showDiff()
void SideBySideDiffEditorWidget::setFontSettings(
const TextEditor::FontSettings &fontSettings)
{
m_leftEditor->baseTextDocument()->setFontSettings(fontSettings);
m_rightEditor->baseTextDocument()->setFontSettings(fontSettings);
m_leftEditor->textDocument()->setFontSettings(fontSettings);
m_rightEditor->textDocument()->setFontSettings(fontSettings);
m_spanLineFormat = fontSettings.toTextCharFormat(C_LINE_NUMBER);
m_fileLineFormat = fontSettings.toTextCharFormat(C_DIFF_FILE_LINE);

2
src/plugins/diffeditor/unifieddiffeditorwidget.cpp
View File

@@ -172,7 +172,7 @@ void UnifiedDiffEditorWidget::setDisplaySettings(const DisplaySettings &ds)
void UnifiedDiffEditorWidget::setFontSettings(const FontSettings &fontSettings)
{
baseTextDocument()->setFontSettings(fontSettings);
textDocument()->setFontSettings(fontSettings);
m_fileLineFormat = fontSettings.toTextCharFormat(C_DIFF_FILE_LINE);
m_chunkLineFormat = fontSettings.toTextCharFormat(C_DIFF_CONTEXT_LINE);