forked from qt-creator/qt-creator
TextEditor: Consolidate document access functions.
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:
@@ -189,7 +189,7 @@ void GitEditorWidget::setPlainTextFiltered(const QString &text)
|
||||
break;
|
||||
}
|
||||
|
||||
baseTextDocument()->setPlainText(modText);
|
||||
textDocument()->setPlainText(modText);
|
||||
}
|
||||
|
||||
void GitEditorWidget::commandFinishedGotoLine(bool ok, int exitCode, const QVariant &v)
|
||||
@@ -290,9 +290,9 @@ void GitEditorWidget::init()
|
||||
VcsBase::VcsBaseEditorWidget::init();
|
||||
Core::Id editorId = editor()->document()->id();
|
||||
if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID)
|
||||
new GitSubmitHighlighter(baseTextDocument());
|
||||
new GitSubmitHighlighter(textDocument());
|
||||
else if (editorId == Git::Constants::GIT_REBASE_EDITOR_ID)
|
||||
new GitRebaseHighlighter(baseTextDocument());
|
||||
new GitRebaseHighlighter(textDocument());
|
||||
}
|
||||
|
||||
void GitEditorWidget::addDiffActions(QMenu *menu, const VcsBase::DiffChunk &chunk)
|
||||
@@ -316,7 +316,7 @@ bool GitEditorWidget::open(QString *errorString, const QString &fileName, const
|
||||
QFileInfo fi(fileName);
|
||||
const QString gitPath = fi.absolutePath();
|
||||
setSource(gitPath);
|
||||
baseTextDocument()->setCodec(
|
||||
textDocument()->setCodec(
|
||||
GitPlugin::instance()->gitClient()->encoding(gitPath, "i18n.commitEncoding"));
|
||||
}
|
||||
return VcsBaseEditorWidget::open(errorString, fileName, realFileName);
|
||||
|
||||
Reference in New Issue
Block a user