summaryrefslogtreecommitdiffstats
path: root/demos/sub-attaq
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-09-28 11:13:47 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-09-28 11:21:50 (GMT)
commit587c004ce82844980c679547f86109174cbe6202 (patch)
tree5614136a0a10622fb7a119772e545d4c26aa9af4 /demos/sub-attaq
parent9021dd294b4d998192ed9b06ce86be6ed8ffddf2 (diff)
downloadQt-587c004ce82844980c679547f86109174cbe6202.zip
Qt-587c004ce82844980c679547f86109174cbe6202.tar.gz
Qt-587c004ce82844980c679547f86109174cbe6202.tar.bz2
Make QSignalEvent and QWrappedEvent inner classes of QStateMachine
Those two classes are specific to the state machine framework, but their names were so generic that we felt they were polluting the Q-namespace. They are now QStateMachine::SignalEvent and QStateMachine::WrappedEvent. Reviewed-by: Eskil Abrahamsen Blomfeldt
Diffstat (limited to 'demos/sub-attaq')
-rw-r--r--demos/sub-attaq/states.cpp5
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;