From bcb5e564ff302517156d881e57577f77bdc30f6e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 23 Jul 2012 16:56:11 +0200 Subject: WindowSystemInterface::sendWindowSystemEvents(): Remove unused parameter. No need to pass the dispatcher. Get rid of Windows logic to maintain a stack of dispatcher associated with flags. Change-Id: Ic2daad4b6762a46fac3274937effc188af436c9a Reviewed-by: David Faure --- src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp | 5 ++--- src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp b/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp index 14bf5f4f3f..e2afd67a07 100644 --- a/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp +++ b/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp @@ -71,10 +71,9 @@ static gboolean userEventSourceCheck(GSource *source) return userEventSourcePrepare(source, 0); } -static gboolean userEventSourceDispatch(GSource *s, GSourceFunc, gpointer) +static gboolean userEventSourceDispatch(GSource *, GSourceFunc, gpointer) { - GUserEventSource * source = reinterpret_cast(s); - QWindowSystemInterface::sendWindowSystemEvents(source->q, QEventLoop::AllEvents); + QWindowSystemInterface::sendWindowSystemEvents(QEventLoop::AllEvents); return true; } diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp index 8939a63268..4b22dff749 100644 --- a/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp +++ b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp @@ -67,7 +67,7 @@ QUnixEventDispatcherQPA::~QUnixEventDispatcherQPA() bool QUnixEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags) { - bool didSendEvents = QWindowSystemInterface::sendWindowSystemEvents(this, flags); + const bool didSendEvents = QWindowSystemInterface::sendWindowSystemEvents(flags); if (QEventDispatcherUNIX::processEvents(flags)) { return true; -- cgit v1.2.3