Stop copying events in tests

It's unnecessary, and copying QEvents is a bad practice since it's a
polymorphic class.

Change-Id: Ieb6de106084f838c5e6c8a0643c54fd3c7f4a7a8
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 29 insertions, 39 deletions

diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
index 67fca910b9..c9cc956d35 100644
--- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
+++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
@@ -169,27 +169,17 @@ void tst_QMouseEvent::mouseEventBasic()
     QCOMPARE(me.scenePosition(), scene);
     QCOMPARE(me.globalPosition(), screen);
     // Press right button while left is already pressed
-    me = QMouseEvent(QEvent::MouseButtonPress, local, scene, screen, Qt::RightButton, Qt::LeftButton | Qt::RightButton, Qt::NoModifier);
-    QVERIFY(me.isBeginEvent());
-    QVERIFY(!me.isEndEvent());
+    QMouseEvent me2(QEvent::MouseButtonPress, local, scene, screen, Qt::RightButton, Qt::LeftButton | Qt::RightButton, Qt::NoModifier);
+    QVERIFY(me2.isBeginEvent());
+    QVERIFY(!me2.isEndEvent());
     // Release right button while left is still pressed
-    me = QMouseEvent(QEvent::MouseButtonRelease, local, scene, screen, Qt::RightButton, Qt::LeftButton, Qt::NoModifier);
-    QVERIFY(!me.isBeginEvent());
-    QVERIFY(me.isEndEvent());
+    QMouseEvent me3 = QMouseEvent(QEvent::MouseButtonRelease, local, scene, screen, Qt::RightButton, Qt::LeftButton, Qt::NoModifier);
+    QVERIFY(!me3.isBeginEvent());
+    QVERIFY(me3.isEndEvent());
     // Release left button in the usual way
-    me = QMouseEvent(QEvent::MouseButtonRelease, local, scene, screen, Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
-    QVERIFY(!me.isBeginEvent());
-    QVERIFY(me.isEndEvent());
-    // Try out the copy constructor
-    QMouseEvent copy(me);
-    QVERIFY(copy.isInputEvent());
-    QVERIFY(copy.isPointerEvent());
-    QVERIFY(copy.isSinglePointEvent());
-    QVERIFY(!copy.isBeginEvent());
-    QVERIFY(copy.isEndEvent());
-    QCOMPARE(copy.position(), local);
-    QCOMPARE(copy.scenePosition(), scene);
-    QCOMPARE(copy.globalPosition(), screen);
+    QMouseEvent me4 = QMouseEvent(QEvent::MouseButtonRelease, local, scene, screen, Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
+    QVERIFY(!me4.isBeginEvent());
+    QVERIFY(me4.isEndEvent());
 }
 
 void tst_QMouseEvent::checkMousePressEvent_data()
diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index 58e7fd2eed..8ef63154a8 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -345,27 +345,27 @@ void tst_QTouchEvent::state()
     QVERIFY(touchEvent.isPointerEvent());
     QVERIFY(!touchEvent.isSinglePointEvent());
 
-    touchEvent = QTouchEvent(QEvent::TouchBegin, touchScreenDevice,
-                             Qt::NoModifier, QList<QEventPoint>() <<
-                             QEventPoint(0, QEventPoint::State::Updated, {}, {}) <<
-                             QEventPoint(1, QEventPoint::State::Pressed, {}, {}));
-    QCOMPARE(touchEvent.touchPointStates(), QEventPoint::State::Updated | QEventPoint::State::Pressed);
-    QCOMPARE(touchEvent.pointCount(), 2);
-    QVERIFY(touchEvent.isBeginEvent());
-    QVERIFY(!touchEvent.isUpdateEvent());
-    QVERIFY(!touchEvent.isEndEvent());
-
-    touchEvent = QTouchEvent(QEvent::TouchBegin, touchScreenDevice,
-                             Qt::NoModifier, QList<QEventPoint>() <<
-                             QEventPoint(0, QEventPoint::State::Updated, {}, {}) <<
-                             QEventPoint(1, QEventPoint::State::Released, {}, {}));
-    QCOMPARE(touchEvent.touchPointStates(), QEventPoint::State::Updated | QEventPoint::State::Released);
-    QCOMPARE(touchEvent.pointCount(), 2);
-    QVERIFY(!touchEvent.isBeginEvent());
-    QVERIFY(!touchEvent.isUpdateEvent());
-    QVERIFY(touchEvent.isEndEvent());
+    QTouchEvent touchEvent2 = QTouchEvent(QEvent::TouchBegin, touchScreenDevice,
+                              Qt::NoModifier, QList<QEventPoint>() <<
+                              QEventPoint(0, QEventPoint::State::Updated, {}, {}) <<
+                              QEventPoint(1, QEventPoint::State::Pressed, {}, {}));
+    QCOMPARE(touchEvent2.touchPointStates(), QEventPoint::State::Updated | QEventPoint::State::Pressed);
+    QCOMPARE(touchEvent2.pointCount(), 2);
+    QVERIFY(touchEvent2.isBeginEvent());
+    QVERIFY(!touchEvent2.isUpdateEvent());
+    QVERIFY(!touchEvent2.isEndEvent());
+
+    QTouchEvent touchEvent3 = QTouchEvent(QEvent::TouchBegin, touchScreenDevice,
+                              Qt::NoModifier, QList<QEventPoint>() <<
+                              QEventPoint(0, QEventPoint::State::Updated, {}, {}) <<
+                              QEventPoint(1, QEventPoint::State::Released, {}, {}));
+    QCOMPARE(touchEvent3.touchPointStates(), QEventPoint::State::Updated | QEventPoint::State::Released);
+    QCOMPARE(touchEvent3.pointCount(), 2);
+    QVERIFY(!touchEvent3.isBeginEvent());
+    QVERIFY(!touchEvent3.isUpdateEvent());
+    QVERIFY(touchEvent3.isEndEvent());
     QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED // test Qt 5 compatibility wrappers
-    QCOMPARE(touchEvent.touchPoints(), touchEvent.points());
+    QCOMPARE(touchEvent3.touchPoints(), touchEvent3.points());
     QT_WARNING_POP
 }