From b69751863472b186aaad08db6b9b08de81e95dc4 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 30 Nov 2015 12:19:31 +0100 Subject: QtWidgets: replace some Q_FOREACH loops with C++11 range-for This needs to be handled a bit carefully, because Qt containers will detach upon being iterated over using range-for. In the cases of this patch, that cannot happen, because all containers are marked as const (either by this patch or before). Separate patches will deal with other situations. Range-for loops are much more efficient than foreach loops. This patch shaves almost 3K of text size off an optimized Linux AMD64 GCC 4.9 build. Change-Id: I7b1d41db4d9b5db8b515cb75686dc5135177da68 Reviewed-by: Lars Knoll --- src/widgets/widgets/qabstractscrollarea.cpp | 2 +- src/widgets/widgets/qmdiarea.cpp | 19 ++++++++++--------- src/widgets/widgets/qmdisubwindow.cpp | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'src/widgets/widgets') diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index ed6b039c7c..946d683bf0 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -469,7 +469,7 @@ void QAbstractScrollAreaPrivate::layoutChildren() if ((vscrollOverlap > 0 && needv) || (hscrollOverlap > 0 && needh)) { const QList headers = q->findChildren(); if (headers.count() <= 2) { - Q_FOREACH (const QHeaderView *header, headers) { + for (const QHeaderView *header : headers) { const QRect geo = header->geometry(); if (header->orientation() == Qt::Vertical && header->isVisible() && QStyle::visualRect(opt.direction, opt.rect, geo).left() <= opt.rect.width() / 2) vHeaderRight = QStyle::visualRect(opt.direction, opt.rect, geo).right(); diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index a0a6e08688..50685667d3 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -408,7 +408,7 @@ void IconTiler::rearrange(QList &widgets, const QRect &domain) const int MinOverlapPlacer::accumulatedOverlap(const QRect &source, const QVector &rects) { int accOverlap = 0; - foreach (const QRect &rect, rects) { + for (const QRect &rect : rects) { QRect intersection = source.intersected(rect); accOverlap += intersection.width() * intersection.height(); } @@ -425,7 +425,7 @@ QRect MinOverlapPlacer::findMinOverlapRect(const QVector &source, const Q { int minAccOverlap = -1; QRect minAccOverlapRect; - foreach (const QRect &srcRect, source) { + for (const QRect &srcRect : source) { const int accOverlap = accumulatedOverlap(srcRect, rects); if (accOverlap < minAccOverlap || minAccOverlap == -1) { minAccOverlap = accOverlap; @@ -454,7 +454,7 @@ QVector MinOverlapPlacer::getCandidatePlacements(const QSize &size, const if (domain.bottom() - size.height() + 1 >= 0) ylist << domain.bottom() - size.height() + 1; - foreach (const QRect &rect, rects) { + for (const QRect &rect : rects) { xlist << rect.right() + 1; ylist << rect.bottom() + 1; } @@ -504,7 +504,7 @@ QVector MinOverlapPlacer::findMaxOverlappers(const QRect &domain, const Q result.reserve(source.size()); int maxOverlap = -1; - foreach (const QRect &srcRect, source) { + for (const QRect &srcRect : source) { QRect intersection = domain.intersected(srcRect); const int overlap = intersection.width() * intersection.height(); if (overlap >= maxOverlap || maxOverlap == -1) { @@ -549,7 +549,7 @@ QPoint MinOverlapPlacer::place(const QSize &size, const QVector &rects, { if (size.isEmpty() || !domain.isValid()) return QPoint(); - foreach (const QRect &rect, rects) { + for (const QRect &rect : rects) { if (!rect.isValid()) return QPoint(); } @@ -1237,7 +1237,8 @@ void QMdiAreaPrivate::internalRaise(QMdiSubWindow *mdiChild) const QMdiSubWindow *stackUnderChild = 0; if (!windowStaysOnTop(mdiChild)) { - foreach (QObject *object, viewport->children()) { + const auto children = viewport->children(); // take a copy, as raising/stacking under changes the order + for (QObject *object : children) { QMdiSubWindow *child = qobject_cast(object); if (!child || !childWindows.contains(child)) continue; @@ -1392,7 +1393,7 @@ QMdiAreaPrivate::subWindowList(QMdiArea::WindowOrder order, bool reversed) const list.prepend(child); } } else if (order == QMdiArea::StackingOrder) { - foreach (QObject *object, viewport->children()) { + for (QObject *object : viewport->children()) { QMdiSubWindow *child = qobject_cast(object); if (!child || !childWindows.contains(child)) continue; @@ -1741,7 +1742,7 @@ QSize QMdiArea::sizeHint() const QSize desktopSize = QApplication::desktop()->size(); QSize size(desktopSize.width() * 2 / scaleFactor, desktopSize.height() * 2 / scaleFactor); - foreach (QMdiSubWindow *child, d_func()->childWindows) { + for (QMdiSubWindow *child : d_func()->childWindows) { if (!sanityCheck(child, "QMdiArea::sizeHint")) continue; size = size.expandedTo(child->sizeHint()); @@ -1759,7 +1760,7 @@ QSize QMdiArea::minimumSizeHint() const style()->pixelMetric(QStyle::PM_TitleBarHeight, 0, this)); size = size.expandedTo(QAbstractScrollArea::minimumSizeHint()); if (!d->scrollBarsEnabled()) { - foreach (QMdiSubWindow *child, d->childWindows) { + for (QMdiSubWindow *child : d->childWindows) { if (!sanityCheck(child, "QMdiArea::sizeHint")) continue; size = size.expandedTo(child->minimumSizeHint()); diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index 0f38eee6cd..83a997dae0 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -2206,8 +2206,8 @@ void QMdiSubWindowPrivate::setSizeGrip(QSizeGrip *newSizeGrip) void QMdiSubWindowPrivate::setSizeGripVisible(bool visible) const { // See if we can find any size grips - QList sizeGrips = q_func()->findChildren(); - foreach (QSizeGrip *grip, sizeGrips) + const QList sizeGrips = q_func()->findChildren(); + for (QSizeGrip *grip : sizeGrips) grip->setVisible(visible); } -- cgit v1.2.3