From e796857abb73d44b6862687c353ee4977d22cc77 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 11 Nov 2020 12:28:54 +0100 Subject: 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 --- .../gui/kernel/qmouseevent/tst_qmouseevent.cpp | 28 +++++++--------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp') 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() -- cgit v1.2.3