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, 8 insertions, 9 deletions

diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 18f1b28b02..1e1197637b 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -2329,21 +2329,20 @@ void tst_qquickwindow::pointerEventTypeAndPointCount()
     QQuickPointerMouseEvent pme;
     pme.reset(&me);
     QVERIFY(pme.isValid());
-    QVERIFY(pme.isMouseEvent());
-    QVERIFY(!pme.isTouchEvent());
-    QVERIFY(!pme.isTabletEvent());
-    QVERIFY(pme.asMouseEvent());
-    QVERIFY(!pme.asTouchEvent());
+    QCOMPARE(pme.asMouseEvent(), &me);
+    QVERIFY(pme.asPointerMouseEvent());
+    QVERIFY(!pme.asPointerTouchEvent());
+    QVERIFY(!pme.asPointerTabletEvent());
 //    QVERIFY(!pe->asTabletEvent()); // TODO
     QCOMPARE(pme.pointCount(), 1);
 
     QQuickPointerTouchEvent pte;
     pte.reset(&te);
     QVERIFY(pte.isValid());
-    QVERIFY(!pte.isMouseEvent());
-    QVERIFY(pte.isTouchEvent());
-    QVERIFY(!pte.isTabletEvent());
-    QVERIFY(!pte.asMouseEvent());
+    QCOMPARE(pte.asTouchEvent(), &te);
+    QVERIFY(!pte.asPointerMouseEvent());
+    QVERIFY(pte.asPointerTouchEvent());
+    QVERIFY(!pte.asPointerTabletEvent());
     QVERIFY(pte.asTouchEvent());
 //    QVERIFY(!pte.asTabletEvent()); // TODO
     QCOMPARE(pte.pointCount(), 1);