Revert "Remove comparison between signed and unsigned integer expressions warning"

This reverts commit 16e904592a.

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!
icc-effect-5.17.5
Roman Gilg 2019-01-04 20:30:24 +01:00
parent b822b5c05d
commit d848c11485
1 changed files with 3 additions and 3 deletions

View File

@ -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;