From fc738e3f51e4474b05e99d09c9fb5268ec9aebc4 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 6 Jan 2022 23:05:34 +0100 Subject: [PATCH] Port the last user of QMutableSinglePointEvent::mutableEvent() ... to the static setters of QMutableEventPoint. Remove the mutableEvent() function. Task-number: QTBUG-99615 Pick-to: 6.3 Change-Id: If4d3decae67baff41e23e7e9eaed3f3035fab595 Reviewed-by: Volker Hilsheimer --- src/gui/kernel/qevent_p.h | 2 -- src/widgets/kernel/qapplication.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h index 227b1a4303..cd25f6f174 100644 --- a/src/gui/kernel/qevent_p.h +++ b/src/gui/kernel/qevent_p.h @@ -93,8 +93,6 @@ public: static QMutableSinglePointEvent &from(QSinglePointEvent &e) { return static_cast(e); } - QMutableEventPoint &mutablePoint() { return QMutableEventPoint::from(point(0)); } - void setSource(Qt::MouseEventSource s) { m_source = s; } bool isDoubleClick() { return m_doubleClick; } diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index c7a39e8bee..75ffa471cc 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -2947,7 +2947,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) if (w->isWindow() || w->testAttribute(Qt::WA_NoMousePropagation)) break; - QMutableSinglePointEvent::from(we).mutablePoint().setPosition(we.position() + w->pos()); + QMutableEventPoint::setPosition(we.point(0), we.position() + w->pos()); w = w->parentWidget(); } while (w); wheel->setAccepted(eventAccepted);