summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-10-31 10:36:57 +0100
committerQt by Nokia <qt-info@nokia.com>2011-10-31 11:29:08 +0100
commite277575987657aa07444eea9bee99769f039d3b0 (patch)
tree549c419596e340c8ad123df44fc75662ed47b2a7 /src/gui/kernel
parent5761d8546f3ff3802cae85ed5224c2bdd9524452 (diff)
Fix most warnings about assignments of QAtomicInt.
Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qcursor_qpa.cpp3
-rw-r--r--src/gui/kernel/qevent_p.h2
-rw-r--r--src/gui/kernel/qkeysequence_p.h6
3 files changed, 4 insertions, 7 deletions
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 &copy)
+ inline QKeySequencePrivate(const QKeySequencePrivate &copy) : ref(1)
{
- ref = 1;
key[0] = copy.key[0];
key[1] = copy.key[1];
key[2] = copy.key[2];