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, 4 insertions, 4 deletions

diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
index 6305e08b6a..d4c669cddc 100644
--- a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
+++ b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
@@ -187,7 +187,7 @@ class ThrottleAlwaysUser : public ThreadEngine<void>
 public:
     ThrottleAlwaysUser()
     {
-        count.store(initialCount = 100);
+        count.storeRelaxed(initialCount = 100);
         finishing = false;
     }
 
@@ -199,7 +199,7 @@ public:
     ThreadFunctionResult threadFunction()
     {
         forever {
-            const int local = count.load();
+            const int local = count.loadRelaxed();
             if (local == 0) {
                 finishing = true;
                 return ThreadFinished;
@@ -224,13 +224,13 @@ void tst_QtConcurrentThreadEngine::throttle()
     for (int i = 0; i < repeats; ++i) {
         QFuture<void> f = (new ThrottleAlwaysUser())->startAsynchronously();
         f.waitForFinished();
-        QCOMPARE(count.load(), 0);
+        QCOMPARE(count.loadRelaxed(), 0);
     }
 
     for (int i = 0; i < repeats; ++i) {
         ThrottleAlwaysUser t;
         t.startBlocking();
-        QCOMPARE(count.load(), 0);
+        QCOMPARE(count.loadRelaxed(), 0);
     }
 }