Get rid of the INDEXBITS template argument for QHandle

It's not required anymore, as the resource manager can
grow as needed.

Change-Id: If509de7f2ef90e1af9729d8fc60d7ecb08ede687
Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 32 insertions, 48 deletions

diff --git a/src/input/backend/handle_types_p.h b/src/input/backend/handle_types_p.h
index c132fdc99..cfe4e66b4 100644
--- a/src/input/backend/handle_types_p.h
+++ b/src/input/backend/handle_types_p.h
@@ -75,22 +75,22 @@ class GenericDeviceBackendNode;
 class PhysicalDeviceProxy;
 class AxisAccumulator;
 
-typedef Qt3DCore::QHandle<KeyboardDevice, 8> HKeyboardDevice;
-typedef Qt3DCore::QHandle<KeyboardHandler, 16> HKeyboardHandler;
-typedef Qt3DCore::QHandle<MouseHandler, 16> HMouseHandler;
-typedef Qt3DCore::QHandle<MouseDevice, 8> HMouseDevice;
-typedef Qt3DCore::QHandle<Axis, 16> HAxis;
-typedef Qt3DCore::QHandle<AxisActionHandler, 16> HAxisActionHandler;
-typedef Qt3DCore::QHandle<AxisSetting, 16> HAxisSetting;
-typedef Qt3DCore::QHandle<Action, 16> HAction;
-typedef Qt3DCore::QHandle<AbstractAxisInput, 16> HAxisInput;
-typedef Qt3DCore::QHandle<ActionInput, 16> HActionInput;
-typedef Qt3DCore::QHandle<InputSequence, 16> HInputSequence;
-typedef Qt3DCore::QHandle<InputChord, 16> HInputChord;
-typedef Qt3DCore::QHandle<LogicalDevice, 16> HLogicalDevice;
-typedef Qt3DCore::QHandle<GenericDeviceBackendNode, 8> HGenericDeviceBackendNode;
-typedef Qt3DCore::QHandle<PhysicalDeviceProxy, 16> HPhysicalDeviceProxy;
-typedef Qt3DCore::QHandle<AxisAccumulator, 16> HAxisAccumulator;
+typedef Qt3DCore::QHandle<KeyboardDevice> HKeyboardDevice;
+typedef Qt3DCore::QHandle<KeyboardHandler> HKeyboardHandler;
+typedef Qt3DCore::QHandle<MouseHandler> HMouseHandler;
+typedef Qt3DCore::QHandle<MouseDevice> HMouseDevice;
+typedef Qt3DCore::QHandle<Axis> HAxis;
+typedef Qt3DCore::QHandle<AxisActionHandler> HAxisActionHandler;
+typedef Qt3DCore::QHandle<AxisSetting> HAxisSetting;
+typedef Qt3DCore::QHandle<Action> HAction;
+typedef Qt3DCore::QHandle<AbstractAxisInput> HAxisInput;
+typedef Qt3DCore::QHandle<ActionInput> HActionInput;
+typedef Qt3DCore::QHandle<InputSequence> HInputSequence;
+typedef Qt3DCore::QHandle<InputChord> HInputChord;
+typedef Qt3DCore::QHandle<LogicalDevice> HLogicalDevice;
+typedef Qt3DCore::QHandle<GenericDeviceBackendNode> HGenericDeviceBackendNode;
+typedef Qt3DCore::QHandle<PhysicalDeviceProxy> HPhysicalDeviceProxy;
+typedef Qt3DCore::QHandle<AxisAccumulator> HAxisAccumulator;
 
 } // namespace Input
 } // namespace Qt3DInput
diff --git a/src/input/backend/inputmanagers_p.h b/src/input/backend/inputmanagers_p.h
index 956b0ab8b..eee8b27d3 100644
--- a/src/input/backend/inputmanagers_p.h
+++ b/src/input/backend/inputmanagers_p.h
@@ -79,8 +79,7 @@ namespace Input {
 
 class KeyboardInputManager : public Qt3DCore::QResourceManager<
         KeyboardHandler,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     KeyboardInputManager() {}
@@ -88,8 +87,7 @@ public:
 
 class KeyboardDeviceManager : public Qt3DCore::QResourceManager<
         KeyboardDevice,
-        Qt3DCore::QNodeId,
-        8>
+        Qt3DCore::QNodeId>
 {
 public:
     KeyboardDeviceManager() {}
@@ -97,8 +95,7 @@ public:
 
 class MouseDeviceManager : public Qt3DCore::QResourceManager<
         MouseDevice,
-        Qt3DCore::QNodeId,
-        8>
+        Qt3DCore::QNodeId>
 {
 public:
     MouseDeviceManager() {}
@@ -106,8 +103,7 @@ public:
 
 class MouseInputManager : public Qt3DCore::QResourceManager<
         MouseHandler,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     MouseInputManager() {}
@@ -115,8 +111,7 @@ public:
 
 class AxisManager : public Qt3DCore::QResourceManager<
         Axis,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     AxisManager() {}
@@ -124,8 +119,7 @@ public:
 
 class AxisSettingManager : public Qt3DCore::QResourceManager<
         AxisSetting,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     AxisSettingManager() {}
@@ -133,8 +127,7 @@ public:
 
 class ActionManager : public Qt3DCore::QResourceManager<
         Action,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     ActionManager() {}
@@ -142,8 +135,7 @@ public:
 
 class ActionInputManager : public Qt3DCore::QResourceManager<
         ActionInput,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     ActionInputManager() {}
@@ -151,8 +143,7 @@ public:
 
 class AnalogAxisInputManager : public Qt3DCore::QResourceManager<
         AnalogAxisInput,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     AnalogAxisInputManager() {}
@@ -160,8 +151,7 @@ public:
 
 class ButtonAxisInputManager : public Qt3DCore::QResourceManager<
         ButtonAxisInput,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     ButtonAxisInputManager() {}
@@ -169,8 +159,7 @@ public:
 
 class InputChordManager : public Qt3DCore::QResourceManager<
         InputChord,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     InputChordManager() {}
@@ -178,8 +167,7 @@ public:
 
 class InputSequenceManager : public Qt3DCore::QResourceManager<
         InputSequence,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     InputSequenceManager() {}
@@ -187,8 +175,7 @@ public:
 
 class LogicalDeviceManager : public Qt3DCore::QResourceManager<
         LogicalDevice,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     LogicalDeviceManager() {}
@@ -203,8 +190,7 @@ private:
 
 class GenericDeviceBackendNodeManager : public Qt3DCore::QResourceManager<
         GenericDeviceBackendNode,
-        Qt3DCore::QNodeId,
-        8>
+        Qt3DCore::QNodeId>
 {
 public:
     GenericDeviceBackendNodeManager() {}
@@ -212,8 +198,7 @@ public:
 
 class Q_AUTOTEST_EXPORT PhysicalDeviceProxyManager : public Qt3DCore::QResourceManager<
         PhysicalDeviceProxy,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     PhysicalDeviceProxyManager() {}
@@ -227,8 +212,7 @@ private:
 
 class AxisAccumulatorManager : public Qt3DCore::QResourceManager<
         AxisAccumulator,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     AxisAccumulatorManager() {}