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

diff --git a/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
index b943b04e23..ea94cc2999 100644
--- a/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
+++ b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
@@ -327,7 +327,7 @@ struct RefCounted
 
     ~RefCounted()
     {
-        QVERIFY( ref.load() == 0 );
+        QVERIFY( ref.loadRelaxed() == 0 );
         instanceCount.deref();
     }
 
@@ -369,13 +369,13 @@ void scopedPointerComparisonTest(const A1 &a1, const A2 &a2, const B &b)
 
 void tst_QScopedPointer::comparison()
 {
-    QCOMPARE( RefCounted::instanceCount.load(), 0 );
+    QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 0 );
 
     {
         RefCounted *a = new RefCounted;
         RefCounted *b = new RefCounted;
 
-        QCOMPARE( RefCounted::instanceCount.load(), 2 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
 
         QScopedPointer<RefCounted> pa1(a);
         QScopedPointer<RefCounted> pa2(a);
@@ -387,16 +387,16 @@ void tst_QScopedPointer::comparison()
 
         pa2.take();
 
-        QCOMPARE( RefCounted::instanceCount.load(), 2 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
     }
 
-    QCOMPARE( RefCounted::instanceCount.load(), 0 );
+    QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 0 );
 
     {
         RefCounted *a = new RefCounted[42];
         RefCounted *b = new RefCounted[43];
 
-        QCOMPARE( RefCounted::instanceCount.load(), 85 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 85 );
 
         QScopedArrayPointer<RefCounted> pa1(a);
         QScopedArrayPointer<RefCounted> pa2(a);
@@ -406,10 +406,10 @@ void tst_QScopedPointer::comparison()
 
         pa2.take();
 
-        QCOMPARE( RefCounted::instanceCount.load(), 85 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 85 );
     }
 
-    QCOMPARE( RefCounted::instanceCount.load(), 0 );
+    QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 0 );
 
     {
         // QScopedSharedPointer is an internal helper class -- it is unsupported!
@@ -417,42 +417,42 @@ void tst_QScopedPointer::comparison()
         RefCounted *a = new RefCounted;
         RefCounted *b = new RefCounted;
 
-        QCOMPARE( RefCounted::instanceCount.load(), 2 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
 
         QSharedDataPointer<RefCounted> pa1(a);
         QSharedDataPointer<RefCounted> pa2(a);
         QSharedDataPointer<RefCounted> pb(b);
 
-        QCOMPARE( a->ref.load(), 2 );
-        QCOMPARE( b->ref.load(), 1 );
-        QCOMPARE( RefCounted::instanceCount.load(), 2 );
+        QCOMPARE( a->ref.loadRelaxed(), 2 );
+        QCOMPARE( b->ref.loadRelaxed(), 1 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
 
         scopedPointerComparisonTest(pa1, pa2, pb);
 
-        QCOMPARE( RefCounted::instanceCount.load(), 2 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
     }
 
-    QCOMPARE( RefCounted::instanceCount.load(), 0 );
+    QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 0 );
 }
 
 void tst_QScopedPointer::array()
 {
-    int instCount = RefCounted::instanceCount.load();
+    int instCount = RefCounted::instanceCount.loadRelaxed();
     {
         QScopedArrayPointer<RefCounted> array;
         array.reset(new RefCounted[42]);
-        QCOMPARE(instCount + 42, RefCounted::instanceCount.load());
+        QCOMPARE(instCount + 42, RefCounted::instanceCount.loadRelaxed());
     }
-    QCOMPARE(instCount, RefCounted::instanceCount.load());
+    QCOMPARE(instCount, RefCounted::instanceCount.loadRelaxed());
     {
         QScopedArrayPointer<RefCounted> array(new RefCounted[42]);
-        QCOMPARE(instCount + 42, RefCounted::instanceCount.load());
+        QCOMPARE(instCount + 42, RefCounted::instanceCount.loadRelaxed());
         array.reset(new RefCounted[28]);
-        QCOMPARE(instCount + 28, RefCounted::instanceCount.load());
+        QCOMPARE(instCount + 28, RefCounted::instanceCount.loadRelaxed());
         array.reset(0);
-        QCOMPARE(instCount, RefCounted::instanceCount.load());
+        QCOMPARE(instCount, RefCounted::instanceCount.loadRelaxed());
     }
-    QCOMPARE(instCount, RefCounted::instanceCount.load());
+    QCOMPARE(instCount, RefCounted::instanceCount.loadRelaxed());
 }