From 5449bddb045519acc49dc2171938526457055c95 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 25 Aug 2020 15:45:13 +0200 Subject: [PATCH] Rename QTabletEvent::m_zTilt to m_z MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a z coordinate unrelated to tilt, AFAIK. Amends ea2ae140e99bbd21515a99c5480e53129ef843c3 Change-Id: If165df3af290fbe7c2e5bfa94d578175debd53cd Reviewed-by: Tor Arne Vestbø --- src/gui/kernel/qevent.cpp | 2 +- src/gui/kernel/qevent.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index ab60a74e1b..a54d0d2d14 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -2384,7 +2384,7 @@ QTabletEvent::QTabletEvent(Type type, const QPointingDevice *dev, const QPointF : QSinglePointEvent(type, dev, pos, pos, globalPos, button, buttons, keyState), m_xTilt(xTilt), m_yTilt(yTilt), - m_zTilt(z), + m_z(z), m_tangential(tangentialPressure) { QMutableEventPoint &mut = QMutableEventPoint::from(m_point); diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 210f6f1571..6b3324c18b 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -418,14 +418,14 @@ public: #endif inline qreal pressure() const { return point(0).pressure(); } inline qreal rotation() const { return point(0).rotation(); } - inline int z() const { return m_zTilt; } + inline int z() const { return m_z; } inline qreal tangentialPressure() const { return m_tangential; } inline int xTilt() const { return m_xTilt; } inline int yTilt() const { return m_yTilt; } protected: quint32 m_reserved : 16; - int m_xTilt, m_yTilt, m_zTilt; + int m_xTilt, m_yTilt, m_z; qreal m_tangential; }; #endif // QT_CONFIG(tabletevent)