QtWidgets: use new QRegion::begin()/end() instead of rect()

Saves ~600b in text size on optimized GCC 5.3 Linux AMD64 builds.

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

2 files changed, 7 insertions, 12 deletions

diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 3490d09fdf..ef1b9432cd 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -587,7 +587,7 @@ HIMutableShapeRef qt_mac_toHIMutableShape(const QRegion &region)
         CGRect cgRect = CGRectMake(qtRect.x(), qtRect.y(), qtRect.width(), qtRect.height());
         HIShapeUnionWithRect(shape, &cgRect);
     } else {
-        foreach (const QRect &qtRect, region.rects()) {
+        for (const QRect &qtRect : region) {
             CGRect cgRect = CGRectMake(qtRect.x(), qtRect.y(), qtRect.width(), qtRect.height());
             HIShapeUnionWithRect(shape, &cgRect);
         }
@@ -2203,9 +2203,7 @@ void qt_mac_fill_background(QPainter *painter, const QRegion &rgn, const QBrush
         CGContextSaveGState(cg);
         HIThemeSetFill(kThemeBrushDialogBackgroundActive, 0, cg, kHIThemeOrientationInverted);
 
-        const QVector<QRect> &rects = rgn.rects();
-        for (int i = 0; i < rects.size(); ++i) {
-            const QRect rect(rects.at(i));
+        for (const QRect &rect : rgn) {
             // Anchor the pattern to the top so it stays put when the window is resized.
             CGContextSetPatternPhase(cg, CGSizeMake(rect.width(), rect.height()));
             CGRect mac_rect = CGRectMake(rect.x(), rect.y(), rect.width(), rect.height());
@@ -7067,11 +7065,11 @@ void qt_mac_scale_region(QRegion *region, qreal scaleFactor)
         return;
 
     QVector<QRect> scaledRects;
-    scaledRects.reserve(region->rects().count());
+    scaledRects.reserve(region->rectCount());
 
-    foreach (const QRect &rect, region->rects()) {
+    for (const QRect &rect : *region)
         scaledRects.append(QRect(rect.topLeft() * scaleFactor, rect.size() * scaleFactor));
-    }
+
     region->setRects(&scaledRects[0], scaledRects.count());
 }
 
diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp
index c33e4167c1..c3072303de 100644
--- a/src/widgets/styles/qwindowsxpstyle.cpp
+++ b/src/widgets/styles/qwindowsxpstyle.cpp
@@ -269,7 +269,7 @@ static HRGN qt_hrgn_from_qregion(const QRegion &region)
         qt_add_rect(hRegion, region.boundingRect());
         return hRegion;
     }
-    foreach (const QRect &rect, region.rects())
+    for (const QRect &rect : region)
         qt_add_rect(hRegion, rect);
     return hRegion;
 }
@@ -1087,11 +1087,8 @@ bool QWindowsXPStylePrivate::drawBackgroundThruNativeBuffer(XPThemeData &themeDa
         painter->setClipRegion(newRegion);
 #if defined(DEBUG_XP_STYLE) && 0
         printf("Using region:\n");
-        QVector<QRect> rects = newRegion.rects();
-        for (int i = 0; i < rects.count(); ++i) {
-            const QRect &r = rects.at(i);
+        for (const QRect &r : newRegion)
             printf("    (%d, %d, %d, %d)\n", r.x(), r.y(), r.right(), r.bottom());
-        }
 #endif
     }