From 634344411e9a3204b6d20595ad94005ca6a393d2 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 30 Nov 2017 21:34:13 +0100 Subject: platform plugins: port away from QRegion::rects() Use begin()/end()/rectCount() instead. Change-Id: I5c642c4a2c64da65d3f37159396c86073818ca95 Reviewed-by: Giuseppe D'Angelo --- src/platformsupport/fbconvenience/qfbbackingstore.cpp | 5 ++--- src/platformsupport/fbconvenience/qfbscreen.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/fbconvenience/qfbbackingstore.cpp b/src/platformsupport/fbconvenience/qfbbackingstore.cpp index 2cad3441e4..e2d94406a4 100644 --- a/src/platformsupport/fbconvenience/qfbbackingstore.cpp +++ b/src/platformsupport/fbconvenience/qfbbackingstore.cpp @@ -104,9 +104,8 @@ void QFbBackingStore::beginPaint(const QRegion ®ion) if (mImage.hasAlphaChannel()) { QPainter p(&mImage); p.setCompositionMode(QPainter::CompositionMode_Source); - const QVector rects = region.rects(); - for (QVector::const_iterator it = rects.begin(); it != rects.end(); ++it) - p.fillRect(*it, Qt::transparent); + for (const QRect &r : region) + p.fillRect(r, Qt::transparent); } } diff --git a/src/platformsupport/fbconvenience/qfbscreen.cpp b/src/platformsupport/fbconvenience/qfbscreen.cpp index 2b4498157c..c42fd879f8 100644 --- a/src/platformsupport/fbconvenience/qfbscreen.cpp +++ b/src/platformsupport/fbconvenience/qfbscreen.cpp @@ -210,10 +210,9 @@ QRegion QFbScreen::doRedraw() if (!mPainter) mPainter = new QPainter(&mScreenImage); - const QVector rects = mRepaintRegion.rects(); const QRect screenRect = mGeometry.translated(-screenOffset); - for (int rectIndex = 0; rectIndex < mRepaintRegion.rectCount(); rectIndex++) { - const QRect rect = rects[rectIndex].intersected(screenRect); + for (QRect rect : mRepaintRegion) { + rect = rect.intersected(screenRect); if (rect.isEmpty()) continue; -- cgit v1.2.3