From c568257a52d39d1ae831ec3420ec4eaefdec3f58 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 2 May 2021 02:31:32 +0200 Subject: [PATCH] Event dispatchers: code tidies Turn an implicit conversion to bool in * a call to testAnyFlag in one case; * a comparison against 0 in another case, for consistency with the surrounding code. Change-Id: I1eee42ba82c59a72430bf507ea80408c553be889 Reviewed-by: Thiago Macieira --- src/corelib/kernel/qeventdispatcher_glib.cpp | 2 +- src/corelib/kernel/qeventdispatcher_unix.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp index 86f6b0b4aa9..3964c1ceac6 100644 --- a/src/corelib/kernel/qeventdispatcher_glib.cpp +++ b/src/corelib/kernel/qeventdispatcher_glib.cpp @@ -411,7 +411,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags) { Q_D(QEventDispatcherGlib); - const bool canWait = (flags & QEventLoop::WaitForMoreEvents); + const bool canWait = flags.testAnyFlag(QEventLoop::WaitForMoreEvents); if (canWait) emit aboutToBlock(); else diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 251bbec59b0..c23fab2eef8 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -469,7 +469,7 @@ bool QEventDispatcherUNIX::processEvents(QEventLoop::ProcessEventsFlags flags) const bool include_timers = (flags & QEventLoop::X11ExcludeTimers) == 0; const bool include_notifiers = (flags & QEventLoop::ExcludeSocketNotifiers) == 0; - const bool wait_for_events = flags & QEventLoop::WaitForMoreEvents; + const bool wait_for_events = (flags & QEventLoop::WaitForMoreEvents) != 0; const bool canWait = (threadData->canWaitLocked() && !d->interrupt.loadRelaxed()