diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-07-15 13:25:05 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-07-15 18:34:32 +0000 |
| commit | 2e8ab387a4aa5aeaf4840cb4255939cb68d9225f (patch) | |
| tree | 3363620ac1c46b7b8f7543a7a8627b5e3ac618d8 /src/quick/items | |
| parent | 1b0a6a073e5b79121606312ac3fcfd267ba462ae (diff) | |
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 <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickevents_p_p.h | 4 |
2 files changed, 4 insertions, 4 deletions
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; |