QtDeclarative: replace deprecated functions

Replace the deprecated functions with it successors:
 - QFontMetrics::width() -> horizontalAdvance()
 - QLayout::setMargin() -> setContentsMargins()

Change-Id: I2a2557cdb2eaec40e2c9955a0082372c582ec6b8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

9 files changed, 10 insertions, 10 deletions

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index dd7fbccff5..9e447d40ac 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -643,7 +643,7 @@ QString QQuickTextPrivate::elidedText(qreal lineWidth, const QTextLine &line, QT
             // Appending the elide character may push the line over the maximum width
             // in which case the elided text will need to be elided.
             QFontMetricsF metrics(layout.font());
-            if (metrics.width(elideChar) + line.naturalTextWidth() >= lineWidth)
+            if (metrics.horizontalAdvance(elideChar) + line.naturalTextWidth() >= lineWidth)
                 elideText = metrics.elidedText(elideText, Qt::TextElideMode(elideMode), lineWidth);
         }
         return elideText;
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp
index 792aa31a88..d84932b8d0 100644
--- a/src/quick/items/qquicktextnodeengine.cpp
+++ b/src/quick/items/qquicktextnodeengine.cpp
@@ -1007,8 +1007,8 @@ void QQuickTextNodeEngine::addTextBlock(QTextDocument *textDocument, const QText
                 break;
             };
 
-            QSizeF size(fontMetrics.width(listItemBullet), fontMetrics.height());
-            qreal xoff = fontMetrics.width(QLatin1Char(' '));
+            QSizeF size(fontMetrics.horizontalAdvance(listItemBullet), fontMetrics.height());
+            qreal xoff = fontMetrics.horizontalAdvance(QLatin1Char(' '));
             if (block.textDirection() == Qt::LeftToRight)
                 xoff = -xoff - size.width();
             setPosition(pos + QPointF(xoff, 0));
diff --git a/src/quick/util/qquickfontmetrics.cpp b/src/quick/util/qquickfontmetrics.cpp
index f1278c366f..42b3038c48 100644
--- a/src/quick/util/qquickfontmetrics.cpp
+++ b/src/quick/util/qquickfontmetrics.cpp
@@ -287,7 +287,7 @@ qreal QQuickFontMetrics::lineWidth() const
 */
 qreal QQuickFontMetrics::advanceWidth(const QString &text) const
 {
-    return m_metrics.width(text);
+    return m_metrics.horizontalAdvance(text);
 }
 
 /*!
diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
index 5e1aaf121e..7d545cdb2f 100644
--- a/src/quick/util/qquickstyledtext.cpp
+++ b/src/quick/util/qquickstyledtext.cpp
@@ -675,7 +675,7 @@ void QQuickStyledTextPrivate::parseImageAttributes(const QChar *&ch, const QStri
 {
     qreal imgWidth = 0.0;
     QFontMetricsF fm(layout.font());
-    const qreal spaceWidth = fm.width(QChar::Nbsp);
+    const qreal spaceWidth = fm.horizontalAdvance(QChar::Nbsp);
     const bool trailingSpace = textOut.endsWith(space);
 
     if (!updateImagePositions) {
diff --git a/src/quick/util/qquicktextmetrics.cpp b/src/quick/util/qquicktextmetrics.cpp
index 81088b5cd6..959980b267 100644
--- a/src/quick/util/qquicktextmetrics.cpp
+++ b/src/quick/util/qquicktextmetrics.cpp
@@ -186,7 +186,7 @@ void QQuickTextMetrics::setElideWidth(qreal elideWidth)
 */
 qreal QQuickTextMetrics::advanceWidth() const
 {
-    return m_metrics.width(m_text);
+    return m_metrics.horizontalAdvance(m_text);
 }
 
 /*!
diff --git a/tests/auto/quick/qquickfontmetrics/tst_quickfontmetrics.cpp b/tests/auto/quick/qquickfontmetrics/tst_quickfontmetrics.cpp
index 6e516f51e1..ef61c45225 100644
--- a/tests/auto/quick/qquickfontmetrics/tst_quickfontmetrics.cpp
+++ b/tests/auto/quick/qquickfontmetrics/tst_quickfontmetrics.cpp
@@ -127,7 +127,7 @@ void tst_QuickFontMetrics::functions()
     QFontMetricsF expected = QFontMetricsF(QFont());
 
     QCOMPARE(metrics.elidedText(text, mode, width, flags), expected.elidedText(text, mode, width, flags));
-    QCOMPARE(metrics.advanceWidth(text), expected.width(text));
+    QCOMPARE(metrics.advanceWidth(text), expected.horizontalAdvance(text));
     QCOMPARE(metrics.boundingRect(text), expected.boundingRect(text));
     QCOMPARE(metrics.tightBoundingRect(text), expected.tightBoundingRect(text));
 }
diff --git a/tools/qmleasing/mainwindow.cpp b/tools/qmleasing/mainwindow.cpp
index c1a87642a5..679b4c0b91 100644
--- a/tools/qmleasing/mainwindow.cpp
+++ b/tools/qmleasing/mainwindow.cpp
@@ -82,7 +82,7 @@ MainWindow::MainWindow(QWidget *parent) :
     splineEditor->setPreset(ui_properties.comboBox->currentText());
 
     QVBoxLayout *groupBoxLayout = new QVBoxLayout(ui_properties.groupBox);
-    groupBoxLayout->setMargin(0);
+    groupBoxLayout->setContentsMargins(QMargins());
     ui_properties.groupBox->setLayout(groupBoxLayout);
 
     groupBoxLayout->addWidget(splineEditor->pointListWidget());
diff --git a/tools/qmleasing/segmentproperties.cpp b/tools/qmleasing/segmentproperties.cpp
index f37527f863..c61feef9a4 100644
--- a/tools/qmleasing/segmentproperties.cpp
+++ b/tools/qmleasing/segmentproperties.cpp
@@ -33,7 +33,7 @@ SegmentProperties::SegmentProperties(QWidget *parent) :
     QWidget(parent), m_splineEditor(nullptr), m_blockSignals(false)
 {
     QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(QMargins());
     layout->setSpacing(2);
     setLayout(layout);
     {
diff --git a/tools/qmleasing/splineeditor.cpp b/tools/qmleasing/splineeditor.cpp
index 2a6081903f..69850dc7a1 100644
--- a/tools/qmleasing/splineeditor.cpp
+++ b/tools/qmleasing/splineeditor.cpp
@@ -524,7 +524,7 @@ void SplineEditor::setupPointListWidget()
 
     m_pointListWidget->setWidget(new QWidget(m_pointListWidget));
     QVBoxLayout *layout = new QVBoxLayout(m_pointListWidget->widget());
-    layout->setMargin(0);
+    layout->setContentsMargins(QMargins());
     layout->setSpacing(2);
     m_pointListWidget->widget()->setLayout(layout);