1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
index ab1dd677e9..dfb4953c9d 100644
--- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
@@ -76,7 +76,7 @@ void tst_QThreadStorage::hasLocalData()
     QVERIFY(!pointers.hasLocalData());
     pointers.setLocalData(new Pointer);
     QVERIFY(pointers.hasLocalData());
-    pointers.setLocalData(0);
+    pointers.setLocalData(nullptr);
     QVERIFY(!pointers.hasLocalData());
 }
 
@@ -88,8 +88,8 @@ void tst_QThreadStorage::localData()
     pointers.setLocalData(p);
     QVERIFY(pointers.hasLocalData());
     QCOMPARE(pointers.localData(), p);
-    pointers.setLocalData(0);
-    QCOMPARE(pointers.localData(), (Pointer *)0);
+    pointers.setLocalData(nullptr);
+    QCOMPARE(pointers.localData(), nullptr);
     QVERIFY(!pointers.hasLocalData());
 }
 
@@ -102,8 +102,8 @@ void tst_QThreadStorage::localData_const()
     pointers.setLocalData(p);
     QVERIFY(pointers.hasLocalData());
     QCOMPARE(const_pointers.localData(), p);
-    pointers.setLocalData(0);
-    QCOMPARE(const_pointers.localData(), (Pointer *)0);
+    pointers.setLocalData(nullptr);
+    QCOMPARE(const_pointers.localData(), nullptr);
     QVERIFY(!pointers.hasLocalData());
 }
 
@@ -113,7 +113,7 @@ void tst_QThreadStorage::setLocalData()
     QVERIFY(!pointers.hasLocalData());
     pointers.setLocalData(new Pointer);
     QVERIFY(pointers.hasLocalData());
-    pointers.setLocalData(0);
+    pointers.setLocalData(nullptr);
     QVERIFY(!pointers.hasLocalData());
 }
 
@@ -157,7 +157,7 @@ void tst_QThreadStorage::autoDelete()
     QCOMPARE(Pointer::count, c);
 }
 
-bool threadStorageOk;
+static bool threadStorageOk;
 void testAdoptedThreadStorageWin(void *p)
 {
     QThreadStorage<Pointer *>  *pointers = reinterpret_cast<QThreadStorage<Pointer *> *>(p);
@@ -183,7 +183,7 @@ void testAdoptedThreadStorageWin(void *p)
 void *testAdoptedThreadStorageUnix(void *pointers)
 {
     testAdoptedThreadStorageWin(pointers);
-    return 0;
+    return nullptr;
 }
 void tst_QThreadStorage::adoptedThreads()
 {
@@ -194,9 +194,9 @@ void tst_QThreadStorage::adoptedThreads()
     {
 #ifdef Q_OS_UNIX
         pthread_t thread;
-        const int state = pthread_create(&thread, 0, testAdoptedThreadStorageUnix, &pointers);
+        const int state = pthread_create(&thread, nullptr, testAdoptedThreadStorageUnix, &pointers);
         QCOMPARE(state, 0);
-        pthread_join(thread, 0);
+        pthread_join(thread, nullptr);
 #elif defined Q_OS_WIN
         HANDLE thread;
         thread = (HANDLE)_beginthread(testAdoptedThreadStorageWin, 0, &pointers);
@@ -212,7 +212,7 @@ void tst_QThreadStorage::adoptedThreads()
     QTRY_COMPARE(Pointer::count, c);
 }
 
-QBasicAtomicInt cleanupOrder = Q_BASIC_ATOMIC_INITIALIZER(0);
+static QBasicAtomicInt cleanupOrder = Q_BASIC_ATOMIC_INITIALIZER(0);
 
 class First
 {