Port from devicePixelRatioF() to devicePixelRatio()

This ports all of QtDeclarative.

Change-Id: Ie6eb4d96b4d49fbed1e8be514d03e331549cd712
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

5 files changed, 9 insertions, 9 deletions

diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareglyphnode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwareglyphnode.cpp
index 481d1f0304..47f4b5c696 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwareglyphnode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareglyphnode.cpp
@@ -132,8 +132,8 @@ void QSGSoftwareGlyphNode::paint(QPainter *painter)
     QPointF pos = m_position - QPointF(0, m_glyphRun.rawFont().ascent());
 
     qreal offset = 1.0;
-    if (painter->device()->devicePixelRatioF() > 0.0)
-        offset = 1.0 / painter->device()->devicePixelRatioF();
+    if (painter->device()->devicePixelRatio() > 0.0)
+        offset = 1.0 / painter->device()->devicePixelRatio();
 
     switch (m_style) {
     case QQuickText::Normal: break;
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode.cpp
index 214f7d790b..f237fa26d4 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode.cpp
@@ -68,7 +68,7 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
     QMargins sourceMargins = normalizedMargins(sourceMarginsIn);
     QMargins targetMargins = normalizedMargins(targetMarginsIn);
 
-    const qreal sourceDpr = pixmap.devicePixelRatioF();
+    const qreal sourceDpr = pixmap.devicePixelRatio();
     sourceMargins *= sourceDpr;
 
     // source center
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode.cpp
index f50fa00b0b..e5b4191beb 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode.cpp
@@ -237,8 +237,8 @@ void QSGSoftwareInternalRectangleNode::paint(QPainter *painter)
 {
     //We can only check for a device pixel ratio change when we know what
     //paint device is being used.
-    if (!qFuzzyCompare(painter->device()->devicePixelRatioF(), m_devicePixelRatio)) {
-        m_devicePixelRatio = painter->device()->devicePixelRatioF();
+    if (!qFuzzyCompare(painter->device()->devicePixelRatio(), m_devicePixelRatio)) {
+        m_devicePixelRatio = painter->device()->devicePixelRatio();
         generateCornerPixmap();
     }
 
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
index af12df26ab..12ffa0ef57 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
@@ -108,9 +108,9 @@ void QSGSoftwareRenderer::render()
 
     setBackgroundColor(clearColor());
     setBackgroundRect(QRect(0, 0,
-                            m_paintDevice->width() / m_paintDevice->devicePixelRatioF(),
-                            m_paintDevice->height() / m_paintDevice->devicePixelRatioF()),
-                     m_paintDevice->devicePixelRatioF());
+                            m_paintDevice->width() / m_paintDevice->devicePixelRatio(),
+                            m_paintDevice->height() / m_paintDevice->devicePixelRatio()),
+                     m_paintDevice->devicePixelRatio());
 
     // Build Renderlist
     // The renderlist is created by visiting each node in the tree and when a
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode.cpp
index 17e8bdc2f9..e5442cdd99 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode.cpp
@@ -128,7 +128,7 @@ void QSGSoftwareSpriteNode::paint(QPainter *painter)
     // XXX try to do some kind of interpolation between sourceA and sourceB using time
     painter->drawPixmap(QRectF(0, 0, m_size.width(), m_size.height()),
                         pixmap,
-                        QRectF(m_sourceA * pixmap.devicePixelRatioF(), m_spriteSize * pixmap.devicePixelRatioF()));
+                        QRectF(m_sourceA * pixmap.devicePixelRatio(), m_spriteSize * pixmap.devicePixelRatio()));
 }
 
 bool QSGSoftwareSpriteNode::isOpaque() const