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

16
src/plugins/qmljseditor/qmljscompletionassist.cpp
View File

@@ -353,12 +353,12 @@ bool QmlJSAssistProposalItem::prematurelyApplies(const QChar &c) const
|| (text().endsWith(QLatin1Char('.')) && c == QLatin1Char('.'));
}
void QmlJSAssistProposalItem::applyContextualContent(BaseTextEditor *editor,
void QmlJSAssistProposalItem::applyContextualContent(BaseTextEditorWidget *editorWidget,
int basePosition) const
{
const int currentPosition = editor->position();
editor->setCursorPosition(basePosition);
editor->remove(currentPosition - basePosition);
const int currentPosition = editorWidget->position();
editorWidget->setCursorPosition(basePosition);
editorWidget->remove(currentPosition - basePosition);
QString content = text();
int cursorOffset = 0;
@@ -377,16 +377,16 @@ void QmlJSAssistProposalItem::applyContextualContent(BaseTextEditor *editor,
int replacedLength = 0;
for (int i = 0; i < replaceable.length(); ++i) {
const QChar a = replaceable.at(i);
const QChar b = editor->characterAt(editor->position() + i);
const QChar b = editorWidget->characterAt(editorWidget->position() + i);
if (a == b)
++replacedLength;
else
break;
}
const int length = editor->position() - basePosition + replacedLength;
editor->replace(length, content);
const int length = editorWidget->position() - basePosition + replacedLength;
editorWidget->replace(length, content);
if (cursorOffset)
editor->setCursorPosition(editor->position() + cursorOffset);
editorWidget->setCursorPosition(editorWidget->position() + cursorOffset);
}
// -------------------------