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

TextEditor: Remove use of deprecated additionalFormats

Browse Source 
Replace with formats

Change-Id: I9a24c0ad138c378aed1c49a15b80b7f64edabe30
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Orgad Shaneh
2016-08-03 23:09:08 +03:00
committed by Orgad Shaneh
parent 8932e0bcb4
commit 6afcf33f7a
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -867,7 +867,7 @@ void TextEditorWidgetPrivate::print(QPrinter *printer)
srcBlock = srcBlock.next(), dstBlock = dstBlock.next()) {
QList<QTextLayout::FormatRange> formatList = srcBlock.layout()->additionalFormats();
QVector<QTextLayout::FormatRange> formatList = srcBlock.layout()->formats();
if (backgroundIsDark) {
// adjust syntax highlighting colors for better contrast
for (int i = formatList.count() - 1; i >= 0; --i) {
@@ -885,7 +885,7 @@ void TextEditorWidgetPrivate::print(QPrinter *printer)
}
}
dstBlock.layout()->setAdditionalFormats(formatList);
dstBlock.layout()->setFormats(formatList);
}
QAbstractTextDocumentLayout *layout = doc->documentLayout();
@@ -6775,7 +6775,7 @@ QMimeData *TextEditorWidget::createMimeDataFromSelection() const
for (QTextBlock current = start; current.isValid() && current != end; current = current.next()) {
if (selectionVisible(current.blockNumber())) {
const QTextLayout *layout = current.layout();
foreach (const QTextLayout::FormatRange &range, layout->additionalFormats()) {
foreach (const QTextLayout::FormatRange &range, layout->formats()) {
const int startPosition = current.position() + range.start - selectionStart - removedCount;
const int endPosition = startPosition + range.length;
if (endPosition <= 0 || startPosition >= endOfDocument - removedCount)