From b3c991ae8f9da6d8eb26f10b3d4ab08587588c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Tue, 1 Sep 2020 13:45:24 +0200 Subject: Port from devicePixelRatioF() to devicePixelRatio() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ports all of QtBase. Change-Id: If6712da44d7749b97b74f4614a04fac360f69d9e Reviewed-by: Tor Arne Vestbø --- tests/auto/gui/kernel/qscreen/tst_qscreen.cpp | 2 +- tests/auto/other/lancelot/paintcommands.cpp | 4 ++-- tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp | 2 +- tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp | 8 ++++---- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/auto') 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 ®ion, 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); -- cgit v1.2.3