diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2020-05-05 14:07:25 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2020-05-20 17:01:16 +0200 |
commit | 04bdb35a6c5f5fe417c06392e6a0861d80ec9dba (patch) | |
tree | e5d2616e2ae2d7d85e10960dbf4e57e028e7691a /tests | |
parent | f5b4bd3cb32d21cf034f13b999e819701da5d4e1 (diff) |
QResourcesManager: switch to std::vector
Given QVector is potentially slower for this use case and the fact
that QVector might become QList in Qt6, we're better of using the
std.
Change-Id: If2c403439ddb856b60f8bfd5ae7c6ec1cb2c892a
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests')
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp index a41ea83b5..197f4fb71 100644 --- a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp +++ b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp @@ -399,7 +399,7 @@ void tst_QResourceManager::activeHandles() const tHandle newHandle = manager.getOrAcquireHandle(883U); // THEN QCOMPARE(manager.activeHandles().size(), 1); - QCOMPARE(manager.activeHandles().first(), newHandle); + QCOMPARE(manager.activeHandles()[0], newHandle); } { @@ -414,7 +414,7 @@ void tst_QResourceManager::activeHandles() const tHandle newHandle = manager.acquire(); // THEN QCOMPARE(manager.activeHandles().size(), 1); - QCOMPARE(manager.activeHandles().first(), newHandle); + QCOMPARE(manager.activeHandles()[0], newHandle); // WHEN manager.release(newHandle); diff --git a/tests/auto/render/alignedresourcesmanagers-avx/tst_alignedresourcesmanagers-avx.cpp b/tests/auto/render/alignedresourcesmanagers-avx/tst_alignedresourcesmanagers-avx.cpp index c89592e63..f8197a5b5 100644 --- a/tests/auto/render/alignedresourcesmanagers-avx/tst_alignedresourcesmanagers-avx.cpp +++ b/tests/auto/render/alignedresourcesmanagers-avx/tst_alignedresourcesmanagers-avx.cpp @@ -74,7 +74,7 @@ private Q_SLOTS: // THEN // Shouldn't crash - const QVector<HMatrix> activeHandles = manager.activeHandles(); + const std::vector<HMatrix> &activeHandles = manager.activeHandles(); for (const HMatrix handle : activeHandles) { // WHEN Matrix4x4_AVX2 *mat = manager.data(handle); @@ -108,7 +108,7 @@ private Q_SLOTS: // THEN // Shouldn't crash - const QVector<HCameraLens> activeHandles = manager.activeHandles(); + const std::vector<HCameraLens> &activeHandles = manager.activeHandles(); for (const HCameraLens handle : activeHandles) { // WHEN Qt3DRender::Render::CameraLens *lens = manager.data(handle); diff --git a/tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp b/tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp index e4ab187c4..48efef4b7 100644 --- a/tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp +++ b/tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp @@ -74,7 +74,7 @@ private Q_SLOTS: // THEN // Shouldn't crash - const QVector<HMatrix> activeHandles = manager.activeHandles(); + const std::vector<HMatrix> &activeHandles = manager.activeHandles(); for (const HMatrix handle : activeHandles) { // WHEN Matrix4x4_SSE *mat = manager.data(handle); @@ -108,7 +108,7 @@ private Q_SLOTS: // THEN // Shouldn't crash - const QVector<HCameraLens> activeHandles = manager.activeHandles(); + const std::vector<HCameraLens> &activeHandles = manager.activeHandles(); for (const HCameraLens handle : activeHandles) { // WHEN Qt3DRender::Render::CameraLens *lens = manager.data(handle); diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp index 7d897a358..e9dae6d97 100644 --- a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp +++ b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp @@ -238,7 +238,7 @@ private Q_SLOTS: // THEN QCOMPARE(testAspect.renderer()->isRunning(), true); QCOMPARE(testAspect.renderer()->submissionContext()->isInitialized(), true); - const QVector<Qt3DRender::Render::HTechnique> handles = testAspect.nodeManagers()->techniqueManager()->activeHandles(); + const std::vector<Qt3DRender::Render::HTechnique> &handles = testAspect.nodeManagers()->techniqueManager()->activeHandles(); QCOMPARE(handles.size(), 3); // WHEN |