diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 16:15:32 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 10:13:43 +0200 |
| commit | 5accfa1e6875582022cb4b6194c3e7616df1a0b7 (patch) | |
| tree | 10b2a2b0bbdd38b3bcbf351d5d4713e5d1c2c385 /tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp | |
| parent | 74dc89de3ed45ad217fdb003f663144e71ef01f8 (diff) | |
Use QList instead of QVector in widgets tests
Task-number: QTBUG-84469
Change-Id: I490fdb237afad2d8a15954fe34d6b549a83fa4aa
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp')
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp index 7798bb52dc..dcb44ef18b 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp @@ -1836,7 +1836,7 @@ public: { } bool ignoreMouse = false; - QVector<QEvent::Type> eventTypes; + QList<QEvent::Type> eventTypes; protected: bool sceneEvent(QEvent *event) override @@ -2150,7 +2150,7 @@ void tst_QGraphicsScene::mouseEventPropagation_doubleclick() class Scene : public QGraphicsScene { public: - QVector<QPointF> mouseMovePoints; + QList<QPointF> mouseMovePoints; protected: void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override @@ -3897,20 +3897,16 @@ void tst_QGraphicsScene::dispatchHoverOnPress() me2.setButton(Qt::LeftButton); QCoreApplication::sendEvent(&scene, &me); QCoreApplication::sendEvent(&scene, &me2); - QCOMPARE(tester1->eventTypes, QVector<QEvent::Type>() - << QEvent::GraphicsSceneHoverEnter - << QEvent::GraphicsSceneHoverMove - << QEvent::GrabMouse - << QEvent::GraphicsSceneMousePress - << QEvent::UngrabMouse); + QCOMPARE(tester1->eventTypes, + QList<QEvent::Type>() << QEvent::GraphicsSceneHoverEnter + << QEvent::GraphicsSceneHoverMove << QEvent::GrabMouse + << QEvent::GraphicsSceneMousePress << QEvent::UngrabMouse); tester1->eventTypes.clear(); QCoreApplication::sendEvent(&scene, &me); QCoreApplication::sendEvent(&scene, &me2); - QCOMPARE(tester1->eventTypes, QVector<QEvent::Type>() - << QEvent::GraphicsSceneHoverMove - << QEvent::GrabMouse - << QEvent::GraphicsSceneMousePress - << QEvent::UngrabMouse); + QCOMPARE(tester1->eventTypes, + QList<QEvent::Type>() << QEvent::GraphicsSceneHoverMove << QEvent::GrabMouse + << QEvent::GraphicsSceneMousePress << QEvent::UngrabMouse); } { QGraphicsSceneMouseEvent me(QEvent::GraphicsSceneMousePress); @@ -3924,22 +3920,17 @@ void tst_QGraphicsScene::dispatchHoverOnPress() QCoreApplication::sendEvent(&scene, &me); QCoreApplication::sendEvent(&scene, &me2); qCDebug(lcTests) << tester1->eventTypes; - QCOMPARE(tester1->eventTypes, QVector<QEvent::Type>() - << QEvent::GraphicsSceneHoverLeave); - QCOMPARE(tester2->eventTypes, QVector<QEvent::Type>() - << QEvent::GraphicsSceneHoverEnter - << QEvent::GraphicsSceneHoverMove - << QEvent::GrabMouse - << QEvent::GraphicsSceneMousePress - << QEvent::UngrabMouse); + QCOMPARE(tester1->eventTypes, QList<QEvent::Type>() << QEvent::GraphicsSceneHoverLeave); + QCOMPARE(tester2->eventTypes, + QList<QEvent::Type>() << QEvent::GraphicsSceneHoverEnter + << QEvent::GraphicsSceneHoverMove << QEvent::GrabMouse + << QEvent::GraphicsSceneMousePress << QEvent::UngrabMouse); tester2->eventTypes.clear(); QCoreApplication::sendEvent(&scene, &me); QCoreApplication::sendEvent(&scene, &me2); - QCOMPARE(tester2->eventTypes, QVector<QEvent::Type>() - << QEvent::GraphicsSceneHoverMove - << QEvent::GrabMouse - << QEvent::GraphicsSceneMousePress - << QEvent::UngrabMouse); + QCOMPARE(tester2->eventTypes, + QList<QEvent::Type>() << QEvent::GraphicsSceneHoverMove << QEvent::GrabMouse + << QEvent::GraphicsSceneMousePress << QEvent::UngrabMouse); } } |