diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-15 10:19:23 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-16 10:29:19 +0000 |
commit | 9dd10069ad84a7d51bb890d78f7f5e1e79b94906 (patch) | |
tree | bd86e5e48a4c6e0969cdfae8822b323b29ccf821 /src/animation/backend/handler_p.h | |
parent | a6297cdbc6025cd676691d67e6c8e34ebbab5c29 (diff) |
Remove QConductedClipAnimator and defer to later
Too much to fix up for 5.9 so remove and defer for 5.10.
Task-number: QTBUG-58905
Change-Id: Ie5b4f172e57beac12933fa0db5f102b4dc9346fc
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/animation/backend/handler_p.h')
-rw-r--r-- | src/animation/backend/handler_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/animation/backend/handler_p.h b/src/animation/backend/handler_p.h index 25286fb45..91640c477 100644 --- a/src/animation/backend/handler_p.h +++ b/src/animation/backend/handler_p.h @@ -69,8 +69,6 @@ class ClipAnimator; class ClipAnimatorManager; class BlendedClipAnimator; class BlendedClipAnimatorManager; -class ConductedClipAnimator; -class ConductedClipAnimatorManager; class ChannelMapping; class ChannelMappingManager; class ChannelMapper; @@ -112,7 +110,6 @@ public: AnimationClipManager *animationClipManager() const Q_DECL_NOTHROW { return m_animationClipManager.data(); } ClipAnimatorManager *clipAnimatorManager() const Q_DECL_NOTHROW { return m_clipAnimatorManager.data(); } BlendedClipAnimatorManager *blendedClipAnimatorManager() const Q_DECL_NOTHROW { return m_blendedClipAnimatorManager.data(); } - ConductedClipAnimatorManager *conductedClipAnimatorManager() const Q_DECL_NOTHROW { return m_conductedClipAnimatorManager.data(); } ChannelMappingManager *channelMappingManager() const Q_DECL_NOTHROW { return m_channelMappingManager.data(); } ChannelMapperManager *channelMapperManager() const Q_DECL_NOTHROW { return m_channelMapperManager.data(); } ClipBlendNodeManager *clipBlendNodeManager() const Q_DECL_NOTHROW { return m_clipBlendNodeManager.data(); } @@ -123,7 +120,6 @@ private: QScopedPointer<AnimationClipManager> m_animationClipManager; QScopedPointer<ClipAnimatorManager> m_clipAnimatorManager; QScopedPointer<BlendedClipAnimatorManager> m_blendedClipAnimatorManager; - QScopedPointer<ConductedClipAnimatorManager> m_conductedClipAnimatorManager; QScopedPointer<ChannelMappingManager> m_channelMappingManager; QScopedPointer<ChannelMapperManager> m_channelMapperManager; QScopedPointer<ClipBlendNodeManager> m_clipBlendNodeManager; |