aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2016-07-25 11:57:19 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2016-07-26 10:20:07 +0000
commit9d292aef75cbef15c5506bd69f5e6defa59499b0 (patch)
treea2a7e3d089bcf35b9fc63abbe9305adb005ce409 /src/quick/items
parenteb238e2cf9013f9a6cd20af0a59180896abdc377 (diff)
Pass QQuickPointerTouchEvent to deliverTouchEvent
We cast inside the function anyway, start cleaning it up. Change-Id: I9687919a87c6cb4b6bd0d68471e76df8d1027b97 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/qquickwindow.cpp6
-rw-r--r--src/quick/items/qquickwindow_p.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 05f1eb47fc..81c36a1b75 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -2155,7 +2155,7 @@ void QQuickWindowPrivate::deliverPointerEvent(QQuickPointerEvent *event)
if (QQuickPointerMouseEvent *mouse = event->asPointerMouseEvent()) {
deliverMouseEvent(mouse->asMouseEvent());
} else if (event->asPointerTouchEvent()) {
- deliverTouchEvent(event);
+ deliverTouchEvent(event->asPointerTouchEvent());
} else {
Q_ASSERT(false);
}
@@ -2193,9 +2193,9 @@ QVector<QQuickItem *> QQuickWindowPrivate::pointerTargets(QQuickItem *item, cons
return targets;
}
-void QQuickWindowPrivate::deliverTouchEvent(QQuickPointerEvent *event)
+void QQuickWindowPrivate::deliverTouchEvent(QQuickPointerTouchEvent *event)
{
- qCDebug(DBG_TOUCH) << " - delivering" << event->asPointerTouchEvent()->asTouchEvent();
+ qCDebug(DBG_TOUCH) << " - delivering" << event->asTouchEvent();
// List of all items that received an event before
// When we have TouchBegin this is and will stay empty
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 62d0070593..8811cd795b 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -164,7 +164,7 @@ public:
// delivery of pointer events:
QQuickPointerEvent *pointerEventInstance(QEvent *ev);
void deliverPointerEvent(QQuickPointerEvent *);
- void deliverTouchEvent(QQuickPointerEvent *);
+ void deliverTouchEvent(QQuickPointerTouchEvent *);
bool deliverTouchCancelEvent(QTouchEvent *);
bool deliverPoints(QQuickItem *, QQuickPointerEvent *, const QList<const QQuickEventPoint *> &,
QSet<quint64> *, QHash<QQuickItem *, QList<const QQuickEventPoint *> > *, QSet<QQuickItem *> *);