diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-31 10:36:57 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 11:29:08 +0100 |
| commit | e277575987657aa07444eea9bee99769f039d3b0 (patch) | |
| tree | 549c419596e340c8ad123df44fc75662ed47b2a7 /src/dbus/qdbusunixfiledescriptor.cpp | |
| parent | 5761d8546f3ff3802cae85ed5224c2bdd9524452 (diff) | |
Fix most warnings about assignments of QAtomicInt.
Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/dbus/qdbusunixfiledescriptor.cpp')
| -rw-r--r-- | src/dbus/qdbusunixfiledescriptor.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp index 86d2b3c92e..0ee29fc20f 100644 --- a/src/dbus/qdbusunixfiledescriptor.cpp +++ b/src/dbus/qdbusunixfiledescriptor.cpp @@ -194,7 +194,7 @@ QDBusUnixFileDescriptor::~QDBusUnixFileDescriptor() */ bool QDBusUnixFileDescriptor::isValid() const { - return d ? d->fd != -1 : false; + return d ? d->fd.load() != -1 : false; } /*! @@ -212,7 +212,7 @@ bool QDBusUnixFileDescriptor::isValid() const */ int QDBusUnixFileDescriptor::fileDescriptor() const { - return d ? d->fd.operator int() : -1; + return d ? d->fd.load() : -1; } // actual implementation @@ -269,11 +269,12 @@ void QDBusUnixFileDescriptor::giveFileDescriptor(int fileDescriptor) else d = new QDBusUnixFileDescriptorPrivate; - if (d->fd != -1) - qt_safe_close(d->fd); + const int fdl = d->fd.load(); + if (fdl != -1) + qt_safe_close(fdl); if (fileDescriptor != -1) - d->fd = fileDescriptor; + d->fd.store(fileDescriptor); } /*! @@ -294,8 +295,9 @@ int QDBusUnixFileDescriptor::takeFileDescriptor() QDBusUnixFileDescriptorPrivate::~QDBusUnixFileDescriptorPrivate() { - if (fd != -1) - qt_safe_close(fd); + const int fdl = fd.load(); + if (fdl != -1) + qt_safe_close(fdl); } #else |