diff options
| author | Thiago Macieira <thiago@kde.org> | 2011-07-05 23:46:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 07:57:41 +0200 |
| commit | 5bfeab8749ce6820d55135b81665a7231d3b1504 (patch) | |
| tree | 152569571114c53d4cdfaa0013307267cb3379a6 /src/gui/painting/qregion.cpp | |
| parent | 5613c9722adee921e16682c0a035f2a7567bd346 (diff) | |
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>
Diffstat (limited to 'src/gui/painting/qregion.cpp')
| -rw-r--r-- | src/gui/painting/qregion.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index f343fa9b4c..3f8e80c13d 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -261,7 +261,7 @@ QRegion::QRegion(int x, int y, int w, int h, RegionType t) void QRegion::detach() { - if (d->ref != 1) + if (d->ref.load() != 1) *this = copy(); #if defined(Q_WS_X11) else if (d->xrectangles) { @@ -3828,7 +3828,7 @@ QRegion::QRegion(const QRect &r, RegionType t) d->ref.ref(); } else { d = new QRegionData; - d->ref = 1; + d->ref.store(1); #if defined(Q_WS_X11) d->rgn = 0; d->xrectangles = 0; @@ -3853,7 +3853,7 @@ QRegion::QRegion(const QPolygon &a, Qt::FillRule fillRule) fillRule == Qt::WindingFill ? WindingRule : EvenOddRule); if (qt_rgn) { d = new QRegionData; - d->ref = 1; + d->ref.store(1); #if defined(Q_WS_X11) d->rgn = 0; d->xrectangles = 0; @@ -3885,7 +3885,7 @@ QRegion::QRegion(const QBitmap &bm) d->ref.ref(); } else { d = new QRegionData; - d->ref = 1; + d->ref.store(1); #if defined(Q_WS_X11) d->rgn = 0; d->xrectangles = 0; @@ -3935,7 +3935,7 @@ QRegion QRegion::copy() const { QRegion r; QScopedPointer<QRegionData> x(new QRegionData); - x->ref = 1; + x->ref.store(1); #if defined(Q_WS_X11) x->rgn = 0; x->xrectangles = 0; |