summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qscreen.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-01-26 14:38:54 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-02-11 19:25:47 +0000
commitbcd7d223f066f2830501c2be79f1e7e4f6dd8f50 (patch)
tree2731bb0009263cb2c8d6365a0fedaf2ae63ab8db /src/gui/kernel/qscreen.cpp
parent276d6cf239bdb0a39ae589e13f60b2a31a2efb60 (diff)
QtGui: eradicate Q_FOREACH loops [rvalues]
... by replacing them with C++11 range-for loops. This is the simplest of the patch series: Q_FOREACH took a copy, so we do, too. Except we don't, since we're just catching the return value that comes out of the function (RVO). We can't feed the rvalues into range-for, because they are non-const and would thus detach. Change-Id: I457942159015ff153bdfc6d5f031a3f0a0f6e9ac Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qscreen.cpp')
-rw-r--r--src/gui/kernel/qscreen.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
index 328cb57ec9..ae6879cf84 100644
--- a/src/gui/kernel/qscreen.cpp
+++ b/src/gui/kernel/qscreen.cpp
@@ -122,7 +122,8 @@ QScreen::~QScreen()
bool movingFromVirtualSibling = primaryScreen && primaryScreen->handle()->virtualSiblings().contains(handle());
// Move any leftover windows to the primary screen
- foreach (QWindow *window, QGuiApplication::allWindows()) {
+ const auto allWindows = QGuiApplication::allWindows();
+ for (QWindow *window : allWindows) {
if (!window->isTopLevel() || window->screen() != this)
continue;
@@ -399,7 +400,8 @@ QSize QScreen::virtualSize() const
QRect QScreen::virtualGeometry() const
{
QRect result;
- foreach (QScreen *screen, virtualSiblings())
+ const auto screens = virtualSiblings();
+ for (QScreen *screen : screens)
result |= screen->geometry();
return result;
}
@@ -432,7 +434,8 @@ QSize QScreen::availableVirtualSize() const
QRect QScreen::availableVirtualGeometry() const
{
QRect result;
- foreach (QScreen *screen, virtualSiblings())
+ const auto screens = virtualSiblings();
+ for (QScreen *screen : screens)
result |= screen->availableGeometry();
return result;
}