aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-25 10:47:42 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-10-02 23:59:54 +0200
commite9f63420c1a9fbc92f2f2fdd1f3c4bb80be7bd63 (patch)
treed8cccd59ce7c367f8e34323db6c795fd003cb5d3
parentb3da902d309403bc3bd437bb94ea98ef02a53151 (diff)
Fix compile warnings: replace QTouchEvent::touchPoints with points
QTouchEvent::touchPoints() is deprecated in qtbase as of 2692237bb1b0c0f50b7cc5d920eb8ab065063d47, and replaced with QPointerEvent::points(). Change-Id: Ibe5722cf12526f47436921dcef8d3ed7e73cf4cd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/quicktemplates2/qquickcontrol.cpp2
-rw-r--r--src/quicktemplates2/qquickdial.cpp2
-rw-r--r--src/quicktemplates2/qquickdrawer.cpp4
-rw-r--r--src/quicktemplates2/qquickoverlay.cpp4
-rw-r--r--src/quicktemplates2/qquickpopup.cpp2
-rw-r--r--src/quicktemplates2/qquickrangeslider.cpp2
-rw-r--r--src/quicktemplates2/qquickslider.cpp2
-rw-r--r--src/quicktemplates2/qquickswitch.cpp2
-rw-r--r--src/quicktemplates2/qquickswitchdelegate.cpp2
9 files changed, 11 insertions, 11 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 86724369..528dc78a 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -2004,7 +2004,7 @@ void QQuickControl::touchEvent(QTouchEvent *event)
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
case QEvent::TouchEnd:
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : event->points()) {
if (!d->acceptTouch(point))
continue;
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 6b137a78..76e5428d 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -748,7 +748,7 @@ void QQuickDial::touchEvent(QTouchEvent *event)
Q_D(QQuickDial);
switch (event->type()) {
case QEvent::TouchUpdate:
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : event->points()) {
if (!d->acceptTouch(point))
continue;
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index d264cf33..026c802e 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
@@ -315,7 +315,7 @@ bool QQuickDrawerPrivate::startDrag(QEvent *event)
#if QT_CONFIG(quicktemplates2_multitouch)
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
- for (const QTouchEvent::TouchPoint &point : static_cast<QTouchEvent *>(event)->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : static_cast<QTouchEvent *>(event)->points()) {
if (point.state() == QEventPoint::Pressed && isWithinDragMargin(q, point.scenePosition())) {
prepareEnterTransition();
reposition();
@@ -388,7 +388,7 @@ bool QQuickDrawerPrivate::grabTouch(QQuickItem *item, QTouchEvent *event)
return handled;
bool overThreshold = false;
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : event->points()) {
if (!acceptTouch(point) || point.state() != QEventPoint::Updated)
continue;
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index 58a8368f..982834d8 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
@@ -215,7 +215,7 @@ bool QQuickOverlayPrivate::handleTouchEvent(QQuickItem *source, QTouchEvent *eve
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
case QEvent::TouchEnd:
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : event->points()) {
switch (point.state()) {
case QEventPoint::Pressed:
if (!target && startDrag(event, point.scenePosition()))
@@ -506,7 +506,7 @@ bool QQuickOverlay::eventFilter(QObject *object, QEvent *event)
// allow non-modal popups to close on touch release outside
if (!d->mouseGrabberPopup) {
- for (const QTouchEvent::TouchPoint &point : static_cast<QTouchEvent *>(event)->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : static_cast<QTouchEvent *>(event)->points()) {
if (point.state() == QEventPoint::Released) {
if (d->handleRelease(d->window->contentItem(), event, nullptr))
break;
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index d28fc811..fee4fcba 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -390,7 +390,7 @@ bool QQuickPopupPrivate::handleTouchEvent(QQuickItem *item, QTouchEvent *event)
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
case QEvent::TouchEnd:
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : event->points()) {
if (!acceptTouch(point))
return blockInput(item, point.position());
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index 718dc752..0e19db64 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
@@ -1194,7 +1194,7 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event)
Q_D(QQuickRangeSlider);
switch (event->type()) {
case QEvent::TouchUpdate:
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : event->points()) {
if (!d->acceptTouch(point))
continue;
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index ad16303b..e739fb05 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -803,7 +803,7 @@ void QQuickSlider::touchEvent(QTouchEvent *event)
Q_D(QQuickSlider);
switch (event->type()) {
case QEvent::TouchUpdate:
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : event->points()) {
if (!d->acceptTouch(point))
continue;
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index 143210ae..4fc40c33 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -192,7 +192,7 @@ void QQuickSwitch::touchEvent(QTouchEvent *event)
{
Q_D(QQuickSwitch);
if (!keepTouchGrab() && event->type() == QEvent::TouchUpdate) {
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : event->points()) {
if (point.id() != d->touchId || point.state() != QEventPoint::Updated)
continue;
if (d->canDrag(point.position()))
diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp
index 2e196412..86041354 100644
--- a/src/quicktemplates2/qquickswitchdelegate.cpp
+++ b/src/quicktemplates2/qquickswitchdelegate.cpp
@@ -189,7 +189,7 @@ void QQuickSwitchDelegate::touchEvent(QTouchEvent *event)
{
Q_D(QQuickSwitchDelegate);
if (!keepTouchGrab() && event->type() == QEvent::TouchUpdate) {
- for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
+ for (const QTouchEvent::TouchPoint &point : event->points()) {
if (point.id() != d->touchId || point.state() != QEventPoint::Updated)
continue;
if (d->canDrag(point.position()))