From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sun, 28 Jun 2020 20:12:00 +0000 (+0000)
Subject: avoid temporaries in QWidgetPrivate::show_sys()
X-Git-Tag: 4.12.0~3713
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8dc743a6c23edffb33039ef7d4b03fd4bd3081fa;p=kde%2FKatie.git

avoid temporaries in QWidgetPrivate::show_sys()

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index b6e02b50f..140f9bbb3 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -1868,16 +1868,11 @@ void QWidgetPrivate::show_sys()
         }
 
         // set _NET_WM_USER_TIME
-        Time userTime = qt_x11Data->userTime;
-        bool setUserTime = false;
         if (q->testAttribute(Qt::WA_ShowWithoutActivating)) {
-            userTime = 0;
-            setUserTime = true;
-        } else if (userTime != CurrentTime) {
-            setUserTime = true;
+            qt_net_update_user_time(q, 0);
+        } else if (qt_x11Data->userTime != CurrentTime) {
+            qt_net_update_user_time(q, qt_x11Data->userTime);
         }
-        if (setUserTime)
-            qt_net_update_user_time(q, userTime);
 
 #ifndef QT_NO_XSYNC
         if (!topData()->syncUpdateCounter) {