diff options
| author | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-05-07 13:56:50 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-05-07 13:56:50 (GMT) |
| commit | 90057dabcb99759bcb42c1c21db7151c69d98706 (patch) | |
| tree | c2215154650ea6ec0d9ad13cb4271cca55a62449 /examples/animation/sub-attaq/submarine_p.h | |
| parent | 2a410483a29c0e821588fd94c3179f7ab775ebbf (diff) | |
| parent | 8b57ae82ef507db1912a35fbe5d60f2cc3668cdb (diff) | |
| download | Qt-90057dabcb99759bcb42c1c21db7151c69d98706.zip Qt-90057dabcb99759bcb42c1c21db7151c69d98706.tar.gz Qt-90057dabcb99759bcb42c1c21db7151c69d98706.tar.bz2 | |
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-animations
Diffstat (limited to 'examples/animation/sub-attaq/submarine_p.h')
| -rw-r--r-- | examples/animation/sub-attaq/submarine_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/animation/sub-attaq/submarine_p.h b/examples/animation/sub-attaq/submarine_p.h index 918e7f5..c76d991 100644 --- a/examples/animation/sub-attaq/submarine_p.h +++ b/examples/animation/sub-attaq/submarine_p.h @@ -77,7 +77,7 @@ protected slots: } protected: - void onEntry() + void onEntry(QEvent *e) { if (submarine->currentDirection() == SubMarine::Left) { movementAnimation->setEndValue(QPointF(0,submarine->y())); @@ -88,7 +88,7 @@ protected: movementAnimation->setDuration((submarine->scene()->width()-submarine->size().width()-submarine->x())/submarine->currentSpeed()*12); } movementAnimation->setStartValue(submarine->pos()); - QAnimationState::onEntry(); + QAnimationState::onEntry(e); } private: @@ -109,19 +109,19 @@ public: } protected: - void onEntry() + void onEntry(QEvent *e) { returnAnimation->stop(); returnAnimation->setStartValue(submarine->yRotation()); returnAnimation->setEndValue(submarine->currentDirection() == SubMarine::Right ? 360. : 180.); returnAnimation->setDuration(500); - QAnimationState::onEntry(); + QAnimationState::onEntry(e); } - void onExit() + void onExit(QEvent *e) { submarine->currentDirection() == SubMarine::Right ? submarine->setCurrentDirection(SubMarine::Left) : submarine->setCurrentDirection(SubMarine::Right); - QAnimationState::onExit(); + QAnimationState::onExit(e); } private: |