From 1603ba23656c8c31dc05fe9b3f1e12b22e29989a Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 23 Jun 2012 21:48:53 +0200 Subject: Provide public API for native event filtering, moved up from QPA. The previous API was hard to use (global function, no type safety, manual chaining), and confusing (app vs dispatcher split only made sense on Windows). Installing and removing out of order would have the risk of setting back a dangling pointer (crash). Meanwhile QPA added type safety, and this new API models the QObject::installEventFilter API for ease of use. The virtual method is in a new interface, QAbstractNativeEventFilter. QPA was even calling the dispatcher event filter with QPA-private event classes, which made no sense (refactoring leftover from when the code was in the dispatcher). Now the QPA plugins trigger the qcoreapp event filters with the actual native events directly. Change-Id: Ie35e47c59c862383bcaf857b28d54f7c72547882 Reviewed-by: Marius Storm-Olsen --- src/corelib/kernel/qabstracteventdispatcher.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/corelib/kernel/qabstracteventdispatcher.h') diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index e70530b283..73c1ad7afd 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE - +class QAbstractNativeEventFilter; class QAbstractEventDispatcherPrivate; class QSocketNotifier; @@ -111,9 +111,12 @@ public: virtual void startingUp(); virtual void closingDown(); - typedef bool(*EventFilter)(void *message); - EventFilter setEventFilter(EventFilter filter); - bool filterEvent(void *message); + void installNativeEventFilter(QAbstractNativeEventFilter *filterObj); + void removeNativeEventFilter(QAbstractNativeEventFilter *filterObj); + bool filterNativeEvent(const QByteArray &eventType, void *message, long *result); +#if QT_DEPRECATED_SINCE(5, 0) + QT_DEPRECATED bool filterEvent(void *message) { return filterNativeEvent("", message, 0); } +#endif Q_SIGNALS: void aboutToBlock(); -- cgit v1.2.3