diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-05-17 11:22:27 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-05-17 11:44:56 +0200 |
| commit | 5934e8ee931f6650189e3e86319f6d6e52cb6da0 (patch) | |
| tree | 2f5ccae0d7a66b8348b15987108153a621bc8f64 /src | |
| parent | 14d37a53a674d7dbef32e718ae391e265fad5fac (diff) | |
QWaylandXdgShellV5: make xdgSurfaceFromSurface() const-correct
... and replace a Q_FOREACH with a C++11 ranged-for loop.
Change-Id: I0e77bc51a53c5141217465152be1913539da0968
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshellv5.cpp | 4 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshellv5_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshellv5.cpp b/src/compositor/extensions/qwaylandxdgshellv5.cpp index 0628f55e7..a85efbc5f 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv5.cpp @@ -115,9 +115,9 @@ QWaylandXdgPopupV5 *QWaylandXdgShellV5Private::topmostPopupForClient(wl_client * return clientPopups.empty() ? nullptr : clientPopups.last(); } -QWaylandXdgSurfaceV5 *QWaylandXdgShellV5Private::xdgSurfaceFromSurface(QWaylandSurface *surface) +QWaylandXdgSurfaceV5 *QWaylandXdgShellV5Private::xdgSurfaceFromSurface(QWaylandSurface *surface) const { - Q_FOREACH (QWaylandXdgSurfaceV5 *xdgSurface, m_xdgSurfaces) { + for (QWaylandXdgSurfaceV5 *xdgSurface : m_xdgSurfaces) { if (surface == xdgSurface->surface()) return xdgSurface; } diff --git a/src/compositor/extensions/qwaylandxdgshellv5_p.h b/src/compositor/extensions/qwaylandxdgshellv5_p.h index 8f5af746b..d10359e68 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv5_p.h @@ -81,7 +81,7 @@ public: QMultiMap<struct wl_client *, QWaylandXdgSurfaceV5 *> m_xdgSurfaces; QMultiMap<struct wl_client *, QWaylandXdgPopupV5 *> m_xdgPopups; - QWaylandXdgSurfaceV5 *xdgSurfaceFromSurface(QWaylandSurface *surface); + QWaylandXdgSurfaceV5 *xdgSurfaceFromSurface(QWaylandSurface *surface) const; protected: void xdg_shell_destroy(Resource *resource) override; |