From 0df5c366e50b9533fd8ea3f31c4c360ae7f4c5b6 Mon Sep 17 00:00:00 2001
From: Andre Somers <andre.somers@kdab.com>
Date: Tue, 2 Feb 2016 14:40:29 +0100
Subject: 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>
---
 src/widgets/widgets/qmainwindowlayout.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/widgets/widgets/qmainwindowlayout.cpp')

diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index b695918406..ae87ea526d 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -375,10 +375,7 @@ void QDockWidgetGroupWindow::adjustFlags()
     Qt::WindowFlags flags = oldFlags;
     if (nativeDeco) {
         flags |= Qt::CustomizeWindowHint | Qt::WindowTitleHint;
-        if (top->features() & QDockWidget::DockWidgetClosable)
-            flags |= Qt::WindowCloseButtonHint;
-        else
-            flags &= ~Qt::WindowCloseButtonHint;
+        flags.setFlag(Qt::WindowCloseButtonHint, top->features() & QDockWidget::DockWidgetClosable);
         flags &= ~Qt::FramelessWindowHint;
     } else {
         flags |= Qt::FramelessWindowHint;
-- 
cgit v1.2.3