1 files changed, 12 insertions, 12 deletions

diff --git a/src/gui/text/qrawfont_p.h b/src/gui/text/qrawfont_p.h
index 0fc8739bfb..03259a94ed 100644
--- a/src/gui/text/qrawfont_p.h
+++ b/src/gui/text/qrawfont_p.h
@@ -67,9 +67,9 @@ class Q_GUI_EXPORT QRawFontPrivate
 {
 public:
     QRawFontPrivate()
-        : fontEngine(0)
+        : fontEngine(nullptr)
         , hintingPreference(QFont::PreferDefaultHinting)
-        , thread(0)
+        , thread(nullptr)
     {}
 
     QRawFontPrivate(const QRawFontPrivate &other)
@@ -78,53 +78,53 @@ public:
         , thread(other.thread)
     {
 #ifndef QT_NO_DEBUG
-        Q_ASSERT(fontEngine == 0 || thread == QThread::currentThread());
+        Q_ASSERT(fontEngine == nullptr || thread == QThread::currentThread());
 #endif
-        if (fontEngine != 0)
+        if (fontEngine != nullptr)
             fontEngine->ref.ref();
     }
 
     ~QRawFontPrivate()
     {
 #ifndef QT_NO_DEBUG
-        Q_ASSERT(ref.load() == 0);
+        Q_ASSERT(ref.loadRelaxed() == 0);
 #endif
         cleanUp();
     }
 
     inline void cleanUp()
     {
-        setFontEngine(0);
+        setFontEngine(nullptr);
         hintingPreference = QFont::PreferDefaultHinting;
     }
 
     inline bool isValid() const
     {
 #ifndef QT_NO_DEBUG
-        Q_ASSERT(fontEngine == 0 || thread == QThread::currentThread());
+        Q_ASSERT(fontEngine == nullptr || thread == QThread::currentThread());
 #endif
-        return fontEngine != 0;
+        return fontEngine != nullptr;
     }
 
     inline void setFontEngine(QFontEngine *engine)
     {
 #ifndef QT_NO_DEBUG
-        Q_ASSERT(fontEngine == 0 || thread == QThread::currentThread());
+        Q_ASSERT(fontEngine == nullptr || thread == QThread::currentThread());
 #endif
         if (fontEngine == engine)
             return;
 
-        if (fontEngine != 0) {
+        if (fontEngine != nullptr) {
             if (!fontEngine->ref.deref())
                 delete fontEngine;
 #ifndef QT_NO_DEBUG
-            thread = 0;
+            thread = nullptr;
 #endif
         }
 
         fontEngine = engine;
 
-        if (fontEngine != 0) {
+        if (fontEngine != nullptr) {
             fontEngine->ref.ref();
 #ifndef QT_NO_DEBUG
             thread = QThread::currentThread();