diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-10-14 08:49:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-10-14 08:49:14 +0000 |
| commit | eba59bfd14d0ea29f36e80be81137d26cc67e23a (patch) | |
| tree | 69ff8601b3d4a62bea38e1a32245f45cb744aaac /examples/widgets/animation/sub-attaq/animationmanager.h | |
| parent | f03ac58b1ecc24f01cb83b275a9b6088f9483545 (diff) | |
| parent | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake" into wip/cmake
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 |