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.h | |
| 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.h')
| -rw-r--r-- | examples/widgets/animation/sub-attaq/animationmanager.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/widgets/animation/sub-attaq/animationmanager.h b/examples/widgets/animation/sub-attaq/animationmanager.h index 9365fa1f1e..5ddea66e80 100644 --- a/examples/widgets/animation/sub-attaq/animationmanager.h +++ b/examples/widgets/animation/sub-attaq/animationmanager.h @@ -51,7 +51,7 @@ #ifndef ANIMATIONMANAGER_H #define ANIMATIONMANAGER_H -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QAbstractAnimation; @@ -59,9 +59,10 @@ QT_END_NAMESPACE class AnimationManager : public QObject { -Q_OBJECT + Q_OBJECT + AnimationManager() = default; + ~AnimationManager() = default; public: - AnimationManager(); void registerAnimation(QAbstractAnimation *anim); void unregisterAnimation(QAbstractAnimation *anim); void unregisterAllAnimations(); @@ -75,8 +76,7 @@ private slots: void unregisterAnimation_helper(QObject *obj); private: - static AnimationManager *instance; - QList<QAbstractAnimation *> animations; + QVector<QAbstractAnimation *> animations; }; #endif // ANIMATIONMANAGER_H |