diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-31 10:36:57 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 11:29:08 +0100 |
commit | e277575987657aa07444eea9bee99769f039d3b0 (patch) | |
tree | 549c419596e340c8ad123df44fc75662ed47b2a7 /src/corelib/kernel | |
parent | 5761d8546f3ff3802cae85ed5224c2bdd9524452 (diff) |
Fix most warnings about assignments of QAtomicInt.
Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_glib.cpp | 6 | ||||
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
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; |