diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-10-10 16:27:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-10 21:21:50 +0200 |
| commit | c9df7928182b95428639e79cec19629f739b1213 (patch) | |
| tree | 067431f6bf494f7e3088d00206a43da64a8729b2 /src/declarative/util | |
| parent | 70d98314ce9ea60c77af83e2cf7de069e87a2e56 (diff) | |
Use QBasicAtomicInt load() and store() instead of implicit casting
The implicit casts will be unavailable in the near future.
This is a follow up to commit 7f8472af8c03296be9e9ce50d8e9b3089eedf2f1,
which didn't catch all usages of the implicit cast and assignment
operator.
Change-Id: If05c343e2851b41e4a351c56328c4406c688fa0d
Reviewed-on: http://codereview.qt-project.org/6351
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativexmllistmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 82b7e7d368..2dd7b5710a 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -253,12 +253,12 @@ int QDeclarativeXmlQueryEngine::doQuery(QString query, QString namespaces, QByte { QMutexLocker m1(&m_mutex); m_queryIds.ref(); - if (m_queryIds <= 0) - m_queryIds = 1; + if (m_queryIds.load() <= 0) + m_queryIds.store(1); } XmlQueryJob job; - job.queryId = m_queryIds; + job.queryId = m_queryIds.load(); job.data = data; job.query = QLatin1String("doc($src)") + query; job.namespaces = namespaces; |