summaryrefslogtreecommitdiffstats
path: root/examples/widgets/animation/sub-attaq/qanimationstate.h
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-07-13 20:39:05 +0200
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-08-17 09:51:32 +0200
commit13426aff248c25b44ac377f37dc3e3a54ea0ea86 (patch)
tree18dfc93c88f5a06460c9adddb681901711dacd30 /examples/widgets/animation/sub-attaq/qanimationstate.h
parentcb3e1e551f340ce1e6280123d8b5411b3c1c96d8 (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/qanimationstate.h')
-rw-r--r--examples/widgets/animation/sub-attaq/qanimationstate.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.h b/examples/widgets/animation/sub-attaq/qanimationstate.h
index 063b119058..24759851ba 100644
--- a/examples/widgets/animation/sub-attaq/qanimationstate.h
+++ b/examples/widgets/animation/sub-attaq/qanimationstate.h
@@ -51,13 +51,7 @@
#ifndef QANIMATIONSTATE_H
#define QANIMATIONSTATE_H
-#ifndef QT_STATEMACHINE_SOLUTION
-# include <QtCore/qstate.h>
-# include <QtCore/qabstractanimation.h>
-#else
-# include "qstate.h"
-# include "qabstractanimation.h"
-#endif
+#include <QState>
QT_BEGIN_NAMESPACE
@@ -67,7 +61,7 @@ class QAnimationState : public QState
{
Q_OBJECT
public:
- QAnimationState(QState *parent = 0);
+ QAnimationState(QState *parent = nullptr);
~QAnimationState();
void setAnimation(QAbstractAnimation *animation);