summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2020-05-05 14:07:25 +0200
committerPaul Lemire <paul.lemire@kdab.com>2020-06-04 11:13:16 +0200
commit0c9c4e163458f99ac350aef4979754cbe147dac3 (patch)
treef6acbf7b96f2ca146a2f2fefc666e3df817fa30d /tests
parent83ee10ff799fa5892b14a677036fb445ae16b10b (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> (cherry picked from commit 04bdb35a6c5f5fe417c06392e6a0861d80ec9dba)
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp4
-rw-r--r--tests/auto/render/alignedresourcesmanagers-avx/tst_alignedresourcesmanagers-avx.cpp4
-rw-r--r--tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp4
-rw-r--r--tests/auto/render/boundingsphere/tst_boundingsphere.cpp4
-rw-r--r--tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp2
-rw-r--r--tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp4
-rw-r--r--tests/auto/render/raycastingjob/tst_raycastingjob.cpp4
7 files changed, 13 insertions, 13 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/boundingsphere/tst_boundingsphere.cpp b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
index 34d195221..b30d2b111 100644
--- a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
+++ b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
@@ -162,7 +162,7 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
updateWorldTransform.run();
// For each buffer
- QVector<Qt3DRender::Render::HBuffer> bufferHandles = test->nodeManagers()->bufferManager()->activeHandles();
+ const std::vector<Qt3DRender::Render::HBuffer> &bufferHandles = test->nodeManagers()->bufferManager()->activeHandles();
for (auto bufferHandle : bufferHandles) {
Qt3DRender::Render::LoadBufferJob loadBuffer(bufferHandle);
loadBuffer.setNodeManager(test->nodeManagers());
@@ -188,7 +188,7 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
updateTriangleList.run();
// For each geometry id
- QVector<Qt3DRender::Render::HGeometryRenderer> geometryRenderHandles = test->nodeManagers()->geometryRendererManager()->activeHandles();
+ const std::vector<Qt3DRender::Render::HGeometryRenderer> &geometryRenderHandles = test->nodeManagers()->geometryRendererManager()->activeHandles();
for (auto geometryRenderHandle : geometryRenderHandles) {
Qt3DCore::QNodeId geometryRendererId = test->nodeManagers()->geometryRendererManager()->data(geometryRenderHandle)->peerId();
Qt3DRender::Render::CalcGeometryTriangleVolumes calcGeometryTriangles(geometryRendererId, test->nodeManagers());
diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp
index e5c34f804..19763ca17 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
diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
index f1587c27c..0c1ee0183 100644
--- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
+++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
@@ -183,7 +183,7 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
updateWorldTransform.run();
// For each buffer
- QVector<Qt3DRender::Render::HBuffer> bufferHandles = test->nodeManagers()->bufferManager()->activeHandles();
+ const std::vector<Qt3DRender::Render::HBuffer> &bufferHandles = test->nodeManagers()->bufferManager()->activeHandles();
for (auto bufferHandle : bufferHandles) {
Qt3DRender::Render::LoadBufferJob loadBuffer(bufferHandle);
loadBuffer.setNodeManager(test->nodeManagers());
@@ -209,7 +209,7 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
updateTriangleList.run();
// For each geometry id
- QVector<Qt3DRender::Render::HGeometryRenderer> geometryRenderHandles = test->nodeManagers()->geometryRendererManager()->activeHandles();
+ const std::vector<Qt3DRender::Render::HGeometryRenderer> &geometryRenderHandles = test->nodeManagers()->geometryRendererManager()->activeHandles();
for (auto geometryRenderHandle : geometryRenderHandles) {
Qt3DCore::QNodeId geometryRendererId = test->nodeManagers()->geometryRendererManager()->data(geometryRenderHandle)->peerId();
Qt3DRender::Render::CalcGeometryTriangleVolumes calcGeometryTriangles(geometryRendererId, test->nodeManagers());
diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
index daec0b86c..9eb73cbd6 100644
--- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
+++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
@@ -180,7 +180,7 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
updateWorldTransform.run();
// For each buffer
- QVector<Qt3DRender::Render::HBuffer> bufferHandles = test->nodeManagers()->bufferManager()->activeHandles();
+ const std::vector<Qt3DRender::Render::HBuffer> &bufferHandles = test->nodeManagers()->bufferManager()->activeHandles();
for (auto bufferHandle : bufferHandles) {
Qt3DRender::Render::LoadBufferJob loadBuffer(bufferHandle);
loadBuffer.setNodeManager(test->nodeManagers());
@@ -206,7 +206,7 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
updateTriangleList.run();
// For each geometry id
- QVector<Qt3DRender::Render::HGeometryRenderer> geometryRenderHandles = test->nodeManagers()->geometryRendererManager()->activeHandles();
+ const std::vector<Qt3DRender::Render::HGeometryRenderer> &geometryRenderHandles = test->nodeManagers()->geometryRendererManager()->activeHandles();
for (auto geometryRenderHandle : geometryRenderHandles) {
Qt3DCore::QNodeId geometryRendererId = test->nodeManagers()->geometryRendererManager()->data(geometryRenderHandle)->peerId();
Qt3DRender::Render::CalcGeometryTriangleVolumes calcGeometryTriangles(geometryRendererId, test->nodeManagers());