From e277575987657aa07444eea9bee99769f039d3b0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
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 <bradley.hughes@nokia.com>
---
 src/corelib/concurrent/qfuturewatcher.cpp    |  4 ++--
 src/corelib/io/qurl.cpp                      | 21 +++++++--------------
 src/corelib/kernel/qeventdispatcher_glib.cpp |  6 +++---
 src/corelib/kernel/qobject.cpp               |  2 +-
 4 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'src/corelib')

diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp
index c9a16a8bbf..e405896f0b 100644
--- a/src/corelib/concurrent/qfuturewatcher.cpp
+++ b/src/corelib/concurrent/qfuturewatcher.cpp
@@ -400,7 +400,7 @@ void QFutureWatcherBase::disconnectOutputInterface(bool pendingAssignment)
 {
     if (pendingAssignment) {
         Q_D(QFutureWatcherBase);
-        d->pendingResultsReady = 0;
+        d->pendingResultsReady.store(0);
         qDeleteAll(d->pendingCallOutEvents);
         d->pendingCallOutEvents.clear();
         d->finished = false;
@@ -439,7 +439,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
             emit q->finished();
         break;
         case QFutureCallOutEvent::Canceled:
-            pendingResultsReady = 0;
+            pendingResultsReady.store(0);
             emit q->canceled();
         break;
         case QFutureCallOutEvent::Paused:
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index b960528fb8..c921a89b30 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -3407,23 +3407,15 @@ static QString qt_ACE_do(const QString &domain, AceOperation op)
     return result;
 }
 
-
-QUrlPrivate::QUrlPrivate()
+QUrlPrivate::QUrlPrivate() : ref(1), port(-1), parsingMode(QUrl::TolerantMode),
+    hasQuery(false), hasFragment(false), isValid(false), isHostValid(true),
+    valueDelimiter('='), pairDelimiter('&'),
+    stateFlags(0)
 {
-    ref = 1;
-    port = -1;
-    isValid = false;
-    isHostValid = true;
-    parsingMode = QUrl::TolerantMode;
-    valueDelimiter = '=';
-    pairDelimiter = '&';
-    stateFlags = 0;
-    hasFragment = false;
-    hasQuery = false;
 }
 
 QUrlPrivate::QUrlPrivate(const QUrlPrivate &copy)
-    : scheme(copy.scheme),
+    : ref(1), scheme(copy.scheme),
       userName(copy.userName),
       password(copy.password),
       host(copy.host),
@@ -3445,7 +3437,8 @@ QUrlPrivate::QUrlPrivate(const QUrlPrivate &copy)
       pairDelimiter(copy.pairDelimiter),
       stateFlags(copy.stateFlags),
       encodedNormalized(copy.encodedNormalized)
-{ ref = 1; }
+{
+}
 
 QString QUrlPrivate::canonicalHost() const
 {
diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
index 176048d322..0773915391 100644
--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
@@ -264,7 +264,7 @@ static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
 
     GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
     return (!data->canWait
-            || (source->serialNumber != source->lastSerialNumber));
+            || (source->serialNumber.load() != source->lastSerialNumber));
 }
 
 static gboolean postEventSourceCheck(GSource *source)
@@ -275,7 +275,7 @@ static gboolean postEventSourceCheck(GSource *source)
 static gboolean postEventSourceDispatch(GSource *s, GSourceFunc, gpointer)
 {
     GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
-    source->lastSerialNumber = source->serialNumber;
+    source->lastSerialNumber = source->serialNumber.load();
     QCoreApplication::sendPostedEvents();
     source->d->runTimersOnceWithNormalPriority();
     return true; // i dunno, george...
@@ -320,7 +320,7 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
     // setup post event source
     postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
                                                                         sizeof(GPostEventSource)));
-    postEventSource->serialNumber = 1;
+    postEventSource->serialNumber.store(1);
     postEventSource->d = this;
     g_source_set_can_recurse(&postEventSource->source, true);
     g_source_attach(&postEventSource->source, mainContext);
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 555bfa674d..6bca22b6df 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -3011,7 +3011,7 @@ bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index,
     c->method_relative = method_index;
     c->method_offset = method_offset;
     c->connectionType = type;
-    c->argumentTypes = types;
+    c->argumentTypes.store(types);
     c->nextConnectionList = 0;
     c->callFunction = callFunction;
 
-- 
cgit v1.2.3