diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:45:19 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 13:19:50 +0000 |
commit | 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch) | |
tree | 53197a9e5eb7501d6f5b497f70c25dad9c265a6f /tests/benchmarks | |
parent | 0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff) |
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly.
Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/benchmarks')
4 files changed, 19 insertions, 19 deletions
diff --git a/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp b/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp index b20e0b010..2e1d990c3 100644 --- a/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp +++ b/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/private/qcircularbuffer_p.h> -using namespace Qt3D; +using namespace Qt3DCore; class tst_QCircularBuffer : public QObject { diff --git a/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp b/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp index 9e6ab6fa4..3c015ee3a 100644 --- a/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp +++ b/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/QFrameAllocator> -using namespace Qt3D; +using namespace Qt3DCore; class tst_QFrameAllocator : public QObject { diff --git a/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp b/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp index 3acddc134..29667724a 100644 --- a/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp +++ b/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp @@ -97,42 +97,42 @@ void benchmarkReleaseResources() void tst_ArrayPolicy::benchmarkDynamicAllocateSmallResources() { - benchmarkAllocateResources<Qt3D::ArrayAllocatingPolicy<SmallType, 16>, SmallType>(); + benchmarkAllocateResources<Qt3DCore::ArrayAllocatingPolicy<SmallType, 16>, SmallType>(); } void tst_ArrayPolicy::benchmarkDynamicReleaseSmallResources() { - benchmarkReleaseResources<Qt3D::ArrayAllocatingPolicy<SmallType, 16>, SmallType>(); + benchmarkReleaseResources<Qt3DCore::ArrayAllocatingPolicy<SmallType, 16>, SmallType>(); } void tst_ArrayPolicy::benchmarkDynamicAllocateBigResources() { - benchmarkAllocateResources<Qt3D::ArrayAllocatingPolicy<BigType, 16>, BigType>(); + benchmarkAllocateResources<Qt3DCore::ArrayAllocatingPolicy<BigType, 16>, BigType>(); } void tst_ArrayPolicy::benchmarkDynamicReleaseBigResources() { - benchmarkReleaseResources<Qt3D::ArrayAllocatingPolicy<BigType, 16>, BigType>(); + benchmarkReleaseResources<Qt3DCore::ArrayAllocatingPolicy<BigType, 16>, BigType>(); } void tst_ArrayPolicy::benchmarkPreallocatedAllocateSmallResources() { - benchmarkAllocateResources<Qt3D::ArrayPreallocationPolicy<SmallType, 16>, SmallType>(); + benchmarkAllocateResources<Qt3DCore::ArrayPreallocationPolicy<SmallType, 16>, SmallType>(); } void tst_ArrayPolicy::benchmarkPreallocatedReleaseSmallResources() { - benchmarkReleaseResources<Qt3D::ArrayPreallocationPolicy<SmallType, 16>, SmallType>(); + benchmarkReleaseResources<Qt3DCore::ArrayPreallocationPolicy<SmallType, 16>, SmallType>(); } void tst_ArrayPolicy::benchmarkPreallocatedAllocateBigResources() { - benchmarkAllocateResources<Qt3D::ArrayPreallocationPolicy<BigType, 16>, BigType>(); + benchmarkAllocateResources<Qt3DCore::ArrayPreallocationPolicy<BigType, 16>, BigType>(); } void tst_ArrayPolicy::benchmarkPreallocatedReleaseBigResources() { - benchmarkReleaseResources<Qt3D::ArrayPreallocationPolicy<BigType, 16>, BigType>(); + benchmarkReleaseResources<Qt3DCore::ArrayPreallocationPolicy<BigType, 16>, BigType>(); } QTEST_APPLESS_MAIN(tst_ArrayPolicy) diff --git a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp index d14adc486..221c43e74 100644 --- a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp +++ b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp @@ -77,7 +77,7 @@ public: template<typename Resource> void benchmarkAllocateResources() { - Qt3D::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int, 16> manager; volatile Resource *c; QBENCHMARK_ONCE { @@ -91,9 +91,9 @@ void benchmarkAllocateResources() template<typename Resource> void benchmarkAccessResources() { - Qt3D::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int, 16> manager; const int max = (1 << 16) - 1; - QVector<Qt3D::QHandle<Resource> > handles(max); + QVector<Qt3DCore::QHandle<Resource> > handles(max); for (int i = 0; i < max; i++) handles[i] = manager.acquire(); @@ -107,9 +107,9 @@ void benchmarkAccessResources() template<typename Resource> void benchmarkRandomAccessResource() { - Qt3D::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int, 16> manager; const int max = (1 << 16) - 1; - QVector<Qt3D::QHandle<Resource> > handles(max); + QVector<Qt3DCore::QHandle<Resource> > handles(max); for (int i = 0; i < max; i++) handles[i] = manager.acquire(); @@ -126,7 +126,7 @@ void benchmarkRandomAccessResource() { template<typename Resource> void benchmarkLookupResources() { - Qt3D::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int, 16> manager; const int max = (1 << 16) - 1; for (int i = 0; i < max; i++) manager.getOrCreateResource(i); @@ -142,7 +142,7 @@ void benchmarkLookupResources() template<typename Resource> void benchmarkRandomLookupResources() { - Qt3D::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int, 16> manager; const int max = (1 << 16) - 1; QVector<int> resourcesIndices(max); for (int i = 0; i < max; i++) { @@ -162,9 +162,9 @@ void benchmarkRandomLookupResources() template<typename Resource> void benchmarkReleaseResources() { - Qt3D::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int, 16> manager; const int max = (1 << 16) - 1; - QVector<Qt3D::QHandle<Resource> > handles(max); + QVector<Qt3DCore::QHandle<Resource> > handles(max); for (int i = 0; i < max; i++) handles[i] = manager.acquire(); |