Update usage of QFontMetrics::width() to new API

QFontMetrics(F)::width() has been deprecated and is replaced by
horizontalAdvance(). This updates all usage of it in tests and
documentation.

It is worth noting that many or most of the usages of
QFontMetrics::width() probably intended to use boundingRect().width(),
but since it currently works, I have not looked into that, just
replaced the function name mechanically.

Change-Id: Iec382e5bad0b50f37a6cfff841bfb46ed4d4555f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

5 files changed, 13 insertions, 13 deletions

diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index e52cb63384..ebe9d3b992 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -312,7 +312,7 @@ void tst_QFontDatabase::condensedFontWidth()
     QFont testFontCondensed("QtBidiTestFontCondensed");
     QFontMetrics fmTF(testFont);
     QFontMetrics fmTFC(testFontCondensed);
-    QVERIFY(fmTF.width(testString()) > fmTFC.width(testString()));
+    QVERIFY(fmTF.horizontalAdvance(testString()) > fmTFC.horizontalAdvance(testString()));
 
 }
 
@@ -335,15 +335,15 @@ void tst_QFontDatabase::condensedFontMatching()
     QEXPECT_FAIL("","No matching of sub-family by stretch on Windows", Continue);
 #endif
 
-    QCOMPARE(QFontMetrics(tfcByStretch).width(testString()),
-             QFontMetrics(tfcByStyleName).width(testString()));
+    QCOMPARE(QFontMetrics(tfcByStretch).horizontalAdvance(testString()),
+             QFontMetrics(tfcByStyleName).horizontalAdvance(testString()));
 
     if (!db.hasFamily("QtBidiTestFontCondensed"))
         QSKIP("This platform doesn't support font sub-family names (QTBUG-55625)");
 
     QFont tfcBySubfamilyName("QtBidiTestFontCondensed");
-    QCOMPARE(QFontMetrics(tfcByStyleName).width(testString()),
-             QFontMetrics(tfcBySubfamilyName).width(testString()));
+    QCOMPARE(QFontMetrics(tfcByStyleName).horizontalAdvance(testString()),
+             QFontMetrics(tfcBySubfamilyName).horizontalAdvance(testString()));
 }
 
 void tst_QFontDatabase::rasterFonts()
diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
index 06302f4cc1..9e705b4a00 100644
--- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
+++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
@@ -167,7 +167,7 @@ void tst_QFontMetrics::elidedText()
     QFETCH(QFont, font);
     QFETCH(QString, text);
     QFontMetrics fm(font);
-    int w = fm.width(text);
+    int w = fm.horizontalAdvance(text);
     QString newtext = fm.elidedText(text,Qt::ElideRight,w+1, 0);
     QCOMPARE(text,newtext); // should not elide
     newtext = fm.elidedText(text,Qt::ElideRight,w-1, 0);
@@ -202,7 +202,7 @@ void tst_QFontMetrics::bypassShaping()
     QVERIFY(textWidth != 0);
     int charsWidth = 0;
     for (int i = 0; i < text.size(); ++i)
-        charsWidth += fm.width(text[i]);
+        charsWidth += fm.horizontalAdvance(text[i]);
     // This assertion is needed in Qt WebKit's WebCore::Font::offsetForPositionForSimpleText
     QCOMPARE(textWidth, charsWidth);
 }
@@ -226,7 +226,7 @@ template<class FontMetrics, typename PrimitiveType> void elidedMultiLength_helpe
     // Not even wide enough for "small" - should use ellipsis
     QChar ellipsisChar(0x2026);
     QString text1_el = QString::fromLatin1("s") + ellipsisChar;
-    PrimitiveType width_small = fm.width(text1_el);
+    PrimitiveType width_small = fm.horizontalAdvance(text1_el);
     QCOMPARE(fm.elidedText(text1,Qt::ElideRight, width_small + 1), text1_el);
 }
 
diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
index 9ade3b554e..e3cb265ebe 100644
--- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
@@ -639,7 +639,7 @@ void tst_QStaticText::setPenPlainText()
     font.setStyleStrategy(QFont::NoAntialias);
 
     QFontMetricsF fm(font);
-    QImage image(qCeil(fm.width("XXXXX")), qCeil(fm.height()), format);
+    QImage image(qCeil(fm.horizontalAdvance("XXXXX")), qCeil(fm.height()), format);
     image.fill(Qt::white);
     {
         QPainter p(&image);
@@ -662,7 +662,7 @@ void tst_QStaticText::setPenRichText()
     font.setStyleStrategy(QFont::NoAntialias);
 
     QFontMetricsF fm(font);
-    QPixmap image(qCeil(fm.width("XXXXX")), qCeil(fm.height()));
+    QPixmap image(qCeil(fm.horizontalAdvance("XXXXX")), qCeil(fm.height()));
     image.fill(Qt::white);
     {
         QPainter p(&image);
@@ -686,7 +686,7 @@ void tst_QStaticText::richTextOverridesPen()
     font.setStyleStrategy(QFont::NoAntialias);
 
     QFontMetricsF fm(font);
-    QPixmap image(qCeil(fm.width("XXXXX")), qCeil(fm.height()));
+    QPixmap image(qCeil(fm.horizontalAdvance("XXXXX")), qCeil(fm.height()));
     image.fill(Qt::white);
     {
         QPainter p(&image);
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index 2f3da2c196..ebdb5a56af 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -611,7 +611,7 @@ void tst_QTextDocument::task240325()
     QFontMetrics fm(p.font());
 
     // Set page size to contain image and one "Foobar"
-    doc->setPageSize(QSize(100 + fm.width("Foobar")*2, 1000));
+    doc->setPageSize(QSize(100 + fm.horizontalAdvance("Foobar")*2, 1000));
 
     // Force layout
     doc->drawContents(&p);
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index b68a014bff..4e3d1da8fe 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -203,7 +203,7 @@ void tst_QTextLayout::init()
     testFont.setPixelSize(TESTFONT_SIZE);
     testFont.setWeight(QFont::Normal);
 #ifdef QT_BUILD_INTERNAL
-    QCOMPARE(QFontMetrics(testFont).width('a'), testFont.pixelSize());
+    QCOMPARE(QFontMetrics(testFont).horizontalAdvance('a'), testFont.pixelSize());
 #endif
 }