From 58d10c0bd7cff2009edf6183c660b2e149eb9a82 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Thu, 23 Jun 2011 09:05:34 +0200 Subject: Refactor window system event dispatching. Add QWindowSystemInterface::sendWindowSystemEvents, which contains the canonical "empty and send queued window system events" implementation. Make the Cocoa, QPA, and GLIB dispatchers use the new implementation. Cocoa now no longer inherits from QPA. --- src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm') diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm index b5cbc83029..cfb6995f57 100644 --- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm +++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm @@ -910,7 +910,7 @@ QCocoaEventDispatcherPrivate::QCocoaEventDispatcherPrivate() } QCocoaEventDispatcher::QCocoaEventDispatcher(QObject *parent) - : QEventDispatcherQPA(*new QCocoaEventDispatcherPrivate, parent) + : QEventDispatcherUNIX(*new QCocoaEventDispatcherPrivate, parent) { Q_D(QCocoaEventDispatcher); CFRunLoopSourceContext context; @@ -992,9 +992,7 @@ void processPostedEvents(QCocoaEventDispatcherPrivate *const d, const bool block if (!d->threadData->canWait || (d->serialNumber != d->lastSerial)) { d->lastSerial = d->serialNumber; - // Call down to the base class event handler, which will send - // the window system events. - d->q_func()->QEventDispatcherQPA::processEvents(QEventLoop::AllEvents); + QWindowSystemInterface::sendWindowSystemEvents(d->q_func(), QEventLoop::AllEvents); } } -- cgit v1.2.3