Port from devicePixelRatioF() to devicePixelRatio()

This ports all of QtBase.

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

9 files changed, 17 insertions, 17 deletions

diff --git a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
index baa36f2c4e..57444a3888 100644
--- a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
+++ b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
@@ -255,7 +255,7 @@ void tst_QScreen::grabWindow()
         void resizeEvent(QResizeEvent *e) override
         {
             const QSize sz = e->size();
-            image = image.scaled(sz * image.devicePixelRatioF());
+            image = image.scaled(sz * image.devicePixelRatio());
             QPainter painter(&image);
             painter.fillRect(0, 0, sz.width(), sz.height(), Qt::black);
             painter.setPen(QPen(Qt::red, 2));
diff --git a/tests/auto/other/lancelot/paintcommands.cpp b/tests/auto/other/lancelot/paintcommands.cpp
index 9fdfe285dc..d8157f047f 100644
--- a/tests/auto/other/lancelot/paintcommands.cpp
+++ b/tests/auto/other/lancelot/paintcommands.cpp
@@ -2295,7 +2295,7 @@ void PaintCommands::command_pixmap_setDevicePixelRatio(QRegularExpressionMatch r
 
     if (m_verboseMode)
         printf(" -(lance) pixmap_setDevicePixelRatio(%s), %.1f -> %.1f\n",
-               qPrintable(name), m_pixmapMap[name].devicePixelRatioF(), dpr);
+               qPrintable(name), m_pixmapMap[name].devicePixelRatio(), dpr);
 
     m_pixmapMap[name].setDevicePixelRatio(dpr);
 }
@@ -2374,7 +2374,7 @@ void PaintCommands::command_image_setDevicePixelRatio(QRegularExpressionMatch re
 
     if (m_verboseMode)
         printf(" -(lance) image_setDevicePixelRatio(%s), %.1f -> %.1f\n",
-               qPrintable(name), m_imageMap[name].devicePixelRatioF(), dpr);
+               qPrintable(name), m_imageMap[name].devicePixelRatio(), dpr);
 
     m_imageMap[name].setDevicePixelRatio(dpr);
 }
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index fa374ee076..a73279018d 100644
--- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
@@ -321,7 +321,7 @@ void tst_QDialog::toolDialogPosition()
     dialog.move(QPoint(100,100));
     const QPoint beforeShowPosition = dialog.pos();
     dialog.show();
-    const int fuzz = int(dialog.devicePixelRatioF());
+    const int fuzz = int(dialog.devicePixelRatio());
     const QPoint afterShowPosition = dialog.pos();
     QVERIFY2(HighDpi::fuzzyCompare(afterShowPosition, beforeShowPosition, fuzz),
              HighDpi::msgPointMismatch(afterShowPosition, beforeShowPosition).constData());
diff --git a/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp
index 7d7c1e79a9..99b0ccd10d 100644
--- a/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp
+++ b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp
@@ -400,13 +400,13 @@ void tst_QPixmapFilter::blurIndexed8()
     QImage original = img;
     qt_blurImage(img, 10, true, false);
     QCOMPARE(original.size(), img.size());
-    QVERIFY2(qFuzzyCompare(img.devicePixelRatioF(), qreal(2)),
-             QByteArray::number(img.devicePixelRatioF()).constData());
+    QVERIFY2(qFuzzyCompare(img.devicePixelRatio(), qreal(2)),
+             QByteArray::number(img.devicePixelRatio()).constData());
 
     original = img;
     qt_blurImage(img, 10, true, true);
-    QVERIFY2(qFuzzyCompare(img.devicePixelRatioF(), qreal(2)),
-             QByteArray::number(img.devicePixelRatioF()).constData());
+    QVERIFY2(qFuzzyCompare(img.devicePixelRatio(), qreal(2)),
+             QByteArray::number(img.devicePixelRatio()).constData());
     QCOMPARE(original.size(), QSize(img.height(), img.width()));
 }
 
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index d670f19d0e..b3a2323d3e 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -3602,7 +3602,7 @@ protected:
 static QPixmap grabFromWidget(QWidget *w, const QRect &rect)
 {
     QPixmap pixmap = w->grab(rect);
-    const qreal devicePixelRatio = pixmap.devicePixelRatioF();
+    const qreal devicePixelRatio = pixmap.devicePixelRatio();
     if (!qFuzzyCompare(devicePixelRatio, qreal(1))) {
         pixmap = pixmap.scaled((QSizeF(pixmap.size()) / devicePixelRatio).toSize(),
                                Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -5638,7 +5638,7 @@ bool verifyColor(QWidget &child, const QRegion &region, const QColor &color, int
             const QPixmap pixmap = grabBackingStore
                 ? child.grab(rect)
                 : grabWindow(window, rect.left(), rect.top(), rect.width(), rect.height());
-            const QSize actualSize = pixmap.size() / pixmap.devicePixelRatioF();
+            const QSize actualSize = pixmap.size() / pixmap.devicePixelRatio();
             if (!QTest::qCompare(actualSize, rect.size(), "pixmap.size()", "rect.size()", __FILE__, callerLine))
                 return false;
             QPixmap expectedPixmap(pixmap); /* ensure equal formats */
@@ -9270,8 +9270,8 @@ void tst_QWidget::translucentWidget()
     widgetSnapshot = label.grab(QRect(QPoint(0, 0), label.size()));
 #endif
     const QImage actual = widgetSnapshot.toImage().convertToFormat(QImage::Format_RGB32);
-    QImage expected = pm.toImage().scaled(label.devicePixelRatioF() * pm.size());
-    expected.setDevicePixelRatio(label.devicePixelRatioF());
+    QImage expected = pm.toImage().scaled(label.devicePixelRatio() * pm.size());
+    expected.setDevicePixelRatio(label.devicePixelRatio());
     QCOMPARE(actual.size(),expected.size());
     QCOMPARE(actual,expected);
 
diff --git a/tests/manual/diaglib/qwidgetdump.cpp b/tests/manual/diaglib/qwidgetdump.cpp
index 21007e8df9..b1d2a37d0e 100644
--- a/tests/manual/diaglib/qwidgetdump.cpp
+++ b/tests/manual/diaglib/qwidgetdump.cpp
@@ -100,7 +100,7 @@ static void dumpWidgetRecursion(QTextStream &str, const QWidget *w,
     if (w->isWindow()) {
         str << ' ' << w->logicalDpiX() << "DPI";
 #if QT_VERSION > 0x050600
-        const qreal dpr = w->devicePixelRatioF();
+        const qreal dpr = w->devicePixelRatio();
         if (!qFuzzyCompare(dpr, qreal(1)))
             str << " dpr=" << dpr;
 #endif // Qt 5.6
diff --git a/tests/manual/highdpi/dragwidget.cpp b/tests/manual/highdpi/dragwidget.cpp
index 674b2e6a0d..bd65fcf81b 100644
--- a/tests/manual/highdpi/dragwidget.cpp
+++ b/tests/manual/highdpi/dragwidget.cpp
@@ -162,8 +162,8 @@ void DragWidget::mousePressEvent(QMouseEvent *event)
     mimeData->setData("application/x-hotspot",
                       QByteArray::number(hotSpot.x()) + ' ' + QByteArray::number(hotSpot.y()));
 
-    const qreal dpr = devicePixelRatioF() > 1 && !(QGuiApplication::keyboardModifiers() & Qt::ShiftModifier)
-        ? devicePixelRatioF() : 1;
+    const qreal dpr = devicePixelRatio() > 1 && !(QGuiApplication::keyboardModifiers() & Qt::ShiftModifier)
+        ? devicePixelRatio() : 1;
 
     QPixmap pixmap(child->size() * dpr);
     pixmap.setDevicePixelRatio(dpr);
diff --git a/tests/manual/highdpi/main.cpp b/tests/manual/highdpi/main.cpp
index 883dd5a226..18c29bd9af 100644
--- a/tests/manual/highdpi/main.cpp
+++ b/tests/manual/highdpi/main.cpp
@@ -1293,7 +1293,7 @@ QT_DPI_ADJUSTMENT_POLICY=AdjustDpi|DontAdjustDpi|AdjustUpOnly)";
                 << "\n\n";
         }
 
-        str << "widget devicePixelRatio: " << this->devicePixelRatioF()
+        str << "widget devicePixelRatio: " << this->devicePixelRatio()
             << "\nwidget logicalDpi: " << this->logicalDpiX()
             << "\n\nQT_FONT_DPI: " << qgetenv("QT_FONT_DPI")
             << "\nQT_SCALE_FACTOR: " << qgetenv("QT_SCALE_FACTOR")
diff --git a/tests/manual/widgets/styles/main.cpp b/tests/manual/widgets/styles/main.cpp
index a2b4ff8228..be8f3e3cd5 100644
--- a/tests/manual/widgets/styles/main.cpp
+++ b/tests/manual/widgets/styles/main.cpp
@@ -286,7 +286,7 @@ void MainWindow::updateDescription()
     QString text;
     QTextStream str(&text);
     str << "Qt " << QT_VERSION_STR << ", platform: " << QGuiApplication::platformName()
-        << ", Style: \"" << style()->objectName() << "\", DPR=" << devicePixelRatioF()
+        << ", Style: \"" << style()->objectName() << "\", DPR=" << devicePixelRatio()
         << ' ' << logicalDpiX() << ',' << logicalDpiY() << "DPI";
     if (const QWindow *w = windowHandle())
         str << ", Screen: \"" << w->screen()->name() << '"';