diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-09-28 11:58:22 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-09-28 11:58:22 (GMT) |
| commit | e058304cc2adc1115ccc3c557b3a16c6e1c1fa86 (patch) | |
| tree | 28c0c97839a95e974728857b50a5afbffeec7d11 /demos | |
| parent | e1c95146e889a33108a4b3013ba64a4d15414e87 (diff) | |
| parent | db032c025f56d2137b96e49fd817cae35dd5c8a3 (diff) | |
| download | Qt-e058304cc2adc1115ccc3c557b3a16c6e1c1fa86.zip Qt-e058304cc2adc1115ccc3c557b3a16c6e1c1fa86.tar.gz Qt-e058304cc2adc1115ccc3c557b3a16c6e1c1fa86.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/sub-attaq/states.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/demos/sub-attaq/states.cpp b/demos/sub-attaq/states.cpp index 4a9d845..10c173e 100644 --- a/demos/sub-attaq/states.cpp +++ b/demos/sub-attaq/states.cpp @@ -54,7 +54,6 @@ #include <QtGui/QGraphicsView> #include <QtCore/QStateMachine> #include <QtGui/QKeyEventTransition> -#include <QtCore/QSignalEvent> #include <QtCore/QFinalState> PlayState::PlayState(GraphicsScene *scene, QState *parent) @@ -295,7 +294,7 @@ bool UpdateScoreTransition::eventTest(QEvent *event) if (!QSignalTransition::eventTest(event)) return false; else { - QSignalEvent *se = static_cast<QSignalEvent*>(event); + QStateMachine::SignalEvent *se = static_cast<QStateMachine::SignalEvent*>(event); game->score += se->arguments().at(0).toInt(); scene->progressItem->setScore(game->score); return true; @@ -315,7 +314,7 @@ bool WinTransition::eventTest(QEvent *event) if (!QSignalTransition::eventTest(event)) return false; else { - QSignalEvent *se = static_cast<QSignalEvent*>(event); + QStateMachine::SignalEvent *se = static_cast<QStateMachine::SignalEvent*>(event); game->score += se->arguments().at(0).toInt(); scene->progressItem->setScore(game->score); return true; |