diff options
Diffstat (limited to 'src/gui/text/qtextdocumentlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index a2b3c8dc76..fc61ee50bb 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -3402,7 +3402,7 @@ void QTextDocumentLayoutPrivate::layoutFlow(QTextFrame::Iterator it, QTextLayout } else { currentLazyLayoutPosition = checkPoints.constLast().positionInFrame; // ####### - //checkPoints.last().positionInFrame = q->document()->docHandle()->length(); + //checkPoints.last().positionInFrame = QTextDocumentPrivate::get(q->document())->length(); } } @@ -3458,7 +3458,7 @@ void QTextDocumentLayoutPrivate::layoutBlock(const QTextBlock &bl, int blockPosi QFixed extraMargin; if (docPrivate->defaultTextOption.flags() & QTextOption::AddSpaceForLineAndParagraphSeparators) { QFontMetricsF fm(bl.charFormat().font()); - extraMargin = QFixed::fromReal(fm.horizontalAdvance(QChar(QChar(0x21B5)))); + extraMargin = QFixed::fromReal(fm.horizontalAdvance(u'\x21B5')); } const QFixed indent = this->blockIndent(blockFormat); @@ -4149,7 +4149,7 @@ int QTextDocumentLayout::layoutStatus() const int pos = d->currentLazyLayoutPosition; if (pos == -1) return 100; - return pos * 100 / d->document->docHandle()->length(); + return pos * 100 / QTextDocumentPrivate::get(d->document)->length(); } void QTextDocumentLayout::timerEvent(QTimerEvent *e) |