From 86cbf7338634a1af2bd87d051dc18531529bfaa5 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 1 May 2020 13:02:39 +0200 Subject: [PATCH] Fix compile with strict iterator --- effects/screenshot/screenshot.cpp | 2 +- kcmkwin/kwinscreenedges/kwinscreenedge.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/effects/screenshot/screenshot.cpp b/effects/screenshot/screenshot.cpp index 140377dae0..a9817b4b57 100644 --- a/effects/screenshot/screenshot.cpp +++ b/effects/screenshot/screenshot.cpp @@ -397,7 +397,7 @@ void ScreenShotEffect::postPaintScreen() p.begin(&multipleOutputsImage); // reassemble images together - for (i = m_cacheOutputsImages.begin(); i != m_cacheOutputsImages.end(); ++i) { + for (i = m_cacheOutputsImages.constBegin(); i != m_cacheOutputsImages.constEnd(); ++i) { auto pos = i.key(); auto img = i.value(); // disable dpr rendering, we already took care of this diff --git a/kcmkwin/kwinscreenedges/kwinscreenedge.cpp b/kcmkwin/kwinscreenedges/kwinscreenedge.cpp index 58cd3cccd6..ce4778e5c2 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedge.cpp +++ b/kcmkwin/kwinscreenedges/kwinscreenedge.cpp @@ -134,7 +134,7 @@ void KWinScreenEdge::monitorChangeDefaultEdge(const QList &borderList, int void KWinScreenEdge::reload() { - for (auto it = m_reference.begin(); it != m_reference.cend(); ++it) { + for (auto it = m_reference.cbegin(); it != m_reference.cend(); ++it) { monitor()->selectEdgeItem(KWinScreenEdge::electricBorderToMonitorEdge(it.key()), it.value()); } onChanged(); @@ -142,7 +142,7 @@ void KWinScreenEdge::reload() void KWinScreenEdge::setDefaults() { - for (auto it = m_default.begin(); it != m_default.cend(); ++it) { + for (auto it = m_default.cbegin(); it != m_default.cend(); ++it) { monitor()->selectEdgeItem(KWinScreenEdge::electricBorderToMonitorEdge(it.key()), it.value()); } onChanged(); @@ -200,13 +200,13 @@ ElectricBorder KWinScreenEdge::monitorEdgeToElectricBorder(int edge) void KWinScreenEdge::onChanged() { bool needSave = isSaveNeeded(); - for (auto it = m_reference.begin(); it != m_reference.cend(); ++it) { + for (auto it = m_reference.cbegin(); it != m_reference.cend(); ++it) { needSave |= it.value() != monitor()->selectedEdgeItem(KWinScreenEdge::electricBorderToMonitorEdge(it.key())); } emit saveNeededChanged(needSave); bool defaults = isDefault(); - for (auto it = m_default.begin(); it != m_default.cend(); ++it) { + for (auto it = m_default.cbegin(); it != m_default.cend(); ++it) { defaults &= it.value() == monitor()->selectedEdgeItem(KWinScreenEdge::electricBorderToMonitorEdge(it.key())); } emit defaultChanged(defaults);