diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /examples/widgets/animation/sub-attaq/submarine_p.h | |
parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'examples/widgets/animation/sub-attaq/submarine_p.h')
-rw-r--r-- | examples/widgets/animation/sub-attaq/submarine_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/examples/widgets/animation/sub-attaq/submarine_p.h b/examples/widgets/animation/sub-attaq/submarine_p.h index 1c2cb7ceac..36807dade3 100644 --- a/examples/widgets/animation/sub-attaq/submarine_p.h +++ b/examples/widgets/animation/sub-attaq/submarine_p.h @@ -68,16 +68,15 @@ #include "qanimationstate.h" //Qt -#include <QtCore/QPropertyAnimation> -#include <QtCore/QRandomGenerator> -#include <QtWidgets/QGraphicsScene> +#include <QPropertyAnimation> +#include <QRandomGenerator> //This state is describing when the boat is moving right class MovementState : public QAnimationState { Q_OBJECT public: - explicit MovementState(SubMarine *submarine, QState *parent = 0) : QAnimationState(parent) + explicit MovementState(SubMarine *submarine, QState *parent = nullptr) : QAnimationState(parent) { movementAnimation = new QPropertyAnimation(submarine, "pos"); connect(movementAnimation, &QPropertyAnimation::valueChanged, @@ -117,7 +116,7 @@ private: class ReturnState : public QAnimationState { public: - explicit ReturnState(SubMarine *submarine, QState *parent = 0) : QAnimationState(parent) + explicit ReturnState(SubMarine *submarine, QState *parent = nullptr) : QAnimationState(parent) { returnAnimation = new QPropertyAnimation(submarine->rotation(), "angle"); returnAnimation->setDuration(500); |