From 42c86bba9d46d8d16ffd6c90ec34857eccc23df4 Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 20 Jul 2012 20:52:44 +0200 Subject: Remove winEventFilter, replaced with installNativeEventFilter. No reason to keep a virtual method for Windows when all other similar methods (macEvent and x11Event) have been removed, and when installNativeEventFilter provides a much nicer solution (no need to derive from QApplication). Change-Id: Ia2a7960e320fcbd04cef91f467900861dbb377c1 Reviewed-by: Lars Knoll --- src/corelib/kernel/qeventdispatcher_win.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/kernel/qeventdispatcher_win.cpp') diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index e5cc627edb..baacfa6a80 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -353,13 +353,13 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA msg.message = message; msg.wParam = wp; msg.lParam = lp; - QCoreApplication *app = QCoreApplication::instance(); + QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance(); long result; - if (!app) { + if (!dispatcher) { if (message == WM_TIMER) KillTimer(hwnd, wp); return 0; - } else if (app->filterNativeEvent(QByteArrayLiteral("windows_dispatcher_MSG"), &msg, &result)) { + } else if (dispatcher->filterNativeEvent(QByteArrayLiteral("windows_dispatcher_MSG"), &msg, &result)) { return result; } -- cgit v1.2.3