Improve encapsuation of touch/mouse event specific things

This makes it easy to avoid casts when using the classes.

Change-Id: I27bd1244bffb3a7d2cdb4572c229333e4c499d9b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

1 files changed, 10 insertions, 20 deletions

diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index cb48255c4e..e4a080d2b7 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -506,26 +506,6 @@ QQuickPointerEvent *QQuickPointerTouchEvent::reset(QEvent *event) {
     return this;
 }
 
-/*!
-    \internal
-    Returns the original touch event, or nullptr if it was not a touch event.
-*/
-QTouchEvent *QQuickPointerEvent::asTouchEvent() const {
-    if (!isTouchEvent())
-        return nullptr;
-    return static_cast<QTouchEvent *>(m_event);
-}
-
-/*!
-    \internal
-    Returns the original mouse event, or nullptr if it was not a mouse event.
-*/
-QMouseEvent *QQuickPointerEvent::asMouseEvent() const {
-    if (isMouseEvent())
-        return static_cast<QMouseEvent *>(m_event);
-    return nullptr;
-}
-
 QQuickEventPoint *QQuickPointerMouseEvent::point(int i) const {
     if (i == 0)
         return m_mousePoint;
@@ -554,6 +534,11 @@ bool QQuickPointerMouseEvent::allPointsAccepted() const {
     return m_mousePoint->isAccepted();
 }
 
+QMouseEvent *QQuickPointerMouseEvent::asMouseEvent() const
+{
+    return static_cast<QMouseEvent *>(m_event);
+}
+
 bool QQuickPointerTouchEvent::allPointsAccepted() const {
     for (int i = 0; i < m_pointCount; ++i) {
         if (!m_touchPoints.at(i)->isAccepted())
@@ -704,6 +689,11 @@ QTouchEvent *QQuickPointerTouchEvent::touchEventForItem(const QList<const QQuick
     return touchEvent;
 }
 
+QTouchEvent *QQuickPointerTouchEvent::asTouchEvent() const
+{
+    return static_cast<QTouchEvent *>(m_event);
+}
+
 #ifndef QT_NO_DEBUG_STREAM
 
 Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickPointerDevice *dev) {