From 2e8ab387a4aa5aeaf4840cb4255939cb68d9225f Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 15 Jul 2016 13:25:05 +0200 Subject: Be consistent about const The functions should be const, but the returned point not. This allows accepting the points. Change-Id: Iedbe8f3be38d672b33eea352f959b6e2bb6bc4fc Reviewed-by: Frederik Gladhorn --- src/quick/items/qquickevents.cpp | 4 ++-- src/quick/items/qquickevents_p_p.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/quick/items') diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index d7b1f7573b..5f6cadaf00 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -563,7 +563,7 @@ bool QQuickPointerEvent::isTabletEvent() const } } -const QQuickEventPoint *QQuickPointerEvent::point(int i) const { +QQuickEventPoint *QQuickPointerEvent::point(int i) const { if (Q_UNLIKELY(i < 0 || i >= m_pointCount)) return nullptr; if (isTouchEvent()) @@ -640,7 +640,7 @@ QMouseEvent *QQuickPointerEvent::syntheticMouseEvent(int pointID, QQuickItem *re \l {QQuickEventPoint::pointId}{pointId}. Returns nullptr if there is no point with that ID. */ -QQuickEventPoint *QQuickPointerEvent::pointById(quint64 pointId) { +QQuickEventPoint *QQuickPointerEvent::pointById(quint64 pointId) const { if (isMouseEvent()) { if (m_mousePoint && pointId == m_mousePoint->pointId()) return m_mousePoint; diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 5dea26a2a5..ca929bfab5 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -341,8 +341,8 @@ public: // helpers for C++ only (during event delivery) bool allPointsAccepted() const; int pointCount() const { return m_pointCount; } - const QQuickEventPoint *point(int i) const; - QQuickEventPoint *pointById(quint64 pointId); + QQuickEventPoint *point(int i) const; + QQuickEventPoint *pointById(quint64 pointId) const; const QTouchEvent::TouchPoint *touchPointById(int pointId) const; -- cgit v1.2.3