diff options
| author | J-P Nurmi <jpnurmi@gmail.com> | 2013-08-01 21:54:47 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-02 14:29:09 +0200 |
| commit | a0a9818d896bd01aa2eba5fddeb5fcf1ff3b98cc (patch) | |
| tree | bdf27f802632b6edee8053d34c0f5a15862b3b28 /src/winextras/qwineventfilter.cpp | |
| parent | 42f2241d55b0921a071b6137b26488f139ac23cf (diff) | |
Simplify the event types
Dedicated classes for parameterless event types and pimpl in
event classes is overkill. Following the QEvent conventions,
some "int/void* reserved" can be added if felt necessary.
Change-Id: Ie5536dd8c68333be07ebae13ac5c74129236e9df
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/winextras/qwineventfilter.cpp')
| -rw-r--r-- | src/winextras/qwineventfilter.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp index 20c4c35..992ba9d 100644 --- a/src/winextras/qwineventfilter.cpp +++ b/src/winextras/qwineventfilter.cpp @@ -40,11 +40,8 @@ ****************************************************************************/ #include "qwineventfilter_p.h" -#include "qwincolorizationcolorchangeevent.h" -#include "qwincompositionstatechangeevent.h" -#include "qwinthemechangeevent.h" -#include "qwintaskbarbuttoncreatedevent.h" #include "qwinfunctions.h" +#include "qwinevent.h" #include <QGuiApplication> #include <QWindow> @@ -77,17 +74,17 @@ bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, long QWindow *window = 0; switch (msg->message) { case WM_DWMCOLORIZATIONCOLORCHANGED : - event = new QWinColorizationColorChangeEvent(msg->wParam, msg->lParam); + event = new QWinColorizationChangeEvent(msg->wParam, msg->lParam); break; case WM_DWMCOMPOSITIONCHANGED : - event = new QWinCompositionStateChangeEvent(QWinExtras::isCompositionEnabled()); + event = new QWinCompositionChangeEvent(QWinExtras::isCompositionEnabled()); break; case WM_THEMECHANGED : - event = new QWinThemeChangeEvent(); + event = new QWinEvent(QWinEvent::ThemeChange); break; default : if (tbButtonCreatedMsgId == msg->message) { - event = new QWinTaskbarButtonCreatedEvent; + event = new QWinEvent(QWinEvent::TaskbarButtonCreated); filterOut = true; } break; @@ -97,8 +94,7 @@ bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, long window = findWindow(msg->hwnd); if (window) qApp->sendEvent(window, event); - else - delete event; + delete event; } if (filterOut && result) { |