summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.cpp
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-09-29 11:50:08 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-27 18:57:38 +0200
commit6476ac738ca029af95932f53b53f0705808eb80e (patch)
treed1884397040eb65d23a48a0e1a56dad3f476cf34 /src/gui/image/qpixmap.cpp
parent434824aede28e8c36d6991aa218f89daf2cc22fa (diff)
Replace implicit QAtomic* casts with explicit load()/store()
Change-Id: Ia7ef1a8e01001f203e409c710c977d6f4686342e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
-rw-r--r--src/gui/image/qpixmap.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index c025aa9283..2a2bd5d6fa 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -272,7 +272,7 @@ QPixmap::QPixmap(const char * const xpm[])
QPixmap::~QPixmap()
{
- Q_ASSERT(!data || data->ref >= 1); // Catch if ref-counting changes again
+ Q_ASSERT(!data || data->ref.load() >= 1); // Catch if ref-counting changes again
}
/*!
@@ -871,7 +871,7 @@ void QPixmap::fill(const QColor &color)
return;
}
- if (data->ref == 1) {
+ if (data->ref.load() == 1) {
// detach() will also remove this pixmap from caches, so
// it has to be called even when ref == 1.
detach();
@@ -1000,7 +1000,7 @@ QDataStream &operator>>(QDataStream &stream, QPixmap &pixmap)
bool QPixmap::isDetached() const
{
- return data && data->ref == 1;
+ return data && data->ref.load() == 1;
}
/*! \internal
@@ -1529,10 +1529,10 @@ void QPixmap::detach()
rasterData->image.detach();
}
- if (data->is_cached && data->ref == 1)
+ if (data->is_cached && data->ref.load() == 1)
QImagePixmapCleanupHooks::executePlatformPixmapModificationHooks(data.data());
- if (data->ref != 1) {
+ if (data->ref.load() != 1) {
*this = copy();
}
++data->detach_no;