Use QFlags::setFlag where prudent in qtbase

QFlags::setFlag is most useful to replace explicit constructs like

if (condition) {
   someFlags |= TheConditionFlag;
} else {
   someFlags &= ~TheConditionFlag;
}

with

someFlags.setFlag(TheConditionFlag, condition);

Change-Id: Ie4586681c83e0af812d5bbf14965aad51941a960
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

2 files changed, 2 insertions, 8 deletions

diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
index ce9043c098..7f73a7ef94 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
@@ -266,10 +266,7 @@ void QEvdevMouseHandler::readMouseData()
             case 0x11e: button = Qt::ExtraButton12; break;
             case 0x11f: button = Qt::ExtraButton13; break;
             }
-            if (data->value)
-                m_buttons |= button;
-            else
-                m_buttons &= ~button;
+            m_buttons.setFlag(button, data->value);
             btnChanged = true;
         } else if (data->type == EV_SYN && data->code == SYN_REPORT) {
             if (btnChanged) {
diff --git a/src/platformsupport/input/libinput/qlibinputpointer.cpp b/src/platformsupport/input/libinput/qlibinputpointer.cpp
index 3476235d6b..d5a3a8b437 100644
--- a/src/platformsupport/input/libinput/qlibinputpointer.cpp
+++ b/src/platformsupport/input/libinput/qlibinputpointer.cpp
@@ -76,10 +76,7 @@ void QLibInputPointer::processButton(libinput_event_pointer *e)
     case 0x11f: button = Qt::ExtraButton13; break;
     }
 
-    if (pressed)
-        m_buttons |= button;
-    else
-        m_buttons &= ~button;
+    m_buttons.setFlag(button, pressed);
 
     QWindowSystemInterface::handleMouseEvent(Q_NULLPTR, m_pos, m_pos, m_buttons, QGuiApplication::keyboardModifiers());
 }