From 8dc743a6c23edffb33039ef7d4b03fd4bd3081fa Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 28 Jun 2020 20:12:00 +0000 Subject: [PATCH] avoid temporaries in QWidgetPrivate::show_sys() Signed-off-by: Ivailo Monev --- src/gui/kernel/qwidget_x11.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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) { -- 2.11.0