diff options
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qplatformnativeinterface.cpp | 47 | ||||
-rw-r--r-- | src/gui/kernel/qplatformnativeinterface.h | 3 | ||||
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 6 |
3 files changed, 0 insertions, 56 deletions
diff --git a/src/gui/kernel/qplatformnativeinterface.cpp b/src/gui/kernel/qplatformnativeinterface.cpp index f0bd3f0658..e35948fd0c 100644 --- a/src/gui/kernel/qplatformnativeinterface.cpp +++ b/src/gui/kernel/qplatformnativeinterface.cpp @@ -146,51 +146,4 @@ void QPlatformNativeInterface::setWindowProperty(QPlatformWindow *window, const Q_UNUSED(value); } -/*! - \typedef QPlatformNativeInterface::EventFilter - \since 5.0 - - A function with the following signature that can be used as an - event filter: - - \code - bool myEventFilter(void *message, long *result); - \endcode - - \sa setEventFilter() -*/ - -/*! - \fn EventFilter QPlatformNativeInterface::setEventFilter(const QByteArray &eventType, EventFilter filter) - \since 5.0 - - Replaces the event filter function for the native interface with - \a filter and returns the pointer to the replaced event filter - function. Only the current event filter function is called. If you - want to use both filter functions, save the replaced EventFilter - in a place where you can call it from. - - The event filter function set here is called for all messages - received from the platform if they are given type \eventType. - It is \e not called for messages that are not meant for Qt objects. - - The type of event is specific to the platform plugin chosen at run-time. - - The event filter function should return \c true if the message should - be filtered, (i.e. stopped). It should return \c false to allow - processing the message to continue. - - By default, no event filter function is set. For example, this function - returns a null EventFilter the first time it is called. - - \note The filter function here receives native messages, - for example, MSG or XEvent structs. It is called by the platform plugin. -*/ -QPlatformNativeInterface::EventFilter QPlatformNativeInterface::setEventFilter(const QByteArray &eventType, QPlatformNativeInterface::EventFilter filter) -{ - Q_UNUSED(eventType); - Q_UNUSED(filter); - return 0; -} - QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformnativeinterface.h b/src/gui/kernel/qplatformnativeinterface.h index 37339f4860..16a9db0f73 100644 --- a/src/gui/kernel/qplatformnativeinterface.h +++ b/src/gui/kernel/qplatformnativeinterface.h @@ -88,9 +88,6 @@ public: virtual QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const; virtual void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value); - typedef bool (*EventFilter)(void *message, long *result); - virtual EventFilter setEventFilter(const QByteArray &eventType, EventFilter filter); - Q_SIGNALS: void windowPropertyChanged(QPlatformWindow *window, const QString &propertyName); }; diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index f9eae3b765..207c858a76 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -518,11 +518,6 @@ bool QWindowSystemInterface::sendWindowSystemEvents(QAbstractEventDispatcher *ev break; } - if (eventDispatcher->filterEvent(event)) { - delete event; - continue; - } - nevents++; QGuiApplicationPrivate::processWindowSystemEvent(event); @@ -554,7 +549,6 @@ QPlatformDropQtResponse QWindowSystemInterface::handleDrop(QWindow *w, const QMi \brief Passes a native event identified by \a eventType to the \a window. \note This function can only be called from the GUI thread. - \sa QPlatformNativeInterface::setEventFilter() */ bool QWindowSystemInterface::handleNativeEvent(QWindow *window, const QByteArray &eventType, void *message, long *result) |