diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2014-11-16 16:18:40 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-11-18 08:19:05 +0100 |
commit | 787b65130c31c3a911e760a1387e717940b697ef (patch) | |
tree | d18204581253847cc9fe932f098b7bdef8873954 /tests | |
parent | 5b8966e089016d18d69d6081eba685b5524799dc (diff) |
Rename QResourcesManager -> QResourceManager and make private
Once we are happy with the API we can make this public for a future
release.
Change-Id: I914f087e10adddbadac1649a8b889b9f53f82fd2
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
10 files changed, 69 insertions, 69 deletions
diff --git a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/dynamicarraypolicy.pro b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/dynamicarraypolicy.pro index db6704cd6..ee2a73e03 100644 --- a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/dynamicarraypolicy.pro +++ b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/dynamicarraypolicy.pro @@ -4,4 +4,4 @@ TEMPLATE = app SOURCES += tst_dynamicarraypolicy.cpp -QT += testlib 3dcore +QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp index 90b48ba10..adc1b0366 100644 --- a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp +++ b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp @@ -41,8 +41,8 @@ #include <QtTest/QtTest> #include <QList> -#include <Qt3DCore/qresourcesmanager.h> #include <Qt3DCore/qhandle.h> +#include <Qt3DCore/private/qresourcemanager_p.h> class tst_DynamicArrayPolicy : public QObject { @@ -81,9 +81,9 @@ typedef Qt3D::QHandle<tst_ArrayResource, 16> tHandle16; void tst_DynamicArrayPolicy::createResourcesManager() { - Qt3D::QResourcesManager<tst_ArrayResource, int, 16> manager16; - Qt3D::QResourcesManager<tst_ArrayResource, int, 4> manager4; - Qt3D::QResourcesManager<tst_ArrayResource, int, 8> manager8; + Qt3D::QResourceManager<tst_ArrayResource, int, 16> manager16; + Qt3D::QResourceManager<tst_ArrayResource, int, 4> manager4; + Qt3D::QResourceManager<tst_ArrayResource, int, 8> manager8; QVERIFY(manager16.maxResourcesEntries() == 65535); QVERIFY(manager8.maxResourcesEntries() == 255); QVERIFY(manager4.maxResourcesEntries() == 15); @@ -95,7 +95,7 @@ void tst_DynamicArrayPolicy::createResourcesManager() */ void tst_DynamicArrayPolicy::acquireResources() { - Qt3D::QResourcesManager<tst_ArrayResource, uint, 4> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint, 4> manager; QList<tHandle4> handles; @@ -115,7 +115,7 @@ void tst_DynamicArrayPolicy::acquireResources() void tst_DynamicArrayPolicy::getResources() { - Qt3D::QResourcesManager<tst_ArrayResource, int, 8> manager; + Qt3D::QResourceManager<tst_ArrayResource, int, 8> manager; QList<tst_ArrayResource *> resources; QList<tHandle8> handles; @@ -146,7 +146,7 @@ void tst_DynamicArrayPolicy::getResources() */ void tst_DynamicArrayPolicy::registerResourcesResize() { - Qt3D::QResourcesManager<tst_ArrayResource, uint, 16> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint, 16> manager; QList<tHandle16> handles; for (uint i = 0; i < 2; i++) { @@ -174,7 +174,7 @@ void tst_DynamicArrayPolicy::registerResourcesResize() */ void tst_DynamicArrayPolicy::removeResource() { - Qt3D::QResourcesManager<tst_ArrayResource, int> manager; + Qt3D::QResourceManager<tst_ArrayResource, int> manager; QList<tst_ArrayResource *> resources; QList<tHandle> handles; @@ -198,7 +198,7 @@ void tst_DynamicArrayPolicy::removeResource() */ void tst_DynamicArrayPolicy::resetResource() { - Qt3D::QResourcesManager<tst_ArrayResource, uint> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint> manager; QList<tst_ArrayResource *> resources; QList<tHandle16> handles; @@ -225,7 +225,7 @@ void tst_DynamicArrayPolicy::resetResource() void tst_DynamicArrayPolicy::lookupResource() { - Qt3D::QResourcesManager<tst_ArrayResource, uint> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint> manager; QList<tst_ArrayResource *> resources; QList<tHandle16> handles; @@ -250,7 +250,7 @@ void tst_DynamicArrayPolicy::lookupResource() void tst_DynamicArrayPolicy::releaseResource() { - Qt3D::QResourcesManager<tst_ArrayResource, uint> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint> manager; QList<tst_ArrayResource *> resources; for (int i = 0; i < 5; i++) { @@ -272,7 +272,7 @@ class tst_Thread : public QThread Q_OBJECT public: - typedef Qt3D::QResourcesManager<tst_ArrayResource, + typedef Qt3D::QResourceManager<tst_ArrayResource, int, 16, Qt3D::ArrayAllocatingPolicy, @@ -343,7 +343,7 @@ class tst_Thread2 : public QThread Q_OBJECT public: - typedef Qt3D::QResourcesManager<tst_ArrayResource, + typedef Qt3D::QResourceManager<tst_ArrayResource, int, 16, Qt3D::ArrayAllocatingPolicy, @@ -419,7 +419,7 @@ void tst_DynamicArrayPolicy::heavyDutyMultiThreadedAccessRelease() void tst_DynamicArrayPolicy::maximumNumberOfResources() { - Qt3D::QResourcesManager<tst_ArrayResource, uint> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint> manager; QList<tst_ArrayResource *> resources; QList<tHandle16> handles; diff --git a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/preallocatedarraypolicy.pro b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/preallocatedarraypolicy.pro index f21c0a140..636c155b2 100644 --- a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/preallocatedarraypolicy.pro +++ b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/preallocatedarraypolicy.pro @@ -4,4 +4,4 @@ TEMPLATE = app SOURCES += tst_preallocatedarraypolicy.cpp -QT += testlib 3dcore +QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp index ffdccf847..4801d8a3a 100644 --- a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp +++ b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> #include <QList> -#include <Qt3DCore/qresourcesmanager.h> +#include <Qt3DCore/private/qresourcemanager_p.h> #include <Qt3DCore/qhandle.h> class tst_PreallocatedArrayPolicy : public QObject @@ -81,9 +81,9 @@ typedef Qt3D::QHandle<tst_ArrayResource, 16> tHandle16; void tst_PreallocatedArrayPolicy::createResourcesManager() { - Qt3D::QResourcesManager<tst_ArrayResource, int, 16, Qt3D::ArrayPreallocationPolicy> manager16; - Qt3D::QResourcesManager<tst_ArrayResource, int, 4, Qt3D::ArrayPreallocationPolicy> manager4; - Qt3D::QResourcesManager<tst_ArrayResource, int, 8, Qt3D::ArrayPreallocationPolicy> manager8; + Qt3D::QResourceManager<tst_ArrayResource, int, 16, Qt3D::ArrayPreallocationPolicy> manager16; + Qt3D::QResourceManager<tst_ArrayResource, int, 4, Qt3D::ArrayPreallocationPolicy> manager4; + Qt3D::QResourceManager<tst_ArrayResource, int, 8, Qt3D::ArrayPreallocationPolicy> manager8; QVERIFY(manager16.maxResourcesEntries() == 65535); QVERIFY(manager8.maxResourcesEntries() == 255); QVERIFY(manager4.maxResourcesEntries() == 15); @@ -95,7 +95,7 @@ void tst_PreallocatedArrayPolicy::createResourcesManager() */ void tst_PreallocatedArrayPolicy::acquireResources() { - Qt3D::QResourcesManager<tst_ArrayResource, uint, 4, Qt3D::ArrayPreallocationPolicy> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint, 4, Qt3D::ArrayPreallocationPolicy> manager; QList<tHandle4> handles; @@ -115,7 +115,7 @@ void tst_PreallocatedArrayPolicy::acquireResources() void tst_PreallocatedArrayPolicy::getResources() { - Qt3D::QResourcesManager<tst_ArrayResource, int, 8, Qt3D::ArrayPreallocationPolicy> manager; + Qt3D::QResourceManager<tst_ArrayResource, int, 8, Qt3D::ArrayPreallocationPolicy> manager; QList<tst_ArrayResource *> resources; QList<tHandle8> handles; @@ -146,7 +146,7 @@ void tst_PreallocatedArrayPolicy::getResources() */ void tst_PreallocatedArrayPolicy::registerResourcesResize() { - Qt3D::QResourcesManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager; QList<tHandle16> handles; for (uint i = 0; i < 2; i++) { @@ -174,7 +174,7 @@ void tst_PreallocatedArrayPolicy::registerResourcesResize() */ void tst_PreallocatedArrayPolicy::removeResource() { - Qt3D::QResourcesManager<tst_ArrayResource, int, 16, Qt3D::ArrayPreallocationPolicy> manager; + Qt3D::QResourceManager<tst_ArrayResource, int, 16, Qt3D::ArrayPreallocationPolicy> manager; QList<tst_ArrayResource *> resources; QList<tHandle> handles; @@ -198,7 +198,7 @@ void tst_PreallocatedArrayPolicy::removeResource() */ void tst_PreallocatedArrayPolicy::resetResource() { - Qt3D::QResourcesManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager; QList<tst_ArrayResource *> resources; QList<tHandle16> handles; @@ -225,7 +225,7 @@ void tst_PreallocatedArrayPolicy::resetResource() void tst_PreallocatedArrayPolicy::lookupResource() { - Qt3D::QResourcesManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager; QList<tst_ArrayResource *> resources; QList<tHandle16> handles; @@ -250,7 +250,7 @@ void tst_PreallocatedArrayPolicy::lookupResource() void tst_PreallocatedArrayPolicy::releaseResource() { - Qt3D::QResourcesManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager; QList<tst_ArrayResource *> resources; for (int i = 0; i < 5; i++) { @@ -272,7 +272,7 @@ class tst_Thread : public QThread Q_OBJECT public: - typedef Qt3D::QResourcesManager<tst_ArrayResource, + typedef Qt3D::QResourceManager<tst_ArrayResource, int, 16, Qt3D::ArrayPreallocationPolicy, @@ -344,7 +344,7 @@ class tst_Thread2 : public QThread Q_OBJECT public: - typedef Qt3D::QResourcesManager<tst_ArrayResource, + typedef Qt3D::QResourceManager<tst_ArrayResource, int, 16, Qt3D::ArrayPreallocationPolicy, @@ -420,7 +420,7 @@ void tst_PreallocatedArrayPolicy::heavyDutyMultiThreadedAccessRelease() void tst_PreallocatedArrayPolicy::maximumNumberOfResources() { - Qt3D::QResourcesManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager; + Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager; QList<tst_ArrayResource *> resources; QList<tHandle16> handles; diff --git a/tests/auto/core/listresourcesmanager/listresourcesmanager.pro b/tests/auto/core/listresourcesmanager/listresourcesmanager.pro index fa062bcf2..ab1ea78db 100644 --- a/tests/auto/core/listresourcesmanager/listresourcesmanager.pro +++ b/tests/auto/core/listresourcesmanager/listresourcesmanager.pro @@ -4,4 +4,4 @@ TEMPLATE = app SOURCES += tst_listresourcesmanager.cpp -QT += testlib 3dcore +QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp index abf695093..0a9421b16 100644 --- a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp +++ b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp @@ -41,8 +41,8 @@ #include <QtTest/QtTest> #include <QList> -#include <Qt3DCore/qresourcesmanager.h> #include <Qt3DCore/qhandle.h> +#include <Qt3DCore/private/qresourcemanager_p.h> class tst_ListResourcesManager : public QObject { @@ -81,9 +81,9 @@ typedef Qt3D::QHandle<tst_ListResource, 16> tHandle16; void tst_ListResourcesManager::createResourcesManager() { - Qt3D::QResourcesManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager16; - Qt3D::QResourcesManager<tst_ListResource, int, 4, Qt3D::ListAllocatingPolicy> manager4; - Qt3D::QResourcesManager<tst_ListResource, int, 8, Qt3D::ListAllocatingPolicy> manager8; + Qt3D::QResourceManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager16; + Qt3D::QResourceManager<tst_ListResource, int, 4, Qt3D::ListAllocatingPolicy> manager4; + Qt3D::QResourceManager<tst_ListResource, int, 8, Qt3D::ListAllocatingPolicy> manager8; QVERIFY(manager16.maxResourcesEntries() == 65535); QVERIFY(manager8.maxResourcesEntries() == 255); @@ -96,7 +96,7 @@ void tst_ListResourcesManager::createResourcesManager() */ void tst_ListResourcesManager::acquireResources() { - Qt3D::QResourcesManager<tst_ListResource, int, 4, Qt3D::ListAllocatingPolicy> manager; + Qt3D::QResourceManager<tst_ListResource, int, 4, Qt3D::ListAllocatingPolicy> manager; QList<tHandle4> handles; @@ -116,7 +116,7 @@ void tst_ListResourcesManager::acquireResources() void tst_ListResourcesManager::getResources() { - Qt3D::QResourcesManager<tst_ListResource, int, 8, Qt3D::ListAllocatingPolicy> manager; + Qt3D::QResourceManager<tst_ListResource, int, 8, Qt3D::ListAllocatingPolicy> manager; QList<tst_ListResource *> resources; QList<tHandle8> handles; @@ -147,7 +147,7 @@ void tst_ListResourcesManager::getResources() */ void tst_ListResourcesManager::registerResourcesResize() { - Qt3D::QResourcesManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager; + Qt3D::QResourceManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager; QList<tHandle16> handles; for (uint i = 0; i < 2; i++) { @@ -175,7 +175,7 @@ void tst_ListResourcesManager::registerResourcesResize() */ void tst_ListResourcesManager::removeResource() { - Qt3D::QResourcesManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager; + Qt3D::QResourceManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager; QList<tst_ListResource *> resources; QList<tHandle> handles; @@ -199,7 +199,7 @@ void tst_ListResourcesManager::removeResource() */ void tst_ListResourcesManager::resetResource() { - Qt3D::QResourcesManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager; + Qt3D::QResourceManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager; QList<tst_ListResource *> resources; QList<tHandle16> handles; @@ -226,7 +226,7 @@ void tst_ListResourcesManager::resetResource() void tst_ListResourcesManager::lookupResource() { - Qt3D::QResourcesManager<tst_ListResource, uint, 16, Qt3D::ListAllocatingPolicy> manager; + Qt3D::QResourceManager<tst_ListResource, uint, 16, Qt3D::ListAllocatingPolicy> manager; QList<tst_ListResource *> resources; QList<tHandle16> handles; @@ -251,7 +251,7 @@ void tst_ListResourcesManager::lookupResource() void tst_ListResourcesManager::releaseResource() { - Qt3D::QResourcesManager<tst_ListResource, uint, 16, Qt3D::ListAllocatingPolicy> manager; + Qt3D::QResourceManager<tst_ListResource, uint, 16, Qt3D::ListAllocatingPolicy> manager; QList<tst_ListResource *> resources; for (int i = 0; i < 5; i++) { @@ -273,7 +273,7 @@ class tst_Thread : public QThread Q_OBJECT public: - typedef Qt3D::QResourcesManager<tst_ListResource, + typedef Qt3D::QResourceManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy, @@ -344,7 +344,7 @@ class tst_Thread2 : public QThread Q_OBJECT public: - typedef Qt3D::QResourcesManager<tst_ListResource, + typedef Qt3D::QResourceManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy, @@ -420,7 +420,7 @@ void tst_ListResourcesManager::heavyDutyMultiThreadedAccessRelease() void tst_ListResourcesManager::maximumNumberOfResources() { - Qt3D::QResourcesManager<tst_ListResource, uint, 16, Qt3D::ListAllocatingPolicy> manager; + Qt3D::QResourceManager<tst_ListResource, uint, 16, Qt3D::ListAllocatingPolicy> manager; QList<tst_ListResource *> resources; QList<tHandle16> handles; diff --git a/tests/benchmarks/core/qresourcesmanager/arraypolicy/arraypolicy.pro b/tests/benchmarks/core/qresourcesmanager/arraypolicy/arraypolicy.pro index 2195d5e4f..2c54ab63c 100644 --- a/tests/benchmarks/core/qresourcesmanager/arraypolicy/arraypolicy.pro +++ b/tests/benchmarks/core/qresourcesmanager/arraypolicy/arraypolicy.pro @@ -1,6 +1,6 @@ TARGET = tst_bench_arraypolicy TEMPLATE = app -QT += testlib 3dcore +QT += testlib 3dcore 3dcore-private SOURCES += tst_bench_arraypolicy.cpp diff --git a/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp b/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp index 19580be11..02ea5284d 100644 --- a/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp +++ b/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> #include <QMatrix4x4> -#include <Qt3DCore/QResourcesManager> +#include <Qt3DCore/private/qresourcemanager_p.h> class tst_ArrayPolicy : public QObject { diff --git a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/qresourcesmanager.pro b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/qresourcesmanager.pro index ab2c9fc4c..12eead182 100644 --- a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/qresourcesmanager.pro +++ b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/qresourcesmanager.pro @@ -1,6 +1,6 @@ TARGET = tst_bench_qresourcesmanager TEMPLATE = app -QT += testlib 3dcore +QT += testlib 3dcore 3dcore-private SOURCES += tst_bench_qresourcesmanager.cpp diff --git a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp index 723e400b4..dfa64ddb8 100644 --- a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp +++ b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp @@ -41,11 +41,11 @@ #include <QtTest/QtTest> #include <QMatrix4x4> -#include <Qt3DCore/qresourcesmanager.h> #include <Qt3DCore/qhandle.h> +#include <Qt3DCore/private/qresourcemanager_p.h> #include <ctime> -class tst_QResourcesManager : public QObject +class tst_QResourceManager : public QObject { Q_OBJECT private Q_SLOTS: @@ -81,7 +81,7 @@ public: template<typename Resource> void benchmarkAllocateResources() { - Qt3D::QResourcesManager<Resource, int, 16> manager; + Qt3D::QResourceManager<Resource, int, 16> manager; volatile Resource *c; QBENCHMARK_ONCE { @@ -95,7 +95,7 @@ void benchmarkAllocateResources() template<typename Resource> void benchmarkAccessResources() { - Qt3D::QResourcesManager<Resource, int, 16> manager; + Qt3D::QResourceManager<Resource, int, 16> manager; const int max = (1 << 16) - 1; QVector<Qt3D::QHandle<Resource> > handles(max); for (int i = 0; i < max; i++) @@ -111,7 +111,7 @@ void benchmarkAccessResources() template<typename Resource> void benchmarkRandomAccessResource() { - Qt3D::QResourcesManager<Resource, int, 16> manager; + Qt3D::QResourceManager<Resource, int, 16> manager; const int max = (1 << 16) - 1; QVector<Qt3D::QHandle<Resource> > handles(max); for (int i = 0; i < max; i++) @@ -130,7 +130,7 @@ void benchmarkRandomAccessResource() { template<typename Resource> void benchmarkLookupResources() { - Qt3D::QResourcesManager<Resource, int, 16> manager; + Qt3D::QResourceManager<Resource, int, 16> manager; const int max = (1 << 16) - 1; for (int i = 0; i < max; i++) manager.getOrCreateResource(i); @@ -146,7 +146,7 @@ void benchmarkLookupResources() template<typename Resource> void benchmarkRandomLookupResources() { - Qt3D::QResourcesManager<Resource, int, 16> manager; + Qt3D::QResourceManager<Resource, int, 16> manager; const int max = (1 << 16) - 1; QVector<int> resourcesIndices(max); for (int i = 0; i < max; i++) { @@ -166,7 +166,7 @@ void benchmarkRandomLookupResources() template<typename Resource> void benchmarkReleaseResources() { - Qt3D::QResourcesManager<Resource, int, 16> manager; + Qt3D::QResourceManager<Resource, int, 16> manager; const int max = (1 << 16) - 1; QVector<Qt3D::QHandle<Resource> > handles(max); for (int i = 0; i < max; i++) @@ -177,66 +177,66 @@ void benchmarkReleaseResources() } } -void tst_QResourcesManager::benchmarkAllocateSmallResources() +void tst_QResourceManager::benchmarkAllocateSmallResources() { benchmarkAllocateResources<tst_SmallArrayResource>(); } -void tst_QResourcesManager::benchmarkAccessSmallResources() +void tst_QResourceManager::benchmarkAccessSmallResources() { benchmarkAccessResources<tst_SmallArrayResource>(); } -void tst_QResourcesManager::benchmarkLookupSmallResources() +void tst_QResourceManager::benchmarkLookupSmallResources() { benchmarkLookupResources<tst_SmallArrayResource>(); } -void tst_QResourcesManager::benchmarRandomAccessSmallResources() +void tst_QResourceManager::benchmarRandomAccessSmallResources() { benchmarkRandomAccessResource<tst_SmallArrayResource>(); } -void tst_QResourcesManager::benchmarkRandomLookupSmallResources() +void tst_QResourceManager::benchmarkRandomLookupSmallResources() { benchmarkRandomLookupResources<tst_SmallArrayResource>(); } -void tst_QResourcesManager::benchmarkReleaseSmallResources() +void tst_QResourceManager::benchmarkReleaseSmallResources() { benchmarkReleaseResources<tst_SmallArrayResource>(); } -void tst_QResourcesManager::benchmarkAllocateBigResources() +void tst_QResourceManager::benchmarkAllocateBigResources() { benchmarkAllocateResources<tst_BigArrayResource>(); } -void tst_QResourcesManager::benchmarkAccessBigResources() +void tst_QResourceManager::benchmarkAccessBigResources() { benchmarkAccessResources<tst_BigArrayResource>(); } -void tst_QResourcesManager::benchmarRandomAccessBigResources() +void tst_QResourceManager::benchmarRandomAccessBigResources() { benchmarkRandomAccessResource<tst_BigArrayResource>(); } -void tst_QResourcesManager::benchmarkLookupBigResources() +void tst_QResourceManager::benchmarkLookupBigResources() { benchmarkLookupResources<tst_BigArrayResource>(); } -void tst_QResourcesManager::benchmarkRandomLookupBigResources() +void tst_QResourceManager::benchmarkRandomLookupBigResources() { benchmarkRandomLookupResources<tst_BigArrayResource>(); } -void tst_QResourcesManager::benchmarkReleaseBigResources() +void tst_QResourceManager::benchmarkReleaseBigResources() { benchmarkReleaseResources<tst_BigArrayResource>(); } -QTEST_APPLESS_MAIN(tst_QResourcesManager) +QTEST_APPLESS_MAIN(tst_QResourceManager) #include "tst_bench_qresourcesmanager.moc" |