diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-07-13 20:39:05 +0200 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-08-17 09:51:32 +0200 |
commit | 13426aff248c25b44ac377f37dc3e3a54ea0ea86 (patch) | |
tree | 18dfc93c88f5a06460c9adddb681901711dacd30 /examples/widgets/animation/sub-attaq/animationmanager.cpp | |
parent | cb3e1e551f340ce1e6280123d8b5411b3c1c96d8 (diff) |
Cleanup QtWidgets animation examples
Cleanup the QtWidgets animation examples:
- use nullptr
- use normalized includes, remove unused includes
- fix style
- fix crash of sub-attaq when the game ended (error during range-based
for loop porting)
- don't use keyword 'final' for a variable name
Change-Id: Id23be8ff8b1b310da005d13c052fe547f6a0d63a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples/widgets/animation/sub-attaq/animationmanager.cpp')
-rw-r--r-- | examples/widgets/animation/sub-attaq/animationmanager.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/examples/widgets/animation/sub-attaq/animationmanager.cpp b/examples/widgets/animation/sub-attaq/animationmanager.cpp index a611641613..261cbd1e1c 100644 --- a/examples/widgets/animation/sub-attaq/animationmanager.cpp +++ b/examples/widgets/animation/sub-attaq/animationmanager.cpp @@ -51,22 +51,13 @@ //Own #include "animationmanager.h" -//Qt -#include <QtCore/QAbstractAnimation> -#include <QtCore/QDebug> - -// the universe's only animation manager -AnimationManager *AnimationManager::instance = nullptr; - -AnimationManager::AnimationManager() -{ -} +#include <QAbstractAnimation> AnimationManager *AnimationManager::self() { - if (!instance) - instance = new AnimationManager; - return instance; + // the universe's only animation manager + static AnimationManager s_instance; + return &s_instance; } void AnimationManager::registerAnimation(QAbstractAnimation *anim) |