diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-02-13 14:47:18 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-02-14 10:33:37 +0000 |
commit | 4266c541284c9ba4e490c0b0b6ae0ef709fc01fe (patch) | |
tree | 84c13cf8690f77b1ba721b87c133dd110667f8f7 /src/corelib/kernel/qeventloop.cpp | |
parent | 08f9dc1d325ac945c2e6f8f1ff6f8093b091b2fd (diff) |
Use explicit QThreadData::hasEventDispatcher() where possible
Change-Id: Ibce1a82dabb4e1381486211dbfb14eee9572e0ac
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qeventloop.cpp')
-rw-r--r-- | src/corelib/kernel/qeventloop.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp index 8974ff7709..3e2326343b 100644 --- a/src/corelib/kernel/qeventloop.cpp +++ b/src/corelib/kernel/qeventloop.cpp @@ -101,7 +101,7 @@ QEventLoop::QEventLoop(QObject *parent) Q_D(QEventLoop); if (!QCoreApplication::instance() && QCoreApplicationPrivate::threadRequiresCoreApplication()) { qWarning("QEventLoop: Cannot be used without QApplication"); - } else if (!d->threadData->eventDispatcher.load()) { + } else if (!d->threadData->hasEventDispatcher()) { QThreadPrivate::createEventDispatcher(d->threadData); } } @@ -129,7 +129,7 @@ QEventLoop::~QEventLoop() bool QEventLoop::processEvents(ProcessEventsFlags flags) { Q_D(QEventLoop); - if (!d->threadData->eventDispatcher.load()) + if (!d->threadData->hasEventDispatcher()) return false; return d->threadData->eventDispatcher.load()->processEvents(flags); } @@ -234,7 +234,7 @@ int QEventLoop::exec(ProcessEventsFlags flags) void QEventLoop::processEvents(ProcessEventsFlags flags, int maxTime) { Q_D(QEventLoop); - if (!d->threadData->eventDispatcher.load()) + if (!d->threadData->hasEventDispatcher()) return; QElapsedTimer start; @@ -263,7 +263,7 @@ void QEventLoop::processEvents(ProcessEventsFlags flags, int maxTime) void QEventLoop::exit(int returnCode) { Q_D(QEventLoop); - if (!d->threadData->eventDispatcher.load()) + if (!d->threadData->hasEventDispatcher()) return; d->returnCode.store(returnCode); @@ -292,7 +292,7 @@ bool QEventLoop::isRunning() const void QEventLoop::wakeUp() { Q_D(QEventLoop); - if (!d->threadData->eventDispatcher.load()) + if (!d->threadData->hasEventDispatcher()) return; d->threadData->eventDispatcher.load()->wakeUp(); } |