From 6b761b744891ab9b4b0e48c6f836ea5ebc9cb076 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 17 May 2019 10:54:12 +0200 Subject: [PATCH] QWaylandDisplay: make hasRegistryGlobal() const-correct and take a QStringView Also port a Q_FOREACH loop to C++11 ranged-for. Change-Id: Ifde232a00e6abed285efaf146a48521c7df25378 Reviewed-by: Johan Helsing --- src/plugins/platforms/wayland/qwaylanddisplay.cpp | 4 ++-- src/plugins/platforms/wayland/qwaylanddisplay_p.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index 1febca9b1ed..d0f98170201 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp @@ -386,9 +386,9 @@ void QWaylandDisplay::registry_global_remove(uint32_t id) } } -bool QWaylandDisplay::hasRegistryGlobal(const QString &interfaceName) +bool QWaylandDisplay::hasRegistryGlobal(QStringView interfaceName) const { - Q_FOREACH (const RegistryGlobal &global, mGlobals) + for (const RegistryGlobal &global : mGlobals) if (global.interface == interfaceName) return true; diff --git a/src/plugins/platforms/wayland/qwaylanddisplay_p.h b/src/plugins/platforms/wayland/qwaylanddisplay_p.h index 67df545f67b..1f085e67ecd 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay_p.h +++ b/src/plugins/platforms/wayland/qwaylanddisplay_p.h @@ -173,7 +173,7 @@ public: : id(id_), interface(interface_), version(version_), registry(registry_) { } }; QList globals() const { return mGlobals; } - bool hasRegistryGlobal(const QString &interfaceName); + bool hasRegistryGlobal(QStringView interfaceName) const; /* wl_registry_add_listener does not add but rather sets a listener, so this function is used * to enable many listeners at once. */