diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-11 12:28:54 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-12 15:25:06 +0100 |
commit | e796857abb73d44b6862687c353ee4977d22cc77 (patch) | |
tree | 7333e869e5d9c778d1518d8047dabd64a5b913e8 /tests/auto/widgets | |
parent | 03e03d7ceb6da284f217fddd76b35d0c2b002af7 (diff) |
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>
Diffstat (limited to 'tests/auto/widgets')
3 files changed, 17 insertions, 13 deletions
diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp index 345d048093..6ee923662e 100644 --- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp +++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp @@ -1699,9 +1699,13 @@ void tst_QTableWidget::search() return item; }; - auto checkSeries = [](TestTableWidget &tw, const QList<QPair<QKeyEvent, int>> &series) { + struct KeyPress { + Qt::Key key; + QString text; + }; + auto checkSeries = [](TestTableWidget &tw, const QList<QPair<KeyPress, int>> &series) { for (const auto &p : series) { - QKeyEvent e = p.first; + QKeyEvent e(QEvent::KeyPress, p.first.key, Qt::NoModifier, p.first.text); tw.keyPressEvent(&e); QVERIFY(tw.selectionModel()->isSelected(tw.model()->index(p.second, 0))); } @@ -1714,12 +1718,12 @@ void tst_QTableWidget::search() tw.setItem(4, 0, createItem(" ")); tw.show(); - QKeyEvent evSpace(QEvent::KeyPress, Qt::Key_Space, Qt::NoModifier, " "); - QKeyEvent ev1(QEvent::KeyPress, Qt::Key_1, Qt::NoModifier, "1"); - QKeyEvent ev2(QEvent::KeyPress, Qt::Key_2, Qt::NoModifier, "2"); - QKeyEvent ev3(QEvent::KeyPress, Qt::Key_3, Qt::NoModifier, "3"); - QKeyEvent ev4(QEvent::KeyPress, Qt::Key_4, Qt::NoModifier, "4"); - QKeyEvent ev5(QEvent::KeyPress, Qt::Key_5, Qt::NoModifier, "5"); + KeyPress evSpace{Qt::Key_Space, " "}; + KeyPress ev1{Qt::Key_1, "1"}; + KeyPress ev2{Qt::Key_2, "2"}; + KeyPress ev3{Qt::Key_3, "3"}; + KeyPress ev4{Qt::Key_4, "4"}; + KeyPress ev5{Qt::Key_5, "5"}; checkSeries(tw, {{evSpace, 4}, {ev1, 4}}); QTest::qWait(QApplication::keyboardInputInterval() * 2); diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 7c42937a46..a477d9db00 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -4069,8 +4069,8 @@ void tst_QWidget::testDeletionInEventHandlers() w->setMouseTracking(true); w->show(); w->deleteThis = true; - me = QMouseEvent(QEvent::MouseMove, QPoint(0, 0), Qt::NoButton, Qt::NoButton, Qt::NoModifier); - QApplication::sendEvent(w, &me); + QMouseEvent me2 = QMouseEvent(QEvent::MouseMove, QPoint(0, 0), Qt::NoButton, Qt::NoButton, Qt::NoModifier); + QApplication::sendEvent(w, &me2); QVERIFY(w.isNull()); delete w; } diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp index a9a8945877..065834059e 100644 --- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp @@ -1678,11 +1678,11 @@ void tst_QAbstractSlider::wheelEvent() slider->setSliderPosition(initialSliderPosition); k = withModifiers ? Qt::ShiftModifier : Qt::NoModifier; - event = QWheelEvent(wheelPoint, slider->mapToGlobal(wheelPoint), QPoint(), angleDelta, - Qt::NoButton, k, Qt::NoScrollPhase, false); + QWheelEvent event2 = QWheelEvent(wheelPoint, slider->mapToGlobal(wheelPoint), QPoint(), angleDelta, + Qt::NoButton, k, Qt::NoScrollPhase, false); QSignalSpy spy1(slider, SIGNAL(actionTriggered(int))); QSignalSpy spy2(slider, SIGNAL(valueChanged(int))); - QVERIFY(applicationInstance->sendEvent(slider,&event)); + QVERIFY(applicationInstance->sendEvent(slider,&event2)); #ifdef Q_OS_MAC QEXPECT_FAIL("Normal data page", "QTBUG-23679", Continue); QEXPECT_FAIL("Different orientation", "QTBUG-23679", Continue); |