diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-11-20 16:47:37 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2021-01-05 13:57:54 +0000 |
commit | 173be1a93699c54d9680d809ca5a56ce0ccccd9a (patch) | |
tree | bf773d21f61edbc522e8b4128d40f2cb5458a0c2 /tests/auto/animation/findrunningclipanimatorsjob/tst_findrunningclipanimatorsjob.cpp | |
parent | 45dfb8a03f4ee2abb963ce3726eaef0dd1c2c521 (diff) |
Restore use of QVector in private API
Facilitates building against Qt 5.15.
Will migrate to std::vector over time.
Change-Id: I5db14c9ea95b38e4b2d596d7397fef76f6baf118
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/animation/findrunningclipanimatorsjob/tst_findrunningclipanimatorsjob.cpp')
-rw-r--r-- | tests/auto/animation/findrunningclipanimatorsjob/tst_findrunningclipanimatorsjob.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/animation/findrunningclipanimatorsjob/tst_findrunningclipanimatorsjob.cpp b/tests/auto/animation/findrunningclipanimatorsjob/tst_findrunningclipanimatorsjob.cpp index aea512f1c..7d8ef5723 100644 --- a/tests/auto/animation/findrunningclipanimatorsjob/tst_findrunningclipanimatorsjob.cpp +++ b/tests/auto/animation/findrunningclipanimatorsjob/tst_findrunningclipanimatorsjob.cpp @@ -46,9 +46,9 @@ using namespace Qt3DAnimation::Animation; Q_DECLARE_METATYPE(Qt3DAnimation::Animation::Handler*) -Q_DECLARE_METATYPE(QList<Qt3DAnimation::Animation::HClipAnimator>) +Q_DECLARE_METATYPE(QVector<Qt3DAnimation::Animation::HClipAnimator>) -using MappingDataResults = QHash<ClipAnimator *, QList<Qt3DAnimation::Animation::MappingData>>; +using MappingDataResults = QHash<ClipAnimator *, QVector<Qt3DAnimation::Animation::MappingData>>; Q_DECLARE_METATYPE(MappingDataResults) class tst_FindRunningClipAnimatorsJob: public Qt3DCore::QBackendNodeTester @@ -116,7 +116,7 @@ private Q_SLOTS: void checkJob_data() { QTest::addColumn<Handler *>("handler"); - QTest::addColumn<QList<HClipAnimator>>("dirtyClipAnimators"); + QTest::addColumn<QVector<HClipAnimator>>("dirtyClipAnimators"); QTest::addColumn<MappingDataResults>("expectedResults"); @@ -133,7 +133,7 @@ private Q_SLOTS: const int loops = 1; animator = createClipAnimator(handler, globalStartTimeNS, loops); animator->setClipId(clip->peerId()); - const QList<HClipAnimator> dirtyClipAnimators + const QVector<HClipAnimator> dirtyClipAnimators = { handler->clipAnimatorManager()->getOrAcquireHandle(animator->peerId()) }; auto channelMapping = createChannelMapping(handler, @@ -153,7 +153,7 @@ private Q_SLOTS: expectedMapping.propertyName = channelMapping->propertyName(); expectedMapping.type = channelMapping->type(); expectedMapping.channelIndices = locationIndices; - expectedResults.insert(animator, QList<MappingData> { expectedMapping }); + expectedResults.insert(animator, QVector<MappingData> { expectedMapping }); QTest::newRow("single mapping") << handler @@ -174,7 +174,7 @@ private Q_SLOTS: const int loops = 1; animator = createClipAnimator(handler, globalStartTimeNS, loops); animator->setClipId(clip->peerId()); - const QList<HClipAnimator> dirtyClipAnimators + const QVector<HClipAnimator> dirtyClipAnimators = { handler->clipAnimatorManager()->getOrAcquireHandle(animator->peerId()) }; auto channelMapping = createChannelMapping(handler, @@ -199,7 +199,7 @@ private Q_SLOTS: { // GIVEN QFETCH(Handler *, handler); - QFETCH(QList<HClipAnimator>, dirtyClipAnimators); + QFETCH(QVector<HClipAnimator>, dirtyClipAnimators); QFETCH(MappingDataResults, expectedResults); FindRunningClipAnimatorsJob job; @@ -211,8 +211,8 @@ private Q_SLOTS: // THEN - check the resulting MappingData on the animator matches the expected results for (const auto &dirtyClipAnimator : dirtyClipAnimators) { const auto animator = handler->clipAnimatorManager()->data(dirtyClipAnimator); - const QList<MappingData> actualMappingData = animator->mappingData(); - const QList<MappingData> expectedMappingData = expectedResults[animator]; + const QVector<MappingData> actualMappingData = animator->mappingData(); + const QVector<MappingData> expectedMappingData = expectedResults[animator]; QCOMPARE(expectedMappingData.size(), actualMappingData.size()); for (int i = 0; i < actualMappingData.size(); ++i) { |