Make all uses of QBasicAtomicInt and Pointer use load() and store()

Most of these changes are search-and-replace of d->ref ==, d->ref !=
and d->ref =.

The QBasicAtomicPointer in QObjectPrivate::Connection didn't need to
be basic, so I made it QAtomicPointer.

Change-Id: Ie3271abd1728af599f9ab17c6f4868e475f17bb6
Reviewed-on: http://codereview.qt-project.org/5030
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/src/corelib/tools/qrefcount.h b/src/corelib/tools/qrefcount.h
index e72ddf66b6..619f61e072 100644
--- a/src/corelib/tools/qrefcount.h
+++ b/src/corelib/tools/qrefcount.h
@@ -56,27 +56,29 @@ namespace QtPrivate
 class RefCount
 {
 public:
-   inline void ref() {
-        if (atomic > 0)
+    inline void ref() {
+        if (atomic.load() > 0)
             atomic.ref();
     }
 
     inline bool deref() {
-        if (atomic <= 0)
+        if (atomic.load() <= 0)
             return true;
         return atomic.deref();
     }
 
     inline bool operator==(int value) const
-    { return atomic.operator ==(value); }
+    { return atomic.load() == value; }
     inline bool operator!=(int value) const
-    { return atomic.operator !=(value); }
+    { return atomic.load() != value; }
     inline bool operator!() const
-    { return atomic.operator !(); }
+    { return !atomic.load(); }
     inline operator int() const
-    { return atomic.operator int(); }
+    { return atomic.load(); }
     inline RefCount &operator=(int value)
-    { atomic = value; return *this; }
+    { atomic.store(value); return *this; }
+    inline RefCount &operator=(const RefCount &other)
+    { atomic.store(other.atomic.load()); return *this; }
 
     QBasicAtomicInt atomic;
 };