1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWaylandDisplay: make hasRegistryGlobal() const-correct and take a QStringView

Browse Source 
Also port a Q_FOREACH loop to C++11 ranged-for.

Change-Id: Ifde232a00e6abed285efaf146a48521c7df25378
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
Marc Mutz 2019-05-17 10:54:12 +02:00
parent 72cae9c58c
commit 6b761b7448
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -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) if (global.interface == interfaceName)
return true; return true;

2
src/plugins/platforms/wayland/qwaylanddisplay_p.h
View File

@ -173,7 +173,7 @@ public:
: id(id_), interface(interface_), version(version_), registry(registry_) { } : id(id_), interface(interface_), version(version_), registry(registry_) { }
}; };
QList<RegistryGlobal> globals() const { return mGlobals; } 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 /* wl_registry_add_listener does not add but rather sets a listener, so this function is used
* to enable many listeners at once. */ * to enable many listeners at once. */