QtOpenGL/plugins/platformsupport: use new QRegion::begin()/end() instead of rect()

Saves e.g. ~900b and ~2900b in text size in QtOpenGL and
XcbQpa libs, resp., on optimized GCC 5.3 Linux AMD64 builds.

Change-Id: Id904689164ca32df41118a23747c70048d8e6604
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

3 files changed, 10 insertions, 12 deletions

diff --git a/src/platformsupport/fbconvenience/qfbscreen.cpp b/src/platformsupport/fbconvenience/qfbscreen.cpp
index d631849775..ee8183c896 100644
--- a/src/platformsupport/fbconvenience/qfbscreen.cpp
+++ b/src/platformsupport/fbconvenience/qfbscreen.cpp
@@ -206,15 +206,13 @@ void QFbScreen::generateRects()
             remainingScreen -= localGeometry;
             QRegion windowRegion(localGeometry);
             windowRegion -= remainingScreen;
-            foreach (const QRect &rect, windowRegion.rects()) {
+            for (const QRect &rect : windowRegion)
                 mCachedRects += QPair<QRect, int>(rect, i);
-            }
         }
 #endif
     }
-    const QVector<QRect> remainingScreenRects = remainingScreen.rects();
-    mCachedRects.reserve(mCachedRects.count() + remainingScreenRects.count());
-    foreach (const QRect &rect, remainingScreenRects)
+    mCachedRects.reserve(mCachedRects.count() + remainingScreen.rectCount());
+    for (const QRect &rect : remainingScreen)
         mCachedRects += QPair<QRect, int>(rect, -1);
     mIsUpToDate = true;
 }
@@ -253,7 +251,7 @@ QRegion QFbScreen::doRedraw()
             rectRegion -= intersect;
 
             // we only expect one rectangle, but defensive coding...
-            foreach (const QRect &rect, intersect.rects()) {
+            for (const QRect &rect : intersect) {
                 bool firstLayer = true;
                 if (layer == -1) {
                     mCompositePainter->fillRect(rect, Qt::black);
diff --git a/src/platformsupport/graphics/qrasterbackingstore.cpp b/src/platformsupport/graphics/qrasterbackingstore.cpp
index 3b1a87b8cd..58e811dff1 100644
--- a/src/platformsupport/graphics/qrasterbackingstore.cpp
+++ b/src/platformsupport/graphics/qrasterbackingstore.cpp
@@ -89,7 +89,7 @@ bool QRasterBackingStore::scroll(const QRegion &region, int dx, int dy)
     const qreal devicePixelRatio = m_image.devicePixelRatio();
     const QPoint delta(dx * devicePixelRatio, dy * devicePixelRatio);
 
-    foreach (const QRect &rect, region.rects())
+    for (const QRect &rect : region)
         qt_scrollRectInImage(m_image, QRect(rect.topLeft() * devicePixelRatio, rect.size() * devicePixelRatio), delta);
 
     return true;
@@ -103,7 +103,7 @@ void QRasterBackingStore::beginPaint(const QRegion &region)
     QPainter painter(&m_image);
     painter.setCompositionMode(QPainter::CompositionMode_Source);
     const QColor blank = Qt::transparent;
-    foreach (const QRect &rect, region.rects())
+    for (const QRect &rect : region)
         painter.fillRect(rect, blank);
 }
 
diff --git a/src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp b/src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
index 7c29be7804..dbaaf524e8 100644
--- a/src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
+++ b/src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
@@ -140,7 +140,7 @@ void QOpenGLCompositorBackingStore::updateTexture()
 
         QOpenGLContext *ctx = QOpenGLContext::currentContext();
         if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
-            foreach (const QRect &rect, m_dirty.rects()) {
+            for (const QRect &rect : m_dirty) {
                 QRect r = imageRect & rect;
                 glPixelStorei(GL_UNPACK_ROW_LENGTH, m_image.width());
                 glTexSubImage2D(GL_TEXTURE_2D, 0, r.x(), r.y(), r.width(), r.height(), GL_RGBA, GL_UNSIGNED_BYTE,
@@ -148,7 +148,7 @@ void QOpenGLCompositorBackingStore::updateTexture()
                 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
             }
         } else {
-            foreach (const QRect &rect, m_dirty.rects()) {
+            for (const QRect &rect : m_dirty) {
                 // intersect with image rect to be sure
                 QRect r = imageRect & rect;
 
@@ -161,7 +161,7 @@ void QOpenGLCompositorBackingStore::updateTexture()
 
                 fixed |= r;
             }
-            foreach (const QRect &rect, fixed.rects()) {
+            for (const QRect &rect : fixed) {
                 // if the sub-rect is full-width we can pass the image data directly to
                 // OpenGL instead of copying, since there's no gap between scanlines
                 if (rect.width() == imageRect.width()) {
@@ -258,7 +258,7 @@ void QOpenGLCompositorBackingStore::beginPaint(const QRegion &region)
     if (m_image.hasAlphaChannel()) {
         QPainter p(&m_image);
         p.setCompositionMode(QPainter::CompositionMode_Source);
-        foreach (const QRect &r, region.rects())
+        for (const QRect &r : region)
             p.fillRect(r, Qt::transparent);
     }
 }