diff options
| author | crupest <crupest@outlook.com> | 2018-11-09 21:03:45 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2018-11-09 21:03:45 +0800 |
| commit | 4b219b569c16db6027dd36e4656152f261321c60 (patch) | |
| tree | 2f40c6aeb74382c5a958f153e4598950dffae94c /src/ui/animations/animation.hpp | |
| parent | 6515948e3f5b97f90446536f72e99d71e96f9de7 (diff) | |
| parent | 9ef75fe91837394620edb91f332065a4f34a0281 (diff) | |
| download | cru-4b219b569c16db6027dd36e4656152f261321c60.tar.gz cru-4b219b569c16db6027dd36e4656152f261321c60.tar.bz2 cru-4b219b569c16db6027dd36e4656152f261321c60.zip | |
Merge branch 'master' into theme-resource
Diffstat (limited to 'src/ui/animations/animation.hpp')
| -rw-r--r-- | src/ui/animations/animation.hpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/ui/animations/animation.hpp b/src/ui/animations/animation.hpp index 99389f33..f25e4699 100644 --- a/src/ui/animations/animation.hpp +++ b/src/ui/animations/animation.hpp @@ -3,7 +3,6 @@ #include <unordered_map> #include "base.hpp" -#include "application.hpp" #include "timer.hpp" namespace cru::ui::animations @@ -53,13 +52,10 @@ namespace cru::ui::animations class AnimationManager : public Object { public: - static AnimationManager* GetInstance() - { - return Application::GetInstance()->GetAnimationManager(); - } - - public: + static AnimationManager* GetInstance(); + private: AnimationManager(); + public: AnimationManager(const AnimationManager& other) = delete; AnimationManager(AnimationManager&& other) = delete; AnimationManager& operator=(const AnimationManager& other) = delete; |