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

TextEditor: Move base of operation from Editor to *Widget

Browse Source 
One less level of indirection

Change-Id: I4777bd7d54e572f36a490aeb747a8e0f89599049
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
hjk
2014-09-03 22:45:33 +02:00
parent 0feb80fa00
commit 127d3b9687
21 changed files with 120 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/texteditor/codeassist/basicproposalitem.cpp
View File

@@ -104,33 +104,33 @@ bool BasicProposalItem::prematurelyApplies(const QChar &c) const
return false;
}
void BasicProposalItem::apply(BaseTextEditor *editor, int basePosition) const
void BasicProposalItem::apply(BaseTextEditorWidget *editorWidget, int basePosition) const
{
if (data().canConvert<QString>())
applySnippet(editor, basePosition);
applySnippet(editorWidget, basePosition);
else if (data().canConvert<QuickFixOperation::Ptr>())
applyQuickFix(editor, basePosition);
applyQuickFix(editorWidget, basePosition);
else
applyContextualContent(editor, basePosition);
applyContextualContent(editorWidget, basePosition);
}
void BasicProposalItem::applyContextualContent(BaseTextEditor *editor, int basePosition) const
void BasicProposalItem::applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const
{
const int currentPosition = editor->position();
editor->setCursorPosition(basePosition);
editor->replace(currentPosition - basePosition, text());
const int currentPosition = editorWidget->position();
editorWidget->setCursorPosition(basePosition);
editorWidget->replace(currentPosition - basePosition, text());
}
void BasicProposalItem::applySnippet(BaseTextEditor *editor, int basePosition) const
void BasicProposalItem::applySnippet(BaseTextEditorWidget *editorWidget, int basePosition) const
{
QTextCursor tc = editor->textCursor();
QTextCursor tc = editorWidget->textCursor();
tc.setPosition(basePosition, QTextCursor::KeepAnchor);
editor->editorWidget()->insertCodeSnippet(tc, data().toString());
editorWidget->insertCodeSnippet(tc, data().toString());
}
void BasicProposalItem::applyQuickFix(BaseTextEditor *editor, int basePosition) const
void BasicProposalItem::applyQuickFix(BaseTextEditorWidget *editorWidget, int basePosition) const
{
Q_UNUSED(editor)
Q_UNUSED(editorWidget)
Q_UNUSED(basePosition)
QuickFixOperation::Ptr op = data().value<QuickFixOperation::Ptr>();