diff options
author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-04-26 17:32:14 +0200 |
---|---|---|
committer | Franck Arrecot <franck.arrecot@gmail.com> | 2016-04-26 15:48:52 +0000 |
commit | 900a187aee09b0a82a085979e6df9f275db2daca (patch) | |
tree | c9e8cfc5a39e902075b7d9fbc8aba542311b451a /src/render/backend/nodemanagers_p.h | |
parent | 1dd56d12719bf13419c7f4f18e2d269f09baae6c (diff) |
Moves QSortCriterion flag to QSortPolicy and remove it
Change-Id: I44f71671ead23256d5fdc621545492885ff940a5
Task-id: QTBUG-51486
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/nodemanagers_p.h')
-rw-r--r-- | src/render/backend/nodemanagers_p.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/render/backend/nodemanagers_p.h b/src/render/backend/nodemanagers_p.h index 4ad7a8f0c..0dbe04702 100644 --- a/src/render/backend/nodemanagers_p.h +++ b/src/render/backend/nodemanagers_p.h @@ -83,7 +83,6 @@ class RenderPassManager; class RenderTargetManager; class SceneManager; class AttachmentManager; -class SortCriterionManager; class ParameterManager; class ShaderDataManager; class GLBufferManager; @@ -115,7 +114,6 @@ class Scene; class RenderTargetOutput; class RenderTarget; class ShaderData; -class SortCriterion; class Parameter; class GLBuffer; class TextureImage; @@ -186,7 +184,6 @@ public: inline RenderTargetManager *renderTargetManager() const Q_DECL_NOEXCEPT { return m_renderTargetManager; } inline SceneManager *sceneManager() const Q_DECL_NOEXCEPT { return m_sceneManager; } inline AttachmentManager *attachmentManager() const Q_DECL_NOEXCEPT { return m_attachmentManager; } - inline SortCriterionManager *sortCriterionManager() const Q_DECL_NOEXCEPT { return m_sortCriterionManager; } inline ParameterManager *parameterManager() const Q_DECL_NOEXCEPT { return m_parameterManager; } inline ShaderDataManager *shaderDataManager() const Q_DECL_NOEXCEPT { return m_shaderDataManager; } inline GLBufferManager *glBufferManager() const Q_DECL_NOEXCEPT { return m_glBufferManager; } @@ -220,7 +217,6 @@ private: RenderTargetManager *m_renderTargetManager; SceneManager *m_sceneManager; AttachmentManager *m_attachmentManager; - SortCriterionManager *m_sortCriterionManager; ParameterManager *m_parameterManager; ShaderDataManager *m_shaderDataManager; GLBufferManager *m_glBufferManager; @@ -293,9 +289,6 @@ template<> QT3DRENDERSHARED_PRIVATE_EXPORT AttachmentManager *NodeManagers::manager<RenderTargetOutput>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT SortCriterionManager *NodeManagers::manager<SortCriterion>() const Q_DECL_NOEXCEPT; - -template<> QT3DRENDERSHARED_PRIVATE_EXPORT ParameterManager *NodeManagers::manager<Parameter>() const Q_DECL_NOEXCEPT; template<> |