qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove uses of QMutableSinglePointEvent::mutablePoint() 

Use the static setters of QMutableEventPoint instead.

Task-number: QTBUG-99615
Pick-to: 6.3
Change-Id: Ibdaf485aff2c1638f500b708d61eeabd79836486
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Marc Mutz 2022-01-06 22:49:08 +01:00
parent 046f41d525
commit b537fd6a18
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/quick/items/qquickmultipointtoucharea.cpp
View File

@ -910,8 +910,8 @@ bool QQuickMultiPointTouchArea::sendMouseEvent(QMouseEvent *event)
bool stealThisEvent = _stealMouse;
if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab())) {
QMutableSinglePointEvent mouseEvent(*event);
const auto oldPosition = mouseEvent.mutablePoint().position();
mouseEvent.mutablePoint().setPosition(localPos);
const auto oldPosition = mouseEvent.position();
QMutableEventPoint::setPosition(mouseEvent.point(0), localPos);
mouseEvent.setSource(Qt::MouseEventSynthesizedByQt);
mouseEvent.setAccepted(false);
QMouseEvent *pmouseEvent = static_cast<QMouseEvent *>(static_cast<QSinglePointEvent *>(&mouseEvent));
@ -933,7 +933,7 @@ bool QQuickMultiPointTouchArea::sendMouseEvent(QMouseEvent *event)
if (grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this)
grabMouse();
mouseEvent.mutablePoint().setPosition(oldPosition);
QMutableEventPoint::setPosition(mouseEvent.point(0), oldPosition);
return stealThisEvent;
}
if (event->type() == QEvent::MouseButtonRelease) {

2
src/quicktemplates2/qquickswipedelegate.cpp
View File

@ -961,7 +961,7 @@ void QQuickSwipeDelegatePrivate::forwardMouseEvent(QMouseEvent *event, QQuickIte
{
Q_Q(QQuickSwipeDelegate);
QMutableSinglePointEvent localizedEvent(*event);
localizedEvent.mutablePoint().setPosition(localPos);
QMutableEventPoint::setPosition(localizedEvent.point(0), localPos);
QGuiApplication::sendEvent(destination, &localizedEvent);
q->setPressed(!localizedEvent.isAccepted());
}