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>

4 files changed, 9 insertions, 20 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
index b060d6a082..20233518b3 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
@@ -96,9 +96,8 @@ bool QCocoaBackingStore::scroll(const QRegion &area, int dx, int dy)
     extern void qt_scrollRectInImage(QImage &img, const QRect &rect, const QPoint &offset);
     const qreal devicePixelRatio = m_qImage.devicePixelRatio();
     QPoint qpoint(dx * devicePixelRatio, dy * devicePixelRatio);
-    const QVector<QRect> qrects = area.rects();
-    for (int i = 0; i < qrects.count(); ++i) {
-        const QRect &qrect = QRect(qrects.at(i).topLeft() * devicePixelRatio, qrects.at(i).size() * devicePixelRatio);
+    for (const QRect &rect : area) {
+        const QRect qrect(rect.topLeft() * devicePixelRatio, rect.size() * devicePixelRatio);
         qt_scrollRectInImage(m_qImage, qrect, qpoint);
     }
     return true;
@@ -109,10 +108,9 @@ void QCocoaBackingStore::beginPaint(const QRegion &region)
     if (m_qImage.hasAlphaChannel()) {
         QPainter p(&m_qImage);
         p.setCompositionMode(QPainter::CompositionMode_Source);
-        const QVector<QRect> rects = region.rects();
         const QColor blank = Qt::transparent;
-        for (QVector<QRect>::const_iterator it = rects.begin(), end = rects.end(); it != end; ++it)
-            p.fillRect(*it, blank);
+        for (const QRect &rect : region)
+            p.fillRect(rect, blank);
     }
 }
 
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index 25fc9f0d5e..b6b1862d80 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -200,15 +200,9 @@ NSImage *qt_mac_create_nsimage(const QIcon &icon)
 HIMutableShapeRef qt_mac_QRegionToHIMutableShape(const QRegion &region)
 {
     HIMutableShapeRef shape = HIShapeCreateMutable();
-    QVector<QRect> rects = region.rects();
-    if (!rects.isEmpty()) {
-        int n = rects.count();
-        const QRect *qt_r = rects.constData();
-        while (n--) {
-            CGRect cgRect = CGRectMake(qt_r->x(), qt_r->y(), qt_r->width(), qt_r->height());
-            HIShapeUnionWithRect(shape, &cgRect);
-            ++qt_r;
-        }
+    for (const QRect &rect : region) {
+        CGRect cgRect = CGRectMake(rect.x(), rect.y(), rect.width(), rect.height());
+        HIShapeUnionWithRect(shape, &cgRect);
     }
     return shape;
 }
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 0e84e1f8ed..360ad3baf7 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -514,7 +514,7 @@ QT_WARNING_POP
 {
     m_backingStore = backingStore;
     m_backingStoreOffset = offset * m_backingStore->getBackingStoreDevicePixelRatio();
-    foreach (QRect rect, region.rects())
+    for (const QRect &rect : region)
         [self setNeedsDisplayInRect:NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height())];
 }
 
diff --git a/src/plugins/platforms/cocoa/qpaintengine_mac.mm b/src/plugins/platforms/cocoa/qpaintengine_mac.mm
index 395c25c915..759c4d26a5 100644
--- a/src/plugins/platforms/cocoa/qpaintengine_mac.mm
+++ b/src/plugins/platforms/cocoa/qpaintengine_mac.mm
@@ -88,10 +88,7 @@ static void qt_mac_clip_cg(CGContextRef hd, const QRegion &rgn, CGAffineTransfor
     if (rgn.isEmpty()) {
         CGContextAddRect(hd, CGRectMake(0, 0, 0, 0));
     } else {
-        QVector<QRect> rects = rgn.rects();
-        const int count = rects.size();
-        for (int i = 0; i < count; i++) {
-            const QRect &r = rects[i];
+        for (const QRect &r : rgn) {
             CGRect mac_r = CGRectMake(r.x(), r.y(), r.width(), r.height());
             CGContextAddRect(hd, mac_r);
         }