diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-11-09 16:03:59 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-11-10 19:08:44 +0100 |
commit | ef051a61f6e458cb89b6ef20b5d55cb1e001dd93 (patch) | |
tree | 33dedfc32d6d2b587c2bf5c6cc858241dfdeeee1 /src/widgets | |
parent | 88efeb9e258a473ca5f98eaf2ee25719e23263fd (diff) |
Rename remaining QEvent variables to m_ convention; init m_reserved
Change-Id: I08694657b7c9d2713d0cb33519698dbba3bfdffa
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/graphicsview/qgraphicsscene.cpp | 6 | ||||
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 4880e316e2..2f3cb4eaaf 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -1254,7 +1254,7 @@ bool QGraphicsScenePrivate::sendEvent(QGraphicsItem *item, QEvent *event) bool spont = event->spontaneous(); if (spont ? qt_sendSpontaneousEvent(o, event) : QCoreApplication::sendEvent(o, event)) return true; - event->spont = spont; + event->m_spont = spont; } return item->sceneEvent(event); } @@ -1443,7 +1443,7 @@ void QGraphicsScenePrivate::mousePressEventHandler(QGraphicsSceneMouseEvent *mou // event is converted to a press. Known limitation: // Triple-clicking will not generate a doubleclick, though. QGraphicsSceneMouseEvent mousePress(QEvent::GraphicsSceneMousePress); - mousePress.spont = mouseEvent->spont; + mousePress.m_spont = mouseEvent->spontaneous(); mousePress.accept(); mousePress.setButton(mouseEvent->button()); mousePress.setButtons(mouseEvent->buttons()); @@ -6032,7 +6032,7 @@ bool QGraphicsScenePrivate::sendTouchBeginEvent(QGraphicsItem *origin, QTouchEve } else { item->d_ptr->acceptedTouchBeginEvent = (res && eventAccepted); } - touchEvent->spont = false; + touchEvent->m_spont = false; if (res && eventAccepted) { // the first item to accept the TouchBegin gets an implicit grab. const auto &touchPoints = touchEvent->points(); diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 7d10e700e9..1440b14d41 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -2842,7 +2842,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) while (w) { QMouseEvent me(mouse->type(), relpos, mouse->scenePosition(), mouse->globalPosition().toPoint(), mouse->button(), mouse->buttons(), mouse->modifiers(), mouse->source()); - me.spont = mouse->spontaneous(); + me.m_spont = mouse->spontaneous(); me.setTimestamp(mouse->timestamp()); QMutableSinglePointEvent::from(me).setDoubleClick(QMutableSinglePointEvent::from(mouse)->isDoubleClick()); // throw away any mouse-tracking-only mouse events @@ -2854,7 +2854,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) } else { w->setAttribute(Qt::WA_NoMouseReplay, false); res = d->notify_helper(w, w == receiver ? mouse : &me); - e->spont = false; + e->m_spont = false; } eventAccepted = (w == receiver ? mouse : &me)->isAccepted(); if (res && eventAccepted) @@ -2970,7 +2970,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) we.setTimestamp(wheel->timestamp()); bool eventAccepted; do { - we.spont = wheel->spontaneous() && w == receiver; + we.m_spont = wheel->spontaneous() && w == receiver; res = d->notify_helper(w, &we); eventAccepted = we.isAccepted(); if (res && eventAccepted) @@ -2994,10 +2994,10 @@ bool QApplication::notify(QObject *receiver, QEvent *e) bool eventAccepted = context->isAccepted(); while (w) { QContextMenuEvent ce(context->reason(), relpos, context->globalPos(), context->modifiers()); - ce.spont = e->spontaneous(); + ce.m_spont = e->spontaneous(); res = d->notify_helper(w, w == receiver ? context : &ce); eventAccepted = ((w == receiver) ? context : &ce)->isAccepted(); - e->spont = false; + e->m_spont = false; if ((res && eventAccepted) || w->isWindow() || w->testAttribute(Qt::WA_NoMousePropagation)) @@ -3024,11 +3024,11 @@ bool QApplication::notify(QObject *receiver, QEvent *e) tablet->pressure(), tablet->xTilt(), tablet->yTilt(), tablet->tangentialPressure(), tablet->rotation(), tablet->z(), tablet->modifiers(), tablet->button(), tablet->buttons()); - te.spont = e->spontaneous(); + te.m_spont = e->spontaneous(); te.setAccepted(false); res = d->notify_helper(w, w == receiver ? tablet : &te); eventAccepted = ((w == receiver) ? tablet : &te)->isAccepted(); - e->spont = false; + e->m_spont = false; if ((res && eventAccepted) || w->isWindow() || w->testAttribute(Qt::WA_NoMousePropagation)) @@ -3053,9 +3053,9 @@ bool QApplication::notify(QObject *receiver, QEvent *e) bool eventAccepted = help->isAccepted(); while (w) { QHelpEvent he(help->type(), relpos, help->globalPos()); - he.spont = e->spontaneous(); + he.m_spont = e->spontaneous(); res = d->notify_helper(w, w == receiver ? help : &he); - e->spont = false; + e->m_spont = false; eventAccepted = (w == receiver ? help : &he)->isAccepted(); if ((res && eventAccepted) || w->isWindow()) break; @@ -3175,7 +3175,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) } else { widget->setAttribute(Qt::WA_WState_AcceptedTouchBeginEvent, res && eventAccepted); } - touchEvent->spont = false; + touchEvent->m_spont = false; if (res && eventAccepted) { // the first widget to accept the TouchBegin gets an implicit grab. d->activateImplicitTouchGrab(widget, touchEvent); @@ -3271,11 +3271,11 @@ bool QApplication::notify(QObject *receiver, QEvent *e) if (!gestures.isEmpty()) { // we have gestures for this w QGestureEvent ge(gestures); ge.t = gestureEvent->t; - ge.spont = gestureEvent->spont; + ge.m_spont = gestureEvent->spontaneous(); ge.m_accept = wasAccepted; ge.m_accepted = gestureEvent->m_accepted; res = d->notify_helper(w, &ge); - gestureEvent->spont = false; + gestureEvent->m_spont = false; eventAccepted = ge.isAccepted(); for (int i = 0; i < gestures.size(); ++i) { QGesture *g = gestures.at(i); |