1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deprecations in manual tests

Browse Source 
QEventPoint instead of TouchPoint:  we have source compatibility for that,
but we can use the new type to avoid the deprecation warnings.
Some position accessors have been renamed too.

Change-Id: I5bfe5bc853931127a883d2bd61fab122495fd427
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Shawn Rutledge 2020-07-07 08:19:12 +02:00
parent 62dad9be9e
commit 2e0f7117b6
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/manual/gestures/graphicsview/gestures.cpp
View File

@ -54,17 +54,15 @@ QGestureRecognizer::Result ThreeFingerSlideGestureRecognizer::recognize(QGesture
case QEvent::TouchUpdate: case QEvent::TouchUpdate:
if (d->state() != Qt::NoGesture) { if (d->state() != Qt::NoGesture) {
QTouchEvent *ev = static_cast<QTouchEvent*>(event); QTouchEvent *ev = static_cast<QTouchEvent*>(event);
if (ev->touchPoints().size() == 3) { if (ev->points().size() == 3) {
d->gestureFired = true; d->gestureFired = true;
result = QGestureRecognizer::TriggerGesture; result = QGestureRecognizer::TriggerGesture;
} else { } else {
result = QGestureRecognizer::MayBeGesture; result = QGestureRecognizer::MayBeGesture;
for (int i = 0; i < ev->touchPoints().size(); ++i) { for (const QEventPoint &pt : ev->points()) {
const QTouchEvent::TouchPoint &pt = ev->touchPoints().at(i); const int distance = (pt.globalPosition().toPoint() - pt.globalPressPosition().toPoint()).manhattanLength();
const int distance = (pt.pos().toPoint() - pt.startPos().toPoint()).manhattanLength(); if (distance > 20)
if (distance > 20) {
result = QGestureRecognizer::CancelGesture; result = QGestureRecognizer::CancelGesture;
}
} }
} }
} else { } else {

2
tests/manual/gestures/graphicsview/mousepangesturerecognizer.cpp
View File

@ -57,7 +57,7 @@ QGestureRecognizer::Result MousePanGestureRecognizer::recognize(QGesture *state,
case QEvent::MouseButtonPress: case QEvent::MouseButtonPress:
case QEvent::MouseMove: case QEvent::MouseMove:
case QEvent::MouseButtonRelease: case QEvent::MouseButtonRelease:
globalPos = static_cast<QMouseEvent *>(event)->globalPos(); globalPos = static_cast<QMouseEvent *>(event)->globalPosition().toPoint();
break; break;
default: default:
break; break;

2
tests/manual/qtabletevent/regular_widgets/main.cpp
View File

@ -272,7 +272,7 @@ bool EventReportWidget::event(QEvent *event)
case QEvent::TouchUpdate: case QEvent::TouchUpdate:
event->accept(); event->accept();
m_touchPoints.clear(); m_touchPoints.clear();
for (const QTouchEvent::TouchPoint &p : static_cast<const QTouchEvent *>(event)->touchPoints()) for (const QEventPoint &p : static_cast<const QPointerEvent *>(event)->points())
m_touchPoints.append(p.position()); m_touchPoints.append(p.position());
update(); update();
break; break;

6
tests/manual/touch/main.cpp
View File

@ -344,7 +344,7 @@ bool TouchTestWidget::event(QEvent *event)
case QEvent::MouseButtonRelease: case QEvent::MouseButtonRelease:
if (m_drawPoints) { if (m_drawPoints) {
const QMouseEvent *me = static_cast<const QMouseEvent *>(event); const QMouseEvent *me = static_cast<const QMouseEvent *>(event);
m_points.append(Point(me->localPos(), m_points.append(Point(me->position(),
type == QEvent::MouseButtonPress ? MousePress : MouseRelease, type == QEvent::MouseButtonPress ? MousePress : MouseRelease,
me->source())); me->source()));
update(); update();
@ -353,8 +353,8 @@ bool TouchTestWidget::event(QEvent *event)
case QEvent::TouchBegin: case QEvent::TouchBegin:
case QEvent::TouchUpdate: case QEvent::TouchUpdate:
if (m_drawPoints) { if (m_drawPoints) {
for (const QTouchEvent::TouchPoint &p : static_cast<const QTouchEvent *>(event)->touchPoints()) for (const QEventPoint &p : static_cast<const QPointerEvent *>(event)->points())
m_points.append(Point(p.pos(), TouchPoint, Qt::MouseEventNotSynthesized, p.ellipseDiameters())); m_points.append(Point(p.position(), TouchPoint, Qt::MouseEventNotSynthesized, p.ellipseDiameters()));
update(); update();
} }
Q_FALLTHROUGH(); Q_FALLTHROUGH();