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

diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
index d68cefc807..39c90f69b4 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
+++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
@@ -775,49 +775,49 @@ private slots:
         QCoreApplicationPrivate *privateClass = static_cast<QCoreApplicationPrivate*>(QObjectPrivate::get(qApp));
 
         {
-            QCOMPARE(privateClass->quitLockRef.load(), 0);
+            QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 0);
             // Test with a lock active so that the refcount doesn't drop to zero during these tests, causing a quit.
             // (until we exit the scope)
             QEventLoopLocker locker;
 
-            QCOMPARE(privateClass->quitLockRef.load(), 1);
+            QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 1);
 
             JobObject *job1 = new JobObject(this);
 
-            QCOMPARE(privateClass->quitLockRef.load(), 2);
+            QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 2);
 
             delete job1;
 
-            QCOMPARE(privateClass->quitLockRef.load(), 1);
+            QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 1);
 
             job1 = new JobObject(this);
 
-            QCOMPARE(privateClass->quitLockRef.load(), 2);
+            QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 2);
 
             JobObject *job2 = new JobObject(this);
 
-            QCOMPARE(privateClass->quitLockRef.load(), 3);
+            QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 3);
 
             delete job1;
 
-            QCOMPARE(privateClass->quitLockRef.load(), 2);
+            QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 2);
 
             JobObject *job3 = new JobObject(job2);
             Q_UNUSED(job3);
 
-            QCOMPARE(privateClass->quitLockRef.load(), 3);
+            QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 3);
 
             JobObject *job4 = new JobObject(job2);
             Q_UNUSED(job4);
 
-            QCOMPARE(privateClass->quitLockRef.load(), 4);
+            QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 4);
 
             delete job2;
 
-            QCOMPARE(privateClass->quitLockRef.load(), 1);
+            QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 1);
 
         }
-        QCOMPARE(privateClass->quitLockRef.load(), 0);
+        QCOMPARE(privateClass->quitLockRef.loadRelaxed(), 0);
     }
 };