QAbstractResourcesManager refactored to use a policy based design

Two policies have been added, AllocatingPolicy and LockingPolicy.
The AllocatingPolicy removes the need for subclassing QAbstractManager to
handle different allocating scheme. This is now handled through a dedicated
AllocatingPolicty that can be easily set by setting a template parameter. The
default AllocationPolicy is ArrayAllocatingPolicy.
QArrayResourcesManager and QListResourcesManager have therefore been removed
and replaced by those. Tests have also been updated.
The second policy, LockingPolicy provides a way to specify the locking
behavior  to be used by the QAbstractResourcesManager. The default is
NonLockingPolicy which doesn't lock anything. The other LockingPolicy provides
locking around a QReadWriteLocker.

The QAbstractResourcesManager class should be renamed to QResourcesManager.

Change-Id: Ifecf7f1bcd5205eff78f9200b4dee004bee28af4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 20 insertions, 20 deletions

diff --git a/tests/auto/core/arrayresourcesmanager/tst_arrayresourcesmanager.cpp b/tests/auto/core/arrayresourcesmanager/tst_arrayresourcesmanager.cpp
index 8b9e01986..3ee85a71b 100644
--- a/tests/auto/core/arrayresourcesmanager/tst_arrayresourcesmanager.cpp
+++ b/tests/auto/core/arrayresourcesmanager/tst_arrayresourcesmanager.cpp
@@ -41,7 +41,7 @@
 
 #include <QtTest/QtTest>
 #include <QList>
-#include <Qt3DCore/qarrayresourcesmanager.h>
+#include <Qt3DCore/qabstractresourcesmanager.h>
 #include <Qt3DCore/qhandle.h>
 
 class tst_ArrayResourcesManager : public QObject
@@ -77,9 +77,9 @@ typedef Qt3D::QHandle<tst_ArrayResource, 16> tHandle16;
 
 void tst_ArrayResourcesManager::createResourcesManager()
 {
-    Qt3D::QArrayResourcesManager<tst_ArrayResource, int, 16> manager16;
-    Qt3D::QArrayResourcesManager<tst_ArrayResource, int, 4> manager4;
-    Qt3D::QArrayResourcesManager<tst_ArrayResource, int, 8> manager8;
+    Qt3D::QAbstractResourcesManager<tst_ArrayResource, int, 16> manager16;
+    Qt3D::QAbstractResourcesManager<tst_ArrayResource, int, 4> manager4;
+    Qt3D::QAbstractResourcesManager<tst_ArrayResource, int, 8> manager8;
     QVERIFY(manager16.maxResourcesEntries() == 65536);
     QVERIFY(manager8.maxResourcesEntries() == 256);
     QVERIFY(manager4.maxResourcesEntries() == 16);
@@ -91,7 +91,7 @@ void tst_ArrayResourcesManager::createResourcesManager()
  */
 void tst_ArrayResourcesManager::acquireResources()
 {
-    Qt3D::QArrayResourcesManager<tst_ArrayResource, uint, 4> manager;
+    Qt3D::QAbstractResourcesManager<tst_ArrayResource, uint, 4> manager;
 
     QList<tHandle4> handles;
 
@@ -111,7 +111,7 @@ void tst_ArrayResourcesManager::acquireResources()
 void tst_ArrayResourcesManager::getResources()
 {
 
-    Qt3D::QArrayResourcesManager<tst_ArrayResource, int, 8> manager;
+    Qt3D::QAbstractResourcesManager<tst_ArrayResource, int, 8> manager;
     QList<tst_ArrayResource *> resources;
     QList<tHandle8> handles;
 
@@ -142,7 +142,7 @@ void tst_ArrayResourcesManager::getResources()
  */
 void tst_ArrayResourcesManager::registerResourcesResize()
 {
-    Qt3D::QArrayResourcesManager<tst_ArrayResource, uint, 16> manager;
+    Qt3D::QAbstractResourcesManager<tst_ArrayResource, uint, 16> manager;
     QList<tHandle16> handles;
 
     for (uint i = 0; i < 2; i++) {
@@ -170,7 +170,7 @@ void tst_ArrayResourcesManager::registerResourcesResize()
  */
 void tst_ArrayResourcesManager::removeResource()
 {
-    Qt3D::QArrayResourcesManager<tst_ArrayResource, int> manager;
+    Qt3D::QAbstractResourcesManager<tst_ArrayResource, int> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle> handles;
@@ -194,7 +194,7 @@ void tst_ArrayResourcesManager::removeResource()
  */
 void tst_ArrayResourcesManager::resetResource()
 {
-    Qt3D::QArrayResourcesManager<tst_ArrayResource, uint> manager;
+    Qt3D::QAbstractResourcesManager<tst_ArrayResource, uint> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;
@@ -221,7 +221,7 @@ void tst_ArrayResourcesManager::resetResource()
 
 void tst_ArrayResourcesManager::lookupResource()
 {
-    Qt3D::QArrayResourcesManager<tst_ArrayResource, uint> manager;
+    Qt3D::QAbstractResourcesManager<tst_ArrayResource, uint> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;
diff --git a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp
index 9166d3d80..5e8616a4a 100644
--- a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp
+++ b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp
@@ -41,7 +41,7 @@
 
 #include <QtTest/QtTest>
 #include <QList>
-#include <Qt3DCore/qlistresourcesmanager.h>
+#include <Qt3DCore/qabstractresourcesmanager.h>
 #include <Qt3DCore/qhandle.h>
 
 class tst_ListResourcesManager : public QObject
@@ -77,9 +77,9 @@ typedef Qt3D::QHandle<tst_ListResource, 16> tHandle16;
 
 void tst_ListResourcesManager::createResourcesManager()
 {
-    Qt3D::QListResourcesManager<tst_ListResource, int, 16> manager16;
-    Qt3D::QListResourcesManager<tst_ListResource, int, 4> manager4;
-    Qt3D::QListResourcesManager<tst_ListResource, int, 8> manager8;
+    Qt3D::QAbstractResourcesManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager16;
+    Qt3D::QAbstractResourcesManager<tst_ListResource, int, 4, Qt3D::ListAllocatingPolicy> manager4;
+    Qt3D::QAbstractResourcesManager<tst_ListResource, int, 8, Qt3D::ListAllocatingPolicy> manager8;
 
     QVERIFY(manager16.maxResourcesEntries() == 65536);
     QVERIFY(manager8.maxResourcesEntries() == 256);
@@ -92,7 +92,7 @@ void tst_ListResourcesManager::createResourcesManager()
  */
 void tst_ListResourcesManager::acquireResources()
 {
-    Qt3D::QListResourcesManager<tst_ListResource, int, 4> manager;
+    Qt3D::QAbstractResourcesManager<tst_ListResource, int, 4, Qt3D::ListAllocatingPolicy> manager;
 
     QList<tHandle4> handles;
 
@@ -112,7 +112,7 @@ void tst_ListResourcesManager::acquireResources()
 void tst_ListResourcesManager::getResources()
 {
 
-    Qt3D::QListResourcesManager<tst_ListResource, int, 8> manager;
+    Qt3D::QAbstractResourcesManager<tst_ListResource, int, 8, Qt3D::ListAllocatingPolicy> manager;
     QList<tst_ListResource *> resources;
     QList<tHandle8> handles;
 
@@ -143,7 +143,7 @@ void tst_ListResourcesManager::getResources()
  */
 void tst_ListResourcesManager::registerResourcesResize()
 {
-    Qt3D::QListResourcesManager<tst_ListResource, int, 16> manager;
+    Qt3D::QAbstractResourcesManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager;
     QList<tHandle16> handles;
 
     for (uint i = 0; i < 2; i++) {
@@ -171,7 +171,7 @@ void tst_ListResourcesManager::registerResourcesResize()
  */
 void tst_ListResourcesManager::removeResource()
 {
-    Qt3D::QListResourcesManager<tst_ListResource, int> manager;
+    Qt3D::QAbstractResourcesManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager;
 
     QList<tst_ListResource *> resources;
     QList<tHandle> handles;
@@ -195,7 +195,7 @@ void tst_ListResourcesManager::removeResource()
  */
 void tst_ListResourcesManager::resetResource()
 {
-    Qt3D::QListResourcesManager<tst_ListResource, int> manager;
+    Qt3D::QAbstractResourcesManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager;
 
     QList<tst_ListResource *> resources;
     QList<tHandle16> handles;
@@ -222,7 +222,7 @@ void tst_ListResourcesManager::resetResource()
 
 void tst_ListResourcesManager::lookupResource()
 {
-    Qt3D::QListResourcesManager<tst_ListResource, uint> manager;
+    Qt3D::QAbstractResourcesManager<tst_ListResource, uint, 16, Qt3D::ListAllocatingPolicy> manager;
 
     QList<tst_ListResource *> resources;
     QList<tHandle16> handles;