diff options
Diffstat (limited to 'tests/auto/widgets/graphicsview')
6 files changed, 97 insertions, 97 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index f7c578847a..e19ef4c308 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -1358,7 +1358,7 @@ static inline QByteArray msgStability(const QRectF &actual, const QRectF &expect void tst_QGraphicsAnchorLayout::stability() { - QVector<QRectF> geometries; + QList<QRectF> geometries; geometries.resize(7); QGraphicsWidget p(0, Qt::Window); // it usually fails after 3-4 iterations diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index 94575e174d..1bd5b160ea 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -61,7 +61,7 @@ #include <QPainterPath> using AbstractGraphicsShapeItemPtr = QSharedPointer<QAbstractGraphicsShapeItem>; -using GraphicsItems = QVector<QGraphicsItem *>; +using GraphicsItems = QList<QGraphicsItem *>; using GraphicsItemsList = QList<QGraphicsItem *>; Q_DECLARE_METATYPE(AbstractGraphicsShapeItemPtr) @@ -251,7 +251,7 @@ public: lastExposedRect = QRectF(); } - QVector<QEvent::Type> events; + QList<QEvent::Type> events; QPainter::RenderHints hints; int repaints = 0; QRectF br = QRectF(-10, -10, 20, 20); @@ -1544,7 +1544,7 @@ class SelectChangeItem : public QGraphicsRectItem { public: SelectChangeItem() : QGraphicsRectItem(-50, -50, 100, 100) { setBrush(Qt::blue); } - QVector<bool> values; + QList<bool> values; protected: QVariant itemChange(GraphicsItemChange change, const QVariant &value) override @@ -4482,7 +4482,7 @@ public: QVariant itemChangeReturnValue; QGraphicsScene *itemSceneChangeTargetScene; - QVector<GraphicsItemChange> changes; + QList<GraphicsItemChange> changes; QVariantList values; QVariantList oldValues; protected: @@ -4946,9 +4946,9 @@ void tst_QGraphicsItem::itemChange() class EventFilterTesterItem : public QGraphicsLineItem { public: - QVector<QEvent::Type> filteredEvents; + QList<QEvent::Type> filteredEvents; GraphicsItems filteredEventReceivers; - QVector<QEvent::Type> receivedEvents; + QList<QEvent::Type> receivedEvents; bool handlesSceneEvents = false; protected: @@ -8069,20 +8069,22 @@ void tst_QGraphicsItem::itemSendsGeometryChanges() QCOMPARE(item.scale(), qreal(1.0)); QCOMPARE(item.transformOriginPoint(), QPointF(0.0, 0.0)); - const QVector<QGraphicsItem::GraphicsItemChange> expected{QGraphicsItem::ItemOpacityChange, - QGraphicsItem::ItemOpacityHasChanged, - QGraphicsItem::ItemFlagsChange, - QGraphicsItem::ItemFlagsHaveChanged, - QGraphicsItem::ItemTransformChange, - QGraphicsItem::ItemTransformHasChanged, - QGraphicsItem::ItemPositionChange, - QGraphicsItem::ItemPositionHasChanged, - QGraphicsItem::ItemRotationChange, - QGraphicsItem::ItemRotationHasChanged, - QGraphicsItem::ItemScaleChange, - QGraphicsItem::ItemScaleHasChanged, - QGraphicsItem::ItemTransformOriginPointChange, - QGraphicsItem::ItemTransformOriginPointHasChanged}; + const QList<QGraphicsItem::GraphicsItemChange> expected { + QGraphicsItem::ItemOpacityChange, + QGraphicsItem::ItemOpacityHasChanged, + QGraphicsItem::ItemFlagsChange, + QGraphicsItem::ItemFlagsHaveChanged, + QGraphicsItem::ItemTransformChange, + QGraphicsItem::ItemTransformHasChanged, + QGraphicsItem::ItemPositionChange, + QGraphicsItem::ItemPositionHasChanged, + QGraphicsItem::ItemRotationChange, + QGraphicsItem::ItemRotationHasChanged, + QGraphicsItem::ItemScaleChange, + QGraphicsItem::ItemScaleHasChanged, + QGraphicsItem::ItemTransformOriginPointChange, + QGraphicsItem::ItemTransformOriginPointHasChanged + }; QCOMPARE(item.changes, expected); } @@ -10978,7 +10980,7 @@ void tst_QGraphicsItem::focusHandling() class TouchEventTestee : public QGraphicsRectItem { public: - using TouchPoints = QVector<QTouchEvent::TouchPoint>; + using TouchPoints = QList<QTouchEvent::TouchPoint>; TouchEventTestee(const QSizeF &size = QSizeF(100, 100)) : QGraphicsRectItem(QRectF(QPointF(), size)) diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp index cfc18c6e32..c5009e9847 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp @@ -601,7 +601,7 @@ protected: void tst_QGraphicsLayout::constructors() { // Strange test, but see the fix that was with this submit - QVector<Layout*> layouts; + QList<Layout *> layouts; for (int pass = 0; pass < 5; ++pass) { Layout *lay = new Layout(); layouts << lay; @@ -703,8 +703,8 @@ private slots: } private: QTimeLine m_timeline; - QVector<QRectF> fromGeoms; - QVector<QRectF> toGeoms; + QList<QRectF> fromGeoms; + QList<QRectF> toGeoms; }; diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index e0f4b67d50..ebf340db2a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -1524,10 +1524,10 @@ protected: } }; -// ### work around missing QVector ctor from iterator pair: -static QVector<QRect> rects(const QRegion ®ion) +// ### work around missing QList ctor from iterator pair: +static QList<QRect> rects(const QRegion ®ion) { - QVector<QRect> result; + QList<QRect> result; for (QRect r : region) result.push_back(r); return result; @@ -1555,10 +1555,10 @@ void tst_QGraphicsProxyWidget::scrollUpdate() // QRect(0, 12, 102, 10) is the scroll update, expanded (-2, -2, 2, 2), // intersected with the above update. QCOMPARE(rects(view.paintEventRegion), - QVector<QRect>() << QRect(0, 0, 200, 12) << QRect(0, 12, 102, 10)); + QList<QRect>() << QRect(0, 0, 200, 12) << QRect(0, 12, 102, 10)); QCOMPARE(widget->npaints, 2); QCOMPARE(rects(widget->paintEventRegion), - QVector<QRect>() << QRect(0, 0, 200, 12) << QRect(0, 12, 102, 10)); + QList<QRect>() << QRect(0, 0, 200, 12) << QRect(0, 12, 102, 10)); } void tst_QGraphicsProxyWidget::setWidget_simple() 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); } } diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index e42640c066..882aa8bcbd 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -1873,51 +1873,58 @@ Q_DECLARE_METATYPE(Inst) void tst_QGraphicsWidget::setSizes_data() { - QTest::addColumn<QVector<Inst> >("inputInstructions"); - QTest::addColumn<QVector<Inst> >("compareInstructions"); - - QTest::newRow("minSize1") << (QVector<Inst>() << Inst(Size, QSize(25, 25)) << Inst(MinimumSize, QSize(10, 10))) - << (QVector<Inst>() << Inst(Size, QSize(25,25))); - QTest::newRow("minSize2") << (QVector<Inst>() << Inst(Size, QSizeF(20, 20)) << Inst(MinimumSize, QSizeF(25, 25))) - << (QVector<Inst>() << Inst(Size, QSizeF(25, 25))); - QTest::newRow("minWidth1") << (QVector<Inst>() << Inst(Size, QSizeF(20, 20)) << Inst(MinimumWidth, 5.0)) - << (QVector<Inst>() << Inst(Size, QSizeF(20, 20))); - QTest::newRow("minWidth2") << (QVector<Inst>() << Inst(Size, QSizeF(20, 20)) << Inst(MinimumWidth, 25.0)) - << (QVector<Inst>() << Inst(Size, QSizeF(25, 20))); - QTest::newRow("minHeight1") << (QVector<Inst>() << Inst(Size, QSizeF(20, 20)) << Inst(MinimumHeight, 5.0)) - << (QVector<Inst>() << Inst(Size, QSizeF(20, 20))); - QTest::newRow("minHeight2") << (QVector<Inst>() << Inst(Size, QSizeF(20, 20)) << Inst(MinimumHeight, 25.0)) - << (QVector<Inst>() << Inst(Size, QSizeF(20, 25))); - QTest::newRow("maxSize1") << (QVector<Inst>() << Inst(Size, QSizeF(40, 40)) << Inst(MaximumSize, QSizeF(30, 30))) - << (QVector<Inst>() << Inst(Size, QSizeF(30, 30))); - QTest::newRow("maxSize2") << (QVector<Inst>() << Inst(Size, QSizeF(40, 40)) << Inst(MaximumSize, QSizeF(30, -1))) - << (QVector<Inst>() << Inst(Size, QSizeF(30, 40))); - QTest::newRow("maxSize3") << (QVector<Inst>() << Inst(Size, QSizeF(40, 40)) << Inst(MaximumSize, QSizeF(-1, 30))) - << (QVector<Inst>() << Inst(Size, QSizeF(40, 30))); - QTest::newRow("maxWidth1")<< (QVector<Inst>() << Inst(Size, QSizeF(40, 40)) << Inst(MaximumWidth, 30)) - << (QVector<Inst>() << Inst(Size, QSizeF(30, 40))); - QTest::newRow("maxHeight")<< (QVector<Inst>() << Inst(Size, QSizeF(40, 40)) << Inst(MaximumHeight, 20)) - << (QVector<Inst>() << Inst(Size, QSizeF(40, 20))); - QTest::newRow("unsetMinSize")<< (QVector<Inst>() << Inst(Size, QSizeF(40, 40)) << Inst(MinimumSize, QSizeF(-1, -1))) - << (QVector<Inst>() << Inst(MinimumSize, QSizeF(5, 5))); - QTest::newRow("unsetMaxSize")<< (QVector<Inst>() << Inst(Size, QSizeF(40, 40)) << Inst(MaximumSize, QSizeF(-1, -1))) - << (QVector<Inst>() << Inst(MaximumSize, QSizeF(500, 500))); - QTest::newRow("unsetMinSize, expand size to minimumSizeHint") << (QVector<Inst>() - << Inst(MinimumSize, QSize(0, 0)) - << Inst(Size, QSize(1,1)) - << Inst(MinimumSize, QSize(-1.0, -1.0)) - ) - << (QVector<Inst>() - << Inst(Size, QSize(5,5)) - << Inst(MinimumSize, QSize(5,5)) - ); - + QTest::addColumn<QList<Inst>>("inputInstructions"); + QTest::addColumn<QList<Inst>>("compareInstructions"); + + QTest::newRow("minSize1") << (QList<Inst>() + << Inst(Size, QSize(25, 25)) << Inst(MinimumSize, QSize(10, 10))) + << (QList<Inst>() << Inst(Size, QSize(25, 25))); + QTest::newRow("minSize2") << (QList<Inst>() << Inst(Size, QSizeF(20, 20)) + << Inst(MinimumSize, QSizeF(25, 25))) + << (QList<Inst>() << Inst(Size, QSizeF(25, 25))); + QTest::newRow("minWidth1") << (QList<Inst>() + << Inst(Size, QSizeF(20, 20)) << Inst(MinimumWidth, 5.0)) + << (QList<Inst>() << Inst(Size, QSizeF(20, 20))); + QTest::newRow("minWidth2") << (QList<Inst>() + << Inst(Size, QSizeF(20, 20)) << Inst(MinimumWidth, 25.0)) + << (QList<Inst>() << Inst(Size, QSizeF(25, 20))); + QTest::newRow("minHeight1") << (QList<Inst>() + << Inst(Size, QSizeF(20, 20)) << Inst(MinimumHeight, 5.0)) + << (QList<Inst>() << Inst(Size, QSizeF(20, 20))); + QTest::newRow("minHeight2") << (QList<Inst>() + << Inst(Size, QSizeF(20, 20)) << Inst(MinimumHeight, 25.0)) + << (QList<Inst>() << Inst(Size, QSizeF(20, 25))); + QTest::newRow("maxSize1") << (QList<Inst>() << Inst(Size, QSizeF(40, 40)) + << Inst(MaximumSize, QSizeF(30, 30))) + << (QList<Inst>() << Inst(Size, QSizeF(30, 30))); + QTest::newRow("maxSize2") << (QList<Inst>() << Inst(Size, QSizeF(40, 40)) + << Inst(MaximumSize, QSizeF(30, -1))) + << (QList<Inst>() << Inst(Size, QSizeF(30, 40))); + QTest::newRow("maxSize3") << (QList<Inst>() << Inst(Size, QSizeF(40, 40)) + << Inst(MaximumSize, QSizeF(-1, 30))) + << (QList<Inst>() << Inst(Size, QSizeF(40, 30))); + QTest::newRow("maxWidth1") << (QList<Inst>() + << Inst(Size, QSizeF(40, 40)) << Inst(MaximumWidth, 30)) + << (QList<Inst>() << Inst(Size, QSizeF(30, 40))); + QTest::newRow("maxHeight") << (QList<Inst>() + << Inst(Size, QSizeF(40, 40)) << Inst(MaximumHeight, 20)) + << (QList<Inst>() << Inst(Size, QSizeF(40, 20))); + QTest::newRow("unsetMinSize") << (QList<Inst>() << Inst(Size, QSizeF(40, 40)) + << Inst(MinimumSize, QSizeF(-1, -1))) + << (QList<Inst>() << Inst(MinimumSize, QSizeF(5, 5))); + QTest::newRow("unsetMaxSize") << (QList<Inst>() << Inst(Size, QSizeF(40, 40)) + << Inst(MaximumSize, QSizeF(-1, -1))) + << (QList<Inst>() << Inst(MaximumSize, QSizeF(500, 500))); + QTest::newRow("unsetMinSize, expand size to minimumSizeHint") + << (QList<Inst>() << Inst(MinimumSize, QSize(0, 0)) << Inst(Size, QSize(1, 1)) + << Inst(MinimumSize, QSize(-1.0, -1.0))) + << (QList<Inst>() << Inst(Size, QSize(5, 5)) << Inst(MinimumSize, QSize(5, 5))); } void tst_QGraphicsWidget::setSizes() { - QFETCH(QVector<Inst>, inputInstructions); - QFETCH(QVector<Inst>, compareInstructions); + QFETCH(QList<Inst>, inputInstructions); + QFETCH(QList<Inst>, compareInstructions); QGraphicsScene scene; QGraphicsView view(&scene); |