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, 8 insertions, 26 deletions

diff --git a/src/widgets/styles/qandroidstyle.cpp b/src/widgets/styles/qandroidstyle.cpp
index d97201c601..e59c35ed68 100644
--- a/src/widgets/styles/qandroidstyle.cpp
+++ b/src/widgets/styles/qandroidstyle.cpp
@@ -1233,30 +1233,21 @@ const QAndroidStyle::AndroidDrawable * QAndroidStyle::AndroidStateDrawable::best
 
 int QAndroidStyle::AndroidStateDrawable::extractState(const QVariantMap &value)
 {
-    int state = QStyle::State_Enabled | QStyle::State_Active;;
+    QStyle::State state = QStyle::State_Enabled | QStyle::State_Active;;
     foreach (const QString &key, value.keys()) {
         bool val = value.value(key).toString() == QLatin1String("true");
         if (key == QLatin1String("enabled")) {
-            if (val)
-                state |= QStyle::State_Enabled;
-            else
-                state &= ~QStyle::State_Enabled;
+            state.setFlag(QStyle::State_Enabled, val);
             continue;
         }
 
         if (key == QLatin1String("window_focused")) {
-            if (val)
-                state |= QStyle::State_Active;
-            else
-                state &= ~QStyle::State_Active;
+            state.setFlag(QStyle::State_Active, val);
             continue;
         }
 
         if (key == QLatin1String("focused")) {
-            if (val)
-                state |= QStyle::State_HasFocus;
-            else
-                state &= ~QStyle::State_HasFocus;
+            state.setFlag(QStyle::State_HasFocus, val);
             continue;
         }
 
@@ -1271,18 +1262,12 @@ int QAndroidStyle::AndroidStateDrawable::extractState(const QVariantMap &value)
         }
 
         if (key == QLatin1String("selected")) {
-            if (val)
-                state |= QStyle::State_Selected;
-            else
-                state &= ~QStyle::State_Selected;
+            state.setFlag(QStyle::State_Selected, val);
             continue;
         }
 
         if (key == QLatin1String("active")) {
-            if (val)
-                state |= QStyle::State_Active;
-            else
-                state &= ~QStyle::State_Active;
+            state.setFlag(QStyle::State_Active, val);
             continue;
         }
 
@@ -1292,7 +1277,7 @@ int QAndroidStyle::AndroidStateDrawable::extractState(const QVariantMap &value)
         if (key == QLatin1String("background") && val)
             return -1;
     }
-    return state;
+    return static_cast<int>(state);
 }
 
 void QAndroidStyle::AndroidStateDrawable::setPaddingLeftToSizeWidth()
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index 92c065e138..842641dd3a 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -684,10 +684,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
     {
         QStyleOption dockWidgetHandle = *option;
         bool horizontal = option->state & State_Horizontal;
-        if (horizontal)
-            dockWidgetHandle.state &= ~State_Horizontal;
-        else
-            dockWidgetHandle.state |= State_Horizontal;
+        dockWidgetHandle.state.setFlag(State_Horizontal, !horizontal);
         proxy()->drawControl(CE_Splitter, &dockWidgetHandle, painter, widget);
     }
         break;