From 81117c771c884eb98fa371f8ad50d7564de09d9d Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Sun, 31 May 2015 17:09:44 +0200
Subject: Fix users of QTextLayout::additionalFormats to use the new API

QTextLayout::additionalFormats setters and getters using QList<FormatRange> have
been deprecated; port to the QVector versions.

Change-Id: I6702430c09b30aa033fe4e34f39a9aa3350e471b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
---
 src/quick/items/qquicktext.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/quick/items/qquicktext.cpp')

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 799b1465ea..fe7a719151 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -402,9 +402,9 @@ void QQuickTextPrivate::updateLayout()
                 formatModifiesFontSize = fontSizeModified;
                 multilengthEos = -1;
             } else {
-                layout.clearAdditionalFormats();
+                layout.clearFormats();
                 if (elideLayout)
-                    elideLayout->clearAdditionalFormats();
+                    elideLayout->clearFormats();
                 QString tmp = text;
                 multilengthEos = tmp.indexOf(QLatin1Char('\x9c'));
                 if (multilengthEos != -1) {
@@ -713,10 +713,10 @@ void QQuickTextPrivate::setupCustomLineGeometry(QTextLine &line, qreal &height,
 }
 
 void QQuickTextPrivate::elideFormats(
-        const int start, const int length, int offset, QList<QTextLayout::FormatRange> *elidedFormats)
+        const int start, const int length, int offset, QVector<QTextLayout::FormatRange> *elidedFormats)
 {
     const int end = start + length;
-    QList<QTextLayout::FormatRange> formats = layout.additionalFormats();
+    const QVector<QTextLayout::FormatRange> formats = layout.formats();
     for (int i = 0; i < formats.count(); ++i) {
         QTextLayout::FormatRange format = formats.at(i);
         const int formatLength = qMin(format.start + format.length, end) - qMax(format.start, start);
@@ -1155,7 +1155,7 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline)
             elideLayout->setCacheEnabled(true);
         }
         if (styledText) {
-            QList<QTextLayout::FormatRange> formats;
+            QVector<QTextLayout::FormatRange> formats;
             switch (elideMode) {
             case QQuickText::ElideRight:
                 elideFormats(elideStart, elideText.length() - 1, 0, &formats);
@@ -1178,7 +1178,7 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline)
             default:
                 break;
             }
-            elideLayout->setAdditionalFormats(formats);
+            elideLayout->setFormats(formats);
         }
 
         elideLayout->setFont(layout.font());
@@ -2650,7 +2650,7 @@ QString QQuickTextPrivate::anchorAt(const QTextLayout *layout, const QPointF &mo
         QTextLine line = layout->lineAt(i);
         if (line.naturalTextRect().contains(mousePos)) {
             int charPos = line.xToCursor(mousePos.x(), QTextLine::CursorOnCharacter);
-            foreach (const QTextLayout::FormatRange &formatRange, layout->additionalFormats()) {
+            foreach (const QTextLayout::FormatRange &formatRange, layout->formats()) {
                 if (formatRange.format.isAnchor()
                         && charPos >= formatRange.start
                         && charPos < formatRange.start + formatRange.length) {
-- 
cgit v1.2.3