From cd467d5ffc6eaaa7da089ab4acc5284cd11d1109 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 6 Sep 2017 13:17:54 +0200
Subject: Get rid of the AllocationPolicy template argument in the
 ResourceManager

We always use the same policy anyway.

Change-Id: I3349b8c19ce0e6239b140dfac7ba66f8dda1b9be
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/animation/backend/managers_p.h                | 15 +++----
 src/core/resources/qresourcemanager_p.h           | 16 +++-----
 src/input/backend/inputmanagers_p.h               | 48 ++++++++---------------
 src/logic/managers_p.h                            |  3 +-
 src/plugins/renderplugins/scene2d/scene2dplugin.h |  1 -
 src/render/backend/managers_p.h                   | 28 -------------
 src/render/geometry/buffermanager_p.h             |  1 -
 src/render/geometry/geometryrenderermanager_p.h   |  1 -
 src/render/io/scenemanager.cpp                    |  1 -
 src/render/io/scenemanager_p.h                    |  1 -
 src/render/materialsystem/techniquemanager_p.h    |  1 -
 11 files changed, 28 insertions(+), 88 deletions(-)

(limited to 'src')

diff --git a/src/animation/backend/managers_p.h b/src/animation/backend/managers_p.h
index f99ed0698..3c670a8d2 100644
--- a/src/animation/backend/managers_p.h
+++ b/src/animation/backend/managers_p.h
@@ -70,8 +70,7 @@ class ClipBlendNode;
 class AnimationClipLoaderManager : public Qt3DCore::QResourceManager<
         AnimationClip,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     AnimationClipLoaderManager() {}
@@ -80,8 +79,7 @@ public:
 class ClipAnimatorManager : public Qt3DCore::QResourceManager<
         ClipAnimator,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     ClipAnimatorManager() {}
@@ -90,8 +88,7 @@ public:
 class BlendedClipAnimatorManager : public Qt3DCore::QResourceManager<
         BlendedClipAnimator,
         Qt3DCore::QNodeId,
-        12,
-        Qt3DCore::ArrayAllocatingPolicy>
+        12>
 {
 public:
     BlendedClipAnimatorManager() {}
@@ -100,8 +97,7 @@ public:
 class ChannelMappingManager : public Qt3DCore::QResourceManager<
         ChannelMapping,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     ChannelMappingManager() {}
@@ -110,8 +106,7 @@ public:
 class ChannelMapperManager : public Qt3DCore::QResourceManager<
         ChannelMapper,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     ChannelMapperManager() {}
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h
index 85233c97f..4cb2a38af 100644
--- a/src/core/resources/qresourcemanager_p.h
+++ b/src/core/resources/qresourcemanager_p.h
@@ -346,28 +346,25 @@ private:
 
 #ifndef QT_NO_DEBUG_STREAM
 template <typename ValueType, typename KeyType, uint INDEXBITS,
-          template <typename, uint> class AllocatingPolicy,
           template <class> class LockingPolicy
           >
 class QResourceManager;
 
 template <typename ValueType, typename KeyType, uint INDEXBITS = 16,
-          template <typename, uint> class AllocatingPolicy = ArrayAllocatingPolicy,
           template <class> class LockingPolicy = NonLockingPolicy
           >
-QDebug operator<<(QDebug dbg, const QResourceManager<ValueType, KeyType, INDEXBITS, AllocatingPolicy, LockingPolicy> &manager);
+QDebug operator<<(QDebug dbg, const QResourceManager<ValueType, KeyType, INDEXBITS, LockingPolicy> &manager);
 #endif
 
 template <typename ValueType, typename KeyType, uint INDEXBITS = 16,
-          template <typename, uint> class AllocatingPolicy = ArrayAllocatingPolicy,
           template <class> class LockingPolicy = NonLockingPolicy
           >
 class QResourceManager
-        : public AllocatingPolicy<ValueType, INDEXBITS>
-        , public LockingPolicy< QResourceManager<ValueType, KeyType, INDEXBITS, AllocatingPolicy, LockingPolicy> >
+        : public ArrayAllocatingPolicy<ValueType, INDEXBITS>
+        , public LockingPolicy< QResourceManager<ValueType, KeyType, INDEXBITS, LockingPolicy> >
 {
 public:
-    typedef AllocatingPolicy<ValueType, INDEXBITS> Allocator;
+    typedef ArrayAllocatingPolicy<ValueType, INDEXBITS> Allocator;
     typedef QHandle<ValueType, INDEXBITS> Handle;
 
     QResourceManager() :
@@ -474,15 +471,14 @@ private:
         Allocator::releaseResource(handle);
     }
 
-    friend QDebug operator<< <>(QDebug dbg, const QResourceManager<ValueType, KeyType, INDEXBITS, AllocatingPolicy, LockingPolicy> &manager);
+    friend QDebug operator<< <>(QDebug dbg, const QResourceManager<ValueType, KeyType, INDEXBITS, LockingPolicy> &manager);
 };
 
 #ifndef QT_NO_DEBUG_STREAM
 template <typename ValueType, typename KeyType, uint INDEXBITS,
-          template <typename, uint> class AllocatingPolicy,
           template <class> class LockingPolicy
           >
-QDebug operator<<(QDebug dbg, const QResourceManager<ValueType, KeyType, INDEXBITS, AllocatingPolicy, LockingPolicy> &manager)
+QDebug operator<<(QDebug dbg, const QResourceManager<ValueType, KeyType, INDEXBITS, LockingPolicy> &manager)
 {
     QDebugStateSaver saver(dbg);
     dbg << "Contains" << manager.count() << "items" << "of a maximum" << manager.maximumSize() << endl;
diff --git a/src/input/backend/inputmanagers_p.h b/src/input/backend/inputmanagers_p.h
index a0cb127b1..956b0ab8b 100644
--- a/src/input/backend/inputmanagers_p.h
+++ b/src/input/backend/inputmanagers_p.h
@@ -80,8 +80,7 @@ namespace Input {
 class KeyboardInputManager : public Qt3DCore::QResourceManager<
         KeyboardHandler,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     KeyboardInputManager() {}
@@ -90,8 +89,7 @@ public:
 class KeyboardDeviceManager : public Qt3DCore::QResourceManager<
         KeyboardDevice,
         Qt3DCore::QNodeId,
-        8,
-        Qt3DCore::ArrayAllocatingPolicy>
+        8>
 {
 public:
     KeyboardDeviceManager() {}
@@ -100,8 +98,7 @@ public:
 class MouseDeviceManager : public Qt3DCore::QResourceManager<
         MouseDevice,
         Qt3DCore::QNodeId,
-        8,
-        Qt3DCore::ArrayAllocatingPolicy>
+        8>
 {
 public:
     MouseDeviceManager() {}
@@ -110,8 +107,7 @@ public:
 class MouseInputManager : public Qt3DCore::QResourceManager<
         MouseHandler,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     MouseInputManager() {}
@@ -120,8 +116,7 @@ public:
 class AxisManager : public Qt3DCore::QResourceManager<
         Axis,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     AxisManager() {}
@@ -130,8 +125,7 @@ public:
 class AxisSettingManager : public Qt3DCore::QResourceManager<
         AxisSetting,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     AxisSettingManager() {}
@@ -140,8 +134,7 @@ public:
 class ActionManager : public Qt3DCore::QResourceManager<
         Action,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     ActionManager() {}
@@ -150,8 +143,7 @@ public:
 class ActionInputManager : public Qt3DCore::QResourceManager<
         ActionInput,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     ActionInputManager() {}
@@ -160,8 +152,7 @@ public:
 class AnalogAxisInputManager : public Qt3DCore::QResourceManager<
         AnalogAxisInput,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     AnalogAxisInputManager() {}
@@ -170,8 +161,7 @@ public:
 class ButtonAxisInputManager : public Qt3DCore::QResourceManager<
         ButtonAxisInput,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     ButtonAxisInputManager() {}
@@ -180,8 +170,7 @@ public:
 class InputChordManager : public Qt3DCore::QResourceManager<
         InputChord,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     InputChordManager() {}
@@ -190,8 +179,7 @@ public:
 class InputSequenceManager : public Qt3DCore::QResourceManager<
         InputSequence,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     InputSequenceManager() {}
@@ -200,8 +188,7 @@ public:
 class LogicalDeviceManager : public Qt3DCore::QResourceManager<
         LogicalDevice,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     LogicalDeviceManager() {}
@@ -217,8 +204,7 @@ private:
 class GenericDeviceBackendNodeManager : public Qt3DCore::QResourceManager<
         GenericDeviceBackendNode,
         Qt3DCore::QNodeId,
-        8,
-        Qt3DCore::ArrayAllocatingPolicy>
+        8>
 {
 public:
     GenericDeviceBackendNodeManager() {}
@@ -227,8 +213,7 @@ public:
 class Q_AUTOTEST_EXPORT PhysicalDeviceProxyManager : public Qt3DCore::QResourceManager<
         PhysicalDeviceProxy,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     PhysicalDeviceProxyManager() {}
@@ -243,8 +228,7 @@ private:
 class AxisAccumulatorManager : public Qt3DCore::QResourceManager<
         AxisAccumulator,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     AxisAccumulatorManager() {}
diff --git a/src/logic/managers_p.h b/src/logic/managers_p.h
index 6194d260a..3d48aab24 100644
--- a/src/logic/managers_p.h
+++ b/src/logic/managers_p.h
@@ -65,8 +65,7 @@ namespace Logic {
 class HandlerManager : public Qt3DCore::QResourceManager<
         Handler,
         Qt3DCore::QNodeId,
-        16,
-        Qt3DCore::ArrayAllocatingPolicy>
+        16>
 {
 public:
     HandlerManager() {}
diff --git a/src/plugins/renderplugins/scene2d/scene2dplugin.h b/src/plugins/renderplugins/scene2d/scene2dplugin.h
index f19093c7e..3b4471d55 100644
--- a/src/plugins/renderplugins/scene2d/scene2dplugin.h
+++ b/src/plugins/renderplugins/scene2d/scene2dplugin.h
@@ -68,7 +68,6 @@ class Scene2DNodeManager : public Qt3DCore::QResourceManager<
         Render::Quick::Scene2D,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::ObjectLevelLockingPolicy>
 {
 };
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index 53d5e61c0..c5af93b8d 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -90,7 +90,6 @@ class AttachmentManager : public Qt3DCore::QResourceManager<
         RenderTargetOutput,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -101,7 +100,6 @@ class CameraManager : public Qt3DCore::QResourceManager<
         CameraLens,
         Qt3DCore::QNodeId,
         8,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -112,7 +110,6 @@ class FilterKeyManager : public Qt3DCore::QResourceManager<
         FilterKey,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 
 {
@@ -124,7 +121,6 @@ class EffectManager : public Qt3DCore::QResourceManager<
         Effect,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -135,7 +131,6 @@ class Q_AUTOTEST_EXPORT EntityManager : public Qt3DCore::QResourceManager<
         Entity,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -170,7 +165,6 @@ class LayerManager : public Qt3DCore::QResourceManager<
         Layer,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -181,7 +175,6 @@ class LevelOfDetailManager : public Qt3DCore::QResourceManager<
         LevelOfDetail,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -192,7 +185,6 @@ class MaterialManager : public Qt3DCore::QResourceManager<
         Material,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -203,7 +195,6 @@ class MatrixManager : public Qt3DCore::QResourceManager<
         QMatrix4x4,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -214,7 +205,6 @@ class ShaderManager : public Qt3DCore::QResourceManager<
         Shader,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -225,7 +215,6 @@ class TextureManager : public Qt3DCore::QResourceManager<
         Texture,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -251,7 +240,6 @@ class TransformManager : public Qt3DCore::QResourceManager<
         Transform,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -262,7 +250,6 @@ class VAOManager : public Qt3DCore::QResourceManager<
         OpenGLVertexArrayObject,
         VAOIdentifier,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -273,7 +260,6 @@ class RenderTargetManager : public Qt3DCore::QResourceManager<
         RenderTarget,
         Qt3DCore::QNodeId,
         8,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -284,7 +270,6 @@ class RenderPassManager : public Qt3DCore::QResourceManager<
         RenderPass,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -296,7 +281,6 @@ class ParameterManager : public Qt3DCore::QResourceManager<
         Parameter,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -307,7 +291,6 @@ class ShaderDataManager : public Qt3DCore::QResourceManager<
         ShaderData,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -318,7 +301,6 @@ class GLBufferManager : public Qt3DCore::QResourceManager<
         GLBuffer,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -327,7 +309,6 @@ class TextureImageManager : public Qt3DCore::QResourceManager<
         TextureImage,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -336,7 +317,6 @@ class AttributeManager : public Qt3DCore::QResourceManager<
         Attribute,
         Qt3DCore::QNodeId,
         20,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -345,7 +325,6 @@ class GeometryManager : public Qt3DCore::QResourceManager<
         Geometry,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -354,7 +333,6 @@ class ObjectPickerManager : public Qt3DCore::QResourceManager<
         ObjectPicker,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -364,7 +342,6 @@ class BoundingVolumeDebugManager : public Qt3DCore::QResourceManager<
         BoundingVolumeDebug,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::ObjectLevelLockingPolicy>
 {
 };
@@ -374,7 +351,6 @@ class LightManager : public Qt3DCore::QResourceManager<
         Light,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -385,7 +361,6 @@ class EnvironmentLightManager : public Qt3DCore::QResourceManager<
         EnvironmentLight,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -396,7 +371,6 @@ class ComputeCommandManager : public Qt3DCore::QResourceManager<
         ComputeCommand,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -407,12 +381,10 @@ class RenderStateManager : public Qt3DCore::QResourceManager<
         RenderStateNode,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 };
 
-
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h
index 3eecb3664..ed3563876 100644
--- a/src/render/geometry/buffermanager_p.h
+++ b/src/render/geometry/buffermanager_p.h
@@ -64,7 +64,6 @@ class Q_AUTOTEST_EXPORT BufferManager : public Qt3DCore::QResourceManager<
         Buffer,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
diff --git a/src/render/geometry/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h
index 4dea63862..e3b313569 100644
--- a/src/render/geometry/geometryrenderermanager_p.h
+++ b/src/render/geometry/geometryrenderermanager_p.h
@@ -64,7 +64,6 @@ class Q_AUTOTEST_EXPORT GeometryRendererManager : public Qt3DCore::QResourceMana
         GeometryRenderer,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp
index d59391a87..8e6af8c40 100644
--- a/src/render/io/scenemanager.cpp
+++ b/src/render/io/scenemanager.cpp
@@ -47,7 +47,6 @@ namespace Render {
 SceneManager::SceneManager() : Qt3DCore::QResourceManager<Scene,
                                                 Qt3DCore::QNodeId,
                                                 8,
-                                                Qt3DCore::ArrayAllocatingPolicy,
                                                 Qt3DCore::ObjectLevelLockingPolicy>()
 {
 }
diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h
index 164f82590..941b90a4d 100644
--- a/src/render/io/scenemanager_p.h
+++ b/src/render/io/scenemanager_p.h
@@ -69,7 +69,6 @@ class Q_AUTOTEST_EXPORT SceneManager : public Qt3DCore::QResourceManager<
         Scene,
         Qt3DCore::QNodeId,
         8,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
diff --git a/src/render/materialsystem/techniquemanager_p.h b/src/render/materialsystem/techniquemanager_p.h
index 5c86741c3..5b390f94b 100644
--- a/src/render/materialsystem/techniquemanager_p.h
+++ b/src/render/materialsystem/techniquemanager_p.h
@@ -64,7 +64,6 @@ class Q_AUTOTEST_EXPORT TechniqueManager : public Qt3DCore::QResourceManager<
         Technique,
         Qt3DCore::QNodeId,
         16,
-        Qt3DCore::ArrayAllocatingPolicy,
         Qt3DCore::NonLockingPolicy>
 {
 public:
-- 
cgit v1.2.3