Port from QAtomic::load() to loadRelaxed()

Semi-automated, just needed ~20 manual fixes:

$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)load\(\)/$1loadRelaxed\(\)/g' -i \{\} +
$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)store\(/$1storeRelaxed\(/g' -i \{\} +

It can be easily improved (e.g. for store check that there are no commas
after the opening parens). The most common offender is QLibrary::load,
and some code using std::atomic directly.

Change-Id: I07c38a3c8ed32c924ef4999e85c7e45cf48f0f6c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
 
 

1 files changed, 5 insertions, 5 deletions

diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp
index a6cc51621a..2104b22095 100644
--- a/src/corelib/kernel/qeventloop.cpp
+++ b/src/corelib/kernel/qeventloop.cpp
@@ -135,7 +135,7 @@ bool QEventLoop::processEvents(ProcessEventsFlags flags)
     Q_D(QEventLoop);
     if (!d->threadData->hasEventDispatcher())
         return false;
-    return d->threadData->eventDispatcher.load()->processEvents(flags);
+    return d->threadData->eventDispatcher.loadRelaxed()->processEvents(flags);
 }
 
 /*!
@@ -225,7 +225,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)
         processEvents(flags | WaitForMoreEvents | EventLoopExec);
 
     ref.exceptionCaught = false;
-    return d->returnCode.load();
+    return d->returnCode.loadRelaxed();
 }
 
 /*!
@@ -279,9 +279,9 @@ void QEventLoop::exit(int returnCode)
     if (!d->threadData->hasEventDispatcher())
         return;
 
-    d->returnCode.store(returnCode);
+    d->returnCode.storeRelaxed(returnCode);
     d->exit.storeRelease(true);
-    d->threadData->eventDispatcher.load()->interrupt();
+    d->threadData->eventDispatcher.loadRelaxed()->interrupt();
 
 #ifdef Q_OS_WASM
     // QEventLoop::exec() never returns in emscripten. We implement approximate behavior here.
@@ -318,7 +318,7 @@ void QEventLoop::wakeUp()
     Q_D(QEventLoop);
     if (!d->threadData->hasEventDispatcher())
         return;
-    d->threadData->eventDispatcher.load()->wakeUp();
+    d->threadData->eventDispatcher.loadRelaxed()->wakeUp();
 }