aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Gilg <[email protected]>2019-01-04 20:30:24 +0100
committerRoman Gilg <[email protected]>2019-01-04 20:30:24 +0100
commitd848c11485254a20c6faa38ff9ef10958963c587 (patch)
treee93000d4717a58b14655f368b125a766e4c24b48
parentb822b5c05d9b6f1f0d03b34c6455ebe075e1fcf6 (diff)
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!
-rw-r--r--input.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/input.cpp b/input.cpp
index 8f8517e..09848b3 100644
--- a/input.cpp
+++ b/input.cpp
@@ -1508,7 +1508,7 @@ public:
if (!seat->isDragTouch()) {
return false;
}
- if (static_cast<quint32>(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<quint32>(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<quint32>(m_touchId) == id) {
+ if (m_touchId == id) {
m_touchId = -1;
}
return true;