From d848c11485254a20c6faa38ff9ef10958963c587 Mon Sep 17 00:00:00 2001 From: Roman Gilg Date: Fri, 4 Jan 2019 20:30:24 +0100 Subject: [PATCH] Revert "Remove comparison between signed and unsigned integer expressions warning" This reverts commit 16e904592ae4fe0a04ef61d42c9a114c62997c8e. The commit has logical errors, corrupting DND on Wayland. Also the solution with static_cast to solve the compiler warnings is not a sensible one, it just hides the root problem. And next time such a change has to go through review! --- input.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/input.cpp b/input.cpp index 8f8517eac6..09848b31fe 100644 --- a/input.cpp +++ b/input.cpp @@ -1508,7 +1508,7 @@ public: if (!seat->isDragTouch()) { return false; } - if (static_cast(m_touchId) == id) { + if (m_touchId != id) { return true; } seat->setTimestamp(time); @@ -1529,7 +1529,7 @@ public: // associated with by implementing a key-value getter in KWayland. m_touchId = id; } - if (static_cast(m_touchId) == id) { + if (m_touchId != id) { return true; } seat->setTimestamp(time); @@ -1565,7 +1565,7 @@ public: seat->touchUp(kwaylandId); input()->touch()->removeId(id); } - if (static_cast(m_touchId) == id) { + if (m_touchId == id) { m_touchId = -1; } return true;