diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-24 09:41:20 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-09-04 22:23:19 +0200 |
commit | 211cef46f6d9d8738c09f906f9c0c3080b445dc8 (patch) | |
tree | 39685f045aa35fa6cdf6e0895d8289a6bb01f185 /src/gui/kernel/qwindowsysteminterface_p.h | |
parent | ca1aa81c97670bf4ac94e1d586b0648636c0d20d (diff) |
Introduce flags to QWindowSystemInterface::WindowSystemEvent.
Replace boolean member variables by flags.
Task-number: QTBUG-38768
Change-Id: If1302d9cc555d20df44147c9fa0f193a471fc95c
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/gui/kernel/qwindowsysteminterface_p.h')
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface_p.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h index 89ca4064b2..c608061d04 100644 --- a/src/gui/kernel/qwindowsysteminterface_p.h +++ b/src/gui/kernel/qwindowsysteminterface_p.h @@ -101,11 +101,20 @@ public: class WindowSystemEvent { public: + enum { + Synthetic = 0x1, + NullWindow = 0x2 + }; + explicit WindowSystemEvent(EventType t) - : type(t), synthetic(false) { } + : type(t), flags(0) { } virtual ~WindowSystemEvent() { } + + bool synthetic() const { return flags & Synthetic; } + bool nullWindow() const { return flags & NullWindow; } + EventType type; - bool synthetic; + int flags; }; class CloseEvent : public WindowSystemEvent { @@ -194,9 +203,12 @@ public: class UserEvent : public WindowSystemEvent { public: UserEvent(QWindow * w, ulong time, EventType t) - : WindowSystemEvent(t), window(w), nullWindow(w == 0), timestamp(time) { } + : WindowSystemEvent(t), window(w), timestamp(time) + { + if (!w) + flags |= NullWindow; + } QPointer<QWindow> window; - bool nullWindow; unsigned long timestamp; }; |