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

TextEditor: Modernize

Browse Source 
modernize-*

Change-Id: Ic497fea1942a77cf017be3b0033f92e3807066f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2018-11-25 18:52:41 +01:00
parent a9fa1fe5b1
commit 2e2059e8b5
62 changed files with 167 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/texteditor.cpp
View File

@@ -3852,8 +3852,8 @@ void TextEditorWidgetPrivate::insertIntoBlockSelection(const QString &text)
const QStringList::const_iterator endLine = textLines.constEnd();
for (QStringList::const_iterator textLine = textLines.constBegin(); textLine != endLine; ++textLine)
textLength += qMax(0, ts.columnCountForText(*textLine, column) - textLength);
for (QStringList::iterator textLine = textLines.begin(); textLine != textLines.end(); ++textLine)
textLine->append(QString(qMax(0, textLength - ts.columnCountForText(*textLine, column)), QLatin1Char(' ')));
for (auto &textLine : textLines)
textLine.append(QString(qMax(0, textLength - ts.columnCountForText(textLine, column)), QLatin1Char(' ')));
// insert Text
for (;;) {
@@ -4156,7 +4156,7 @@ void TextEditorWidgetPrivate::updateLineAnnotation(const PaintEventData &data,
}
}
for (const TextMark *mark : marks) {
for (const TextMark *mark : qAsConst(marks)) {
boundingRect = QRectF(x, boundingRect.top(), q->viewport()->width() - x, boundingRect.height());
if (boundingRect.isEmpty())
break;
@@ -4617,7 +4617,7 @@ void TextEditorWidgetPrivate::paintReplacement(PaintEventData &data, QPainter &p
if (TextBlockUserData *nextBlockUserData = TextDocumentLayout::testUserData(nextBlock)) {
if (nextBlockUserData->foldingStartIncluded())
replacement.prepend(nextBlock.text().trimmed().left(1));
replacement.prepend(nextBlock.text().trimmed().at(0));
}
QTextBlock nextVisibleBlock = TextEditor::nextVisibleBlock(data.block, data.doc);