diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-05-17 10:54:12 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-05-17 10:56:26 +0200 |
| commit | a0d55cf7789334a70c16e816ce82e95eca4bda0b (patch) | |
| tree | 2e36881ac951ee3d1acc80b16628ecd8a7d33fe3 | |
| parent | 5934e8ee931f6650189e3e86319f6d6e52cb6da0 (diff) | |
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 <johan.helsing@qt.io>
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 4 | ||||
| -rw-r--r-- | src/client/qwaylanddisplay_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 1febca9b1..d0f981702 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/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/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index 67df545f6..1f085e67e 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -173,7 +173,7 @@ public: : id(id_), interface(interface_), version(version_), registry(registry_) { } }; QList<RegistryGlobal> 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. */ |