Remove warnings from deprecated atomic operators in autotests

Use QAtomic*::load() and ::store() instead of the deprecated
cast, assignment, and comparison operators. These will be removed
in the near future.

The tests for these particular operators have not been changed,
though, as the change to remove the operators will also remove
the respective tests.

Change-Id: I2f24d18992af0c6e0f487d707218e4e84f4bdd12
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

6 files changed, 52 insertions, 52 deletions

diff --git a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
index 2457504c38..964b834fa7 100644
--- a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
@@ -625,26 +625,26 @@ template <typename T>
 void testRefCounting()
 {
     QFutureInterface<T> interface;
-    QCOMPARE(int(interface.d->refCount), 1);
+    QCOMPARE(interface.d->refCount.load(), 1);
 
     {
         interface.reportStarted();
 
         QFuture<T> f = interface.future();
-        QCOMPARE(int(interface.d->refCount), 2);
+        QCOMPARE(interface.d->refCount.load(), 2);
 
         QFuture<T> f2(f);
-        QCOMPARE(int(interface.d->refCount), 3);
+        QCOMPARE(interface.d->refCount.load(), 3);
 
         QFuture<T> f3;
         f3 = f2;
-        QCOMPARE(int(interface.d->refCount), 4);
+        QCOMPARE(interface.d->refCount.load(), 4);
 
         interface.reportFinished(0);
-        QCOMPARE(int(interface.d->refCount), 4);
+        QCOMPARE(interface.d->refCount.load(), 4);
     }
 
-    QCOMPARE(int(interface.d->refCount), 1);
+    QCOMPARE(interface.d->refCount.load(), 1);
 }
 
 void tst_QFuture::refcounting()
diff --git a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
index 4af71d58fd..ed714101e7 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
+++ b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@@ -106,7 +106,7 @@ QAtomicInt iterations;
 class PrintFor : public IterateKernel<TestIterator, void>
 {
 public:
-    PrintFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) {iterations = 0; }
+    PrintFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) { iterations.store(0); }
     bool runIterations(TestIterator/*beginIterator*/, int begin, int end, void *)
     {
         iterations.fetchAndAddRelaxed(end - begin);
@@ -125,7 +125,7 @@ public:
 class SleepPrintFor : public IterateKernel<TestIterator, void>
 {
 public:
-    SleepPrintFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) {iterations = 0; }
+    SleepPrintFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) { iterations.store(0); }
     inline bool runIterations(TestIterator/*beginIterator*/, int begin, int end, void *)
     {
         QTest::qSleep(200);
@@ -145,7 +145,7 @@ public:
 void tst_QtConcurrentIterateKernel::instantiate()
 {
     startThreadEngine(new PrintFor(0, 40)).startBlocking();
-    QCOMPARE((int)iterations, 40);
+    QCOMPARE(iterations.load(), 40);
 }
 
 void tst_QtConcurrentIterateKernel::cancel()
@@ -155,7 +155,7 @@ void tst_QtConcurrentIterateKernel::cancel()
         f.cancel();
         f.waitForFinished();
         QVERIFY(f.isCanceled());
-        QVERIFY(int(iterations) <= QThread::idealThreadCount()); // the threads might run one iteration each before they are canceled.
+        QVERIFY(iterations.load() <= QThread::idealThreadCount()); // the threads might run one iteration each before they are canceled.
     }
 }
 
@@ -163,7 +163,7 @@ QAtomicInt counter;
 class CountFor : public IterateKernel<TestIterator, void>
 {
 public:
-    CountFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) {iterations = 0; }
+    CountFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) { iterations.store(0); }
     inline bool runIterations(TestIterator/*beginIterator*/, int begin, int end, void *)
     {
         counter.fetchAndAddRelaxed(end - begin);
@@ -180,10 +180,10 @@ void tst_QtConcurrentIterateKernel::stresstest()
     const int iterations = 1000;
     const int times = 50;
     for (int i = 0; i < times; ++i) {
-        counter = 0;
+        counter.store(0);
         CountFor f(0, iterations);
         f.startBlocking();
-        QCOMPARE((int)counter, iterations);
+        QCOMPARE(counter.load(), iterations);
     }
 }
 
@@ -202,7 +202,7 @@ public:
     // this class throttles between iterations 100 and 200,
     // and then records how many threads that run between
     // iterations 140 and 160.
-    ThrottleFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) {iterations = 0; throttling = false; }
+    ThrottleFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) { iterations.store(0); throttling = false; }
     inline bool runIterations(TestIterator/*beginIterator*/, int begin, int end, void *)
     {
         if (200 >= begin && 200 < end) {
@@ -241,14 +241,14 @@ public:
 void tst_QtConcurrentIterateKernel::throttling()
 {
     const int totalIterations = 400;
-    iterations = 0;
+    iterations.store(0);
 
     threads.clear();
 
     ThrottleFor f(0, totalIterations);
     f.startBlocking();
 
-    QCOMPARE((int)iterations, totalIterations);
+    QCOMPARE(iterations.load(), totalIterations);
 
 
     QCOMPARE(threads.count(), 1);
diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index c18dad93a3..1c60621763 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -2152,8 +2152,8 @@ public:
     void updatePeak()
     {
         forever {
-            const int localPeak = peakInstanceCount;
-            const int localCurrent = currentInstanceCount;
+            const int localPeak = peakInstanceCount.load();
+            const int localCurrent = currentInstanceCount.load();
             if (localCurrent <= localPeak)
                 break;
             if (peakInstanceCount.testAndSetOrdered(localPeak, localCurrent))
@@ -2191,35 +2191,35 @@ void tst_QtConcurrentMap::throttling()
     const int allowedTemporaries = QThread::idealThreadCount() * 40;
 
     {
-        currentInstanceCount = 0;
-        peakInstanceCount = 0;
+        currentInstanceCount.store(0);
+        peakInstanceCount.store(0);
 
         QList<InstanceCounter> instances;
         for (int i = 0; i < itemcount; ++i)
             instances.append(InstanceCounter());
 
-        QCOMPARE((int)currentInstanceCount, itemcount);
+        QCOMPARE(currentInstanceCount.load(), itemcount);
 
         int results = QtConcurrent::blockingMappedReduced(instances, slowMap, fastReduce);
         QCOMPARE(results, itemcount);
-        QCOMPARE(int(currentInstanceCount), itemcount);
-        QVERIFY(int(peakInstanceCount) < itemcount + allowedTemporaries);
+        QCOMPARE(currentInstanceCount.load(), itemcount);
+        QVERIFY(peakInstanceCount.load() < itemcount + allowedTemporaries);
     }
 
     {
-        QCOMPARE(int(currentInstanceCount), 0);
-        peakInstanceCount = 0;
+        QCOMPARE(currentInstanceCount.load(), 0);
+        peakInstanceCount.store(0);
 
         QList<InstanceCounter> instances;
         for (int i = 0; i < itemcount; ++i)
             instances.append(InstanceCounter());
 
-        QCOMPARE(int(currentInstanceCount), itemcount);
+        QCOMPARE(currentInstanceCount.load(), itemcount);
         int results = QtConcurrent::blockingMappedReduced(instances, fastMap, slowReduce);
 
         QCOMPARE(results, itemcount);
-        QCOMPARE((int)currentInstanceCount, itemcount);
-        QVERIFY(int(peakInstanceCount) < itemcount + allowedTemporaries);
+        QCOMPARE(currentInstanceCount.load(), itemcount);
+        QVERIFY(peakInstanceCount.load() < itemcount + allowedTemporaries);
     }
 }
 
@@ -2353,8 +2353,8 @@ InstanceCounter ic_fn(const InstanceCounter & ic)
 // assigned over with operator ==
 void tst_QtConcurrentMap::qFutureAssignmentLeak()
 {
-    currentInstanceCount = 0;
-    peakInstanceCount = 0;
+    currentInstanceCount.store(0);
+    peakInstanceCount.store(0);
     QFuture<InstanceCounter> future;
     {
         QList<InstanceCounter> list;
@@ -2370,9 +2370,9 @@ void tst_QtConcurrentMap::qFutureAssignmentLeak()
         future.waitForFinished();
     }
 
-    QCOMPARE(int(currentInstanceCount), 1000);
+    QCOMPARE(currentInstanceCount.load(), 1000);
     future = QFuture<InstanceCounter>();
-    QCOMPARE(int(currentInstanceCount), 0);
+    QCOMPARE(currentInstanceCount.load(), 0);
 }
 
 inline void increment(int &num)
diff --git a/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index 851b1e0c5b..7b1a0ca056 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -322,17 +322,17 @@ void tst_QtConcurrentRun::recursive()
     int levels = 15;
 
     for (int i = 0; i < QThread::idealThreadCount(); ++i) {
-        count = 0;
+        count.store(0);
         QThreadPool::globalInstance()->setMaxThreadCount(i);
         recursiveRun(levels);
-        QCOMPARE((int)count, (int)pow(2.0, levels) - 1);
+        QCOMPARE(count.load(), (int)pow(2.0, levels) - 1);
     }
 
     for (int i = 0; i < QThread::idealThreadCount(); ++i) {
-        count = 0;
+        count.store(0);
         QThreadPool::globalInstance()->setMaxThreadCount(i);
         recursiveResult(levels);
-        QCOMPARE((int)count, (int)pow(2.0, levels) - 1);
+        QCOMPARE(count.load(), (int)pow(2.0, levels) - 1);
     }
 }
 
diff --git a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
index 4beefef98d..e020190ae3 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
+++ b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
@@ -200,7 +200,7 @@ class ThrottleAlwaysUser : public ThreadEngine<void>
 public:
     ThrottleAlwaysUser()
     {
-        count = initialCount = 100;
+        count.store(initialCount = 100);
         finishing = false;
     }
 
@@ -212,7 +212,7 @@ public:
     ThreadFunctionResult threadFunction()
     {
         forever {
-            const int local = count;
+            const int local = count.load();
             if (local == 0) {
                 finishing = true;
                 return ThreadFinished;
@@ -237,13 +237,13 @@ void tst_QtConcurrentThreadEngine::throttle()
     for (int i = 0; i < repeats; ++i) {
         QFuture<void> f = (new ThrottleAlwaysUser())->startAsynchronously();
         f.waitForFinished();
-        QCOMPARE(int(count), 0);
+        QCOMPARE(count.load(), 0);
     }
 
     for (int i = 0; i < repeats; ++i) {
         ThrottleAlwaysUser t;
         t.startBlocking();
-        QCOMPARE(int(count), 0);
+        QCOMPARE(count.load(), 0);
     }
 }
 
diff --git a/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp
index 8326814f9d..ff26d5d2c3 100644
--- a/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp
@@ -620,14 +620,14 @@ class CountingRunnable : public QRunnable
 void tst_QThreadPool::start()
 {
     const int runs = 1000;
-    count = 0;
+    count.store(0);
     {
         QThreadPool threadPool;
         for (int i = 0; i< runs; ++i) {
             threadPool.start(new CountingRunnable());
         }
     }
-    QCOMPARE(int(count), runs);
+    QCOMPARE(count.load(), runs);
 }
 
 void tst_QThreadPool::tryStart()
@@ -646,7 +646,7 @@ void tst_QThreadPool::tryStart()
         }
     };
 
-    count = 0;
+    count.store(0);
 
     WaitingTask task;
     QThreadPool threadPool;
@@ -656,7 +656,7 @@ void tst_QThreadPool::tryStart()
     QVERIFY(!threadPool.tryStart(&task));
     task.semaphore.release(threadPool.maxThreadCount());
     threadPool.waitForDone();
-    QCOMPARE(int(count), threadPool.maxThreadCount());
+    QCOMPARE(count.load(), threadPool.maxThreadCount());
 }
 
 QMutex mutex;
@@ -736,16 +736,16 @@ void tst_QThreadPool::waitForDone()
     QThreadPool threadPool;
     while (total.elapsed() < 10000) {
         int runs;
-        runs = count = 0;
+        count.store(runs = 0);
         pass.restart();
         while (pass.elapsed() < 100) {
             threadPool.start(new CountingRunnable());
             ++runs;
         }
         threadPool.waitForDone();
-        QCOMPARE(int(count), runs);
+        QCOMPARE(count.load(), runs);
 
-        runs = count = 0;
+        count.store(runs = 0);
         pass.restart();
         while (pass.elapsed() < 100) {
             threadPool.start(new CountingRunnable());
@@ -753,7 +753,7 @@ void tst_QThreadPool::waitForDone()
             runs += 2;
         }
         threadPool.waitForDone();
-        QCOMPARE(int(count), runs);
+        QCOMPARE(count.load(), runs);
     }
 }
 
@@ -790,7 +790,7 @@ void tst_QThreadPool::destroyingWaitsForTasksToFinish()
 
     while (total.elapsed() < 10000) {
         int runs;
-        runs = count = 0;
+        count.store(runs = 0);
         {
             QThreadPool threadPool;
             pass.restart();
@@ -799,9 +799,9 @@ void tst_QThreadPool::destroyingWaitsForTasksToFinish()
                 ++runs;
             }
         }
-        QCOMPARE(int(count), runs);
+        QCOMPARE(count.load(), runs);
 
-        runs = count = 0;
+        count.store(runs = 0);
         {
             QThreadPool threadPool;
             pass.restart();
@@ -811,7 +811,7 @@ void tst_QThreadPool::destroyingWaitsForTasksToFinish()
                 runs += 2;
             }
         }
-        QCOMPARE(int(count), runs);
+        QCOMPARE(count.load(), runs);
     }
 }