diff options
author | David Faure <faure@kde.org> | 2012-07-20 20:52:44 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 00:08:28 +0200 |
commit | 42c86bba9d46d8d16ffd6c90ec34857eccc23df4 (patch) | |
tree | 703d79deb66054ed88613474f8d87e9f742f65dd /src/corelib/kernel/qeventdispatcher_win.cpp | |
parent | 607c37befb145c3aa1b9d29365ac682a2bd3a55f (diff) |
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 <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qeventdispatcher_win.cpp')
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |