vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use appropriate sequence algorithms in IdleInhibition 

Summary: This simplifies code a little bit.

Test Plan: Compiles, existing tests pass.

Reviewers: #kwin, graesslin

Reviewed By: #kwin, graesslin

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D17353
icc-effect-5.17.5
Vlad Zagorodniy 2019-01-11 15:21:20 +02:00
parent 2e2a462733
commit 4fac71d697
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
idle_inhibition.cpp
View File

@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KWayland/Server/idle_interface.h> #include <KWayland/Server/idle_interface.h>
#include <KWayland/Server/surface_interface.h> #include <KWayland/Server/surface_interface.h>
#include <algorithm>
#include <functional> #include <functional>
using KWayland::Server::SurfaceInterface; using KWayland::Server::SurfaceInterface;
@ -82,7 +83,7 @@ void IdleInhibition::inhibit(AbstractClient *client)
void IdleInhibition::uninhibit(AbstractClient *client) void IdleInhibition::uninhibit(AbstractClient *client)
{ {
auto it = std::find_if(m_idleInhibitors.begin(), m_idleInhibitors.end(), [client] (auto c) { return c == client; }); auto it = std::find(m_idleInhibitors.begin(), m_idleInhibitors.end(), client);
if (it == m_idleInhibitors.end()) { if (it == m_idleInhibitors.end()) {
// not inhibited // not inhibited
return; return;

4
idle_inhibition.h
View File

@ -24,8 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QVector> #include <QVector>
#include <QMap> #include <QMap>
#include <algorithm>
namespace KWayland namespace KWayland
{ {
namespace Server namespace Server
@ -54,7 +52,7 @@ public:
return !m_idleInhibitors.isEmpty(); return !m_idleInhibitors.isEmpty();
} }
bool isInhibited(AbstractClient *client) const { bool isInhibited(AbstractClient *client) const {
return std::any_of(m_idleInhibitors.begin(), m_idleInhibitors.end(), [client] (auto c) { return c == client; }); return m_idleInhibitors.contains(client);
} }
private Q_SLOTS: private Q_SLOTS: