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/nodemanagers_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/nodemanagers_p.h')
| -rw-r--r-- | src/render/backend/nodemanagers_p.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/render/backend/nodemanagers_p.h b/src/render/backend/nodemanagers_p.h index 8b9537119..b5cb2a664 100644 --- a/src/render/backend/nodemanagers_p.h +++ b/src/render/backend/nodemanagers_p.h @@ -88,7 +88,7 @@ class ParameterManager; class ShaderDataManager; class GLBufferManager; class TextureImageManager; -class CriterionManager; +class FilterKeyManager; class FrameGraphManager; class TransformManager; class TextureManager; @@ -99,7 +99,6 @@ class ComputeCommandManager; class RenderStateManager; class FrameGraphNode; -class Annotation; class Entity; class CameraLens; class Material; @@ -109,7 +108,7 @@ class Effect; class RenderPass; class Texture; class Layer; -class Annotation; +class FilterKey; class FrameGraphNode; class Transform; class Scene; @@ -181,7 +180,7 @@ public: inline TextureManager *textureManager() const Q_DECL_NOEXCEPT { return m_textureManager; } inline TextureDataManager *textureDataManager() const Q_DECL_NOEXCEPT { return m_textureDataManager; } inline LayerManager *layerManager() const Q_DECL_NOEXCEPT { return m_layerManager; } - inline CriterionManager *criterionManager() const Q_DECL_NOEXCEPT { return m_criterionManager; } + inline FilterKeyManager *filterKeyManager() const Q_DECL_NOEXCEPT { return m_filterKeyManager; } inline FrameGraphManager *frameGraphManager() const Q_DECL_NOEXCEPT { return m_frameGraphManager; } inline TransformManager *transformManager() const Q_DECL_NOEXCEPT { return m_transformManager; } inline RenderTargetManager *renderTargetManager() const Q_DECL_NOEXCEPT { return m_renderTargetManager; } @@ -215,7 +214,7 @@ private: TextureManager *m_textureManager; TextureDataManager *m_textureDataManager; LayerManager *m_layerManager; - CriterionManager *m_criterionManager; + FilterKeyManager *m_filterKeyManager; FrameGraphManager *m_frameGraphManager; TransformManager *m_transformManager; RenderTargetManager *m_renderTargetManager; @@ -276,7 +275,7 @@ template<> QT3DRENDERSHARED_PRIVATE_EXPORT LayerManager *NodeManagers::manager<Layer>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT CriterionManager *NodeManagers::manager<Annotation>() const Q_DECL_NOEXCEPT; +QT3DRENDERSHARED_PRIVATE_EXPORT FilterKeyManager *NodeManagers::manager<FilterKey>() const Q_DECL_NOEXCEPT; template<> QT3DRENDERSHARED_PRIVATE_EXPORT FrameGraphManager *NodeManagers::manager<FrameGraphNode*>() const Q_DECL_NOEXCEPT; |