diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-04-06 10:37:38 +0200 |
|---|---|---|
| committer | Franck Arrecot <franck.arrecot@gmail.com> | 2016-04-06 08:46:33 +0000 |
| commit | a8e4097687c0cd7be7fa1a7f6b78788eb5bd39d0 (patch) | |
| tree | 8ec7e0ea33bb19c97bda78b88b80a11610e86d00 /src/render/backend/managers_p.h | |
| parent | fe8a340a62d55c6139a7d07909548dfb1eabf07a (diff) | |
Finishing the rename of annotation manager to filterKey manager
Task-id: QTBUG-51454
Change-Id: I7bafa7b568226e060b1cd5ce855946f5b27e7b63
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/managers_p.h')
| -rw-r--r-- | src/render/backend/managers_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index 83a1d4013..69f834faf 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -54,7 +54,7 @@ #include <Qt3DCore/private/qresourcemanager_p.h> #include <Qt3DRender/private/rendertargetoutput_p.h> #include <Qt3DRender/private/cameralens_p.h> -#include <Qt3DRender/private/annotation_p.h> +#include <Qt3DRender/private/filterkey_p.h> #include <Qt3DRender/private/effect_p.h> #include <Qt3DRender/private/entity_p.h> #include <Qt3DRender/private/layer_p.h> @@ -107,8 +107,8 @@ public: CameraManager() {} }; -class CriterionManager : public Qt3DCore::QResourceManager< - Annotation, +class FilterKeyManager : public Qt3DCore::QResourceManager< + FilterKey, Qt3DCore::QNodeId, 16, Qt3DCore::ArrayAllocatingPolicy, @@ -116,7 +116,7 @@ class CriterionManager : public Qt3DCore::QResourceManager< { public: - CriterionManager() {} + FilterKeyManager() {} }; class EffectManager : public Qt3DCore::QResourceManager< @@ -381,7 +381,7 @@ class RenderStateManager : public Qt3DCore::QResourceManager< } // namespace Render } // namespace Qt3DRender -Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Annotation, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::FilterKey, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Effect, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Entity, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Layer, Q_REQUIRES_CLEANUP) |