From e277575987657aa07444eea9bee99769f039d3b0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 31 Oct 2011 10:36:57 +0100 Subject: Fix most warnings about assignments of QAtomicInt. Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7 Reviewed-by: Bradley T. Hughes --- src/gui/kernel/qcursor_qpa.cpp | 3 +-- src/gui/kernel/qevent_p.h | 2 +- src/gui/kernel/qkeysequence_p.h | 6 ++---- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/gui/kernel') diff --git a/src/gui/kernel/qcursor_qpa.cpp b/src/gui/kernel/qcursor_qpa.cpp index 40a15317ee..7b3059e1df 100644 --- a/src/gui/kernel/qcursor_qpa.cpp +++ b/src/gui/kernel/qcursor_qpa.cpp @@ -58,9 +58,8 @@ static int nextCursorId = Qt::BitmapCursor; *****************************************************************************/ QCursorData::QCursorData(Qt::CursorShape s) - : cshape(s), bm(0), bmm(0), hx(0), hy(0), id(s) + : ref(1), cshape(s), bm(0), bmm(0), hx(0), hy(0), id(s) { - ref = 1; } QCursorData::~QCursorData() diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h index 1d65eb63be..fa6b675c86 100644 --- a/src/gui/kernel/qevent_p.h +++ b/src/gui/kernel/qevent_p.h @@ -91,7 +91,7 @@ public: inline QTouchEventTouchPointPrivate *detach() { QTouchEventTouchPointPrivate *d = new QTouchEventTouchPointPrivate(*this); - d->ref = 1; + d->ref.store(1); if (!this->ref.deref()) delete this; return d; diff --git a/src/gui/kernel/qkeysequence_p.h b/src/gui/kernel/qkeysequence_p.h index eb8527a952..7fa98dd5eb 100644 --- a/src/gui/kernel/qkeysequence_p.h +++ b/src/gui/kernel/qkeysequence_p.h @@ -69,14 +69,12 @@ struct Q_AUTOTEST_EXPORT QKeyBinding class Q_AUTOTEST_EXPORT QKeySequencePrivate { public: - inline QKeySequencePrivate() + inline QKeySequencePrivate() : ref(1) { - ref = 1; key[0] = key[1] = key[2] = key[3] = 0; } - inline QKeySequencePrivate(const QKeySequencePrivate ©) + inline QKeySequencePrivate(const QKeySequencePrivate ©) : ref(1) { - ref = 1; key[0] = copy.key[0]; key[1] = copy.key[1]; key[2] = copy.key[2]; -- cgit v1.2.3