diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-09-29 11:50:08 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 18:57:38 +0200 |
commit | 6476ac738ca029af95932f53b53f0705808eb80e (patch) | |
tree | d1884397040eb65d23a48a0e1a56dad3f476cf34 /src/network | |
parent | 434824aede28e8c36d6991aa218f89daf2cc22fa (diff) |
Replace implicit QAtomic* casts with explicit load()/store()
Change-Id: Ia7ef1a8e01001f203e409c710c977d6f4686342e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/bearer/qbearerengine.cpp | 6 | ||||
-rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/network/bearer/qbearerengine.cpp b/src/network/bearer/qbearerengine.cpp index 4dc2145511..b761eb2e9b 100644 --- a/src/network/bearer/qbearerengine.cpp +++ b/src/network/bearer/qbearerengine.cpp @@ -96,19 +96,19 @@ bool QBearerEngine::configurationsInUse() const for (it = accessPointConfigurations.constBegin(), end = accessPointConfigurations.constEnd(); it != end; ++it) { - if (it.value()->ref > 1) + if (it.value()->ref.load() > 1) return true; } for (it = snapConfigurations.constBegin(), end = snapConfigurations.constEnd(); it != end; ++it) { - if (it.value()->ref > 1) + if (it.value()->ref.load() > 1) return true; } for (it = userChoiceConfigurations.constBegin(), end = userChoiceConfigurations.constEnd(); it != end; ++it) { - if (it.value()->ref > 1) + if (it.value()->ref.load() > 1) return true; } diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 1062663b23..6beb52c5b0 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -411,7 +411,7 @@ public: template<> void QSharedDataPointer<QNetworkProxyPrivate>::detach() { - if (d && d->ref == 1) + if (d && d->ref.load() == 1) return; QNetworkProxyPrivate *x = (d ? new QNetworkProxyPrivate(*d) : new QNetworkProxyPrivate); @@ -727,7 +727,7 @@ public: template<> void QSharedDataPointer<QNetworkProxyQueryPrivate>::detach() { - if (d && d->ref == 1) + if (d && d->ref.load() == 1) return; QNetworkProxyQueryPrivate *x = (d ? new QNetworkProxyQueryPrivate(*d) : new QNetworkProxyQueryPrivate); |