summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2017-12-07 09:50:08 +0100
committerMarc Mutz <marc.mutz@kdab.com>2017-12-07 19:10:12 +0000
commitf33a1f574a354775ba9a0bb03fe376944a3a8d4c (patch)
treea9ff830b99ec0f5eaed567a0a90870ee9dee2de4 /tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
parenta31f65d8c88d5973645ddbeb03ab3286428e5ec4 (diff)
Port away from QRegion::rects()
Use being()/end() instead. These were the last remaining uses of QRegion::rects() within qtbase. Change-Id: I264beb6f660968f40eecbbee2260341fca94ddb5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp')
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index f624bb6a5f..3d5df7506d 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -2464,9 +2464,9 @@ void tst_QGraphicsView::viewportUpdateMode()
// The view gets two updates for the update scene updates.
QTRY_VERIFY(!view.lastUpdateRegions.isEmpty());
#ifndef Q_OS_MAC //cocoa doesn't support drawing regions
- QCOMPARE(view.lastUpdateRegions.last().rects().size(), 2);
- QCOMPARE(view.lastUpdateRegions.last().rects().at(0).size(), QSize(14, 14));
- QCOMPARE(view.lastUpdateRegions.last().rects().at(1).size(), QSize(14, 14));
+ QCOMPARE(view.lastUpdateRegions.last().rectCount(), 2);
+ QCOMPARE(view.lastUpdateRegions.last().begin()[0].size(), QSize(14, 14));
+ QCOMPARE(view.lastUpdateRegions.last().begin()[1].size(), QSize(14, 14));
#endif
// Set full update mode.
@@ -2481,8 +2481,8 @@ void tst_QGraphicsView::viewportUpdateMode()
qApp->processEvents();
// The view gets one full viewport update for the update scene updates.
- QCOMPARE(view.lastUpdateRegions.last().rects().size(), 1);
- QCOMPARE(view.lastUpdateRegions.last().rects().at(0).size(), view.viewport()->size());
+ QCOMPARE(view.lastUpdateRegions.last().rectCount(), 1);
+ QCOMPARE(view.lastUpdateRegions.last().begin()[0].size(), view.viewport()->size());
view.lastUpdateRegions.clear();
// Set smart update mode
@@ -2499,8 +2499,8 @@ void tst_QGraphicsView::viewportUpdateMode()
qApp->processEvents();
// The view gets one bounding rect update.
- QCOMPARE(view.lastUpdateRegions.last().rects().size(), 1);
- QCOMPARE(view.lastUpdateRegions.last().rects().at(0).size(), QSize(32, 32));
+ QCOMPARE(view.lastUpdateRegions.last().rectCount(), 1);
+ QCOMPARE(view.lastUpdateRegions.last().begin()[0].size(), QSize(32, 32));
// Set no update mode
view.setViewportUpdateMode(QGraphicsView::NoViewportUpdate);