diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-04-29 12:23:54 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-04-29 12:23:54 (GMT) |
| commit | eea1c9f34b9b98c55c48f9ed1dbef9a9883c6f2a (patch) | |
| tree | 2710760fe8a79cdeda9555debd6d520d6cee9a96 /examples/animation/sub-attaq/boat_p.h | |
| parent | 20702b4a5992a87e8edc40949ea80fa625a3fc8c (diff) | |
| parent | 36aa9e0468bfa874679dd94b2d50850a1dd7a1d1 (diff) | |
| download | Qt-eea1c9f34b9b98c55c48f9ed1dbef9a9883c6f2a.zip Qt-eea1c9f34b9b98c55c48f9ed1dbef9a9883c6f2a.tar.gz Qt-eea1c9f34b9b98c55c48f9ed1dbef9a9883c6f2a.tar.bz2 | |
Merge branch 'kinetic-animations' into kinetic-statemachine
Conflicts:
examples/animation/sub-attaq/states.cpp
Diffstat (limited to 'examples/animation/sub-attaq/boat_p.h')
| -rw-r--r-- | examples/animation/sub-attaq/boat_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/animation/sub-attaq/boat_p.h b/examples/animation/sub-attaq/boat_p.h index ff69335..855b10f 100644 --- a/examples/animation/sub-attaq/boat_p.h +++ b/examples/animation/sub-attaq/boat_p.h @@ -61,7 +61,7 @@ class KeyStopTransition : public QKeyEventTransition { public: KeyStopTransition(Boat *boat, QEvent::Type type, int key) - : QKeyEventTransition(boat,type, key) + : QKeyEventTransition(boat, type, key) { this->boat = boat; this->key = key; @@ -87,7 +87,7 @@ private: { public: KeyMoveTransition(Boat *boat, QEvent::Type type, int key) - : QKeyEventTransition(boat,type, key) + : QKeyEventTransition(boat, type, key) { this->boat = boat; this->key = key; @@ -125,7 +125,7 @@ private: { public: KeyLaunchTransition(Boat *boat, QEvent::Type type, int key) - : QKeyEventTransition(boat,type, key) + : QKeyEventTransition(boat, type, key) { this->boat = boat; this->key = key; |