From 524b59b0f51b554ecabbf2663891f9ae1650d122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 21 Sep 2016 15:15:22 +0200 Subject: [PATCH] Rename QPA ExposeEvent's window-pointer from 'exposed' to 'window' The former is easy to mistake for the isExposed state of the event. Change-Id: Ic769ac332901ac97449ebc8dcca5959b6b42df68 Reviewed-by: Paul Olav Tvete --- src/gui/kernel/qguiapplication.cpp | 4 ++-- src/gui/kernel/qwindowsysteminterface.cpp | 6 +++--- src/gui/kernel/qwindowsysteminterface_p.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 2ed7eb2cfbf..16add8f6273 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -2794,10 +2794,10 @@ void QGuiApplicationPrivate::reportRefreshRateChange(QWindowSystemInterfacePriva void QGuiApplicationPrivate::processExposeEvent(QWindowSystemInterfacePrivate::ExposeEvent *e) { - if (!e->exposed) + if (!e->window) return; - QWindow *window = e->exposed.data(); + QWindow *window = e->window.data(); if (!window) return; QWindowPrivate *p = qt_window_private(window); diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index 7c6bbc26c86..bb778bc5fc7 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -361,10 +361,10 @@ void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, con } -QWindowSystemInterfacePrivate::ExposeEvent::ExposeEvent(QWindow *exposed, const QRegion ®ion) +QWindowSystemInterfacePrivate::ExposeEvent::ExposeEvent(QWindow *window, const QRegion ®ion) : WindowSystemEvent(Expose) - , exposed(exposed) - , isExposed(exposed && exposed->handle() ? exposed->handle()->isExposed() : false) + , window(window) + , isExposed(window && window->handle() ? window->handle()->isExposed() : false) , region(region) { } diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h index bdbf191cbdf..f471e1f550c 100644 --- a/src/gui/kernel/qwindowsysteminterface_p.h +++ b/src/gui/kernel/qwindowsysteminterface_p.h @@ -330,8 +330,8 @@ public: class ExposeEvent : public WindowSystemEvent { public: - ExposeEvent(QWindow *exposed, const QRegion ®ion); - QPointer exposed; + ExposeEvent(QWindow *window, const QRegion ®ion); + QPointer window; bool isExposed; QRegion region; };