diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-05-28 12:46:03 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-05-28 12:46:54 (GMT) |
commit | 49108bbc2bf79157f1be0f837db08f72408764cb (patch) | |
tree | fbeaf7983d8919ff1e84dbee04bc794c0cac8177 | |
parent | eb54435ac5717c854d6c737bca19ae23c00da045 (diff) | |
download | Qt-49108bbc2bf79157f1be0f837db08f72408764cb.zip Qt-49108bbc2bf79157f1be0f837db08f72408764cb.tar.gz Qt-49108bbc2bf79157f1be0f837db08f72408764cb.tar.bz2 |
small cleanup on the sub-attaq demo
removed declaration of properties that are already declared in Qt
-rw-r--r-- | examples/animation/sub-attaq/boat.h | 3 | ||||
-rw-r--r-- | examples/animation/sub-attaq/bomb.h | 3 | ||||
-rw-r--r-- | examples/animation/sub-attaq/graphicsscene.h | 2 | ||||
-rw-r--r-- | examples/animation/sub-attaq/qanimationstate.h | 2 | ||||
-rw-r--r-- | examples/animation/sub-attaq/submarine.h | 2 | ||||
-rw-r--r-- | examples/animation/sub-attaq/torpedo.h | 3 |
6 files changed, 6 insertions, 9 deletions
diff --git a/examples/animation/sub-attaq/boat.h b/examples/animation/sub-attaq/boat.h index 08a9fa2..b412739 100644 --- a/examples/animation/sub-attaq/boat.h +++ b/examples/animation/sub-attaq/boat.h @@ -59,7 +59,6 @@ QT_END_NAMESPACE class Boat : public QGraphicsWidget { Q_OBJECT -Q_PROPERTY(QPointF pos READ pos WRITE setPos) public: enum Movement { None = 0, @@ -85,7 +84,7 @@ public: virtual int type() const; -Q_SIGNALS: +signals: void boatDestroyed(); void boatExecutionFinished(); diff --git a/examples/animation/sub-attaq/bomb.h b/examples/animation/sub-attaq/bomb.h index 226d056..cfd42e5 100644 --- a/examples/animation/sub-attaq/bomb.h +++ b/examples/animation/sub-attaq/bomb.h @@ -51,7 +51,6 @@ class PixmapItem; class Bomb : public QGraphicsWidget { Q_OBJECT -Q_PROPERTY(QPointF pos READ pos WRITE setPos) public: enum Direction { Left = 0, @@ -61,7 +60,7 @@ public: void launch(Direction direction); void destroy(); -Q_SIGNALS: +signals: void bombExplosed(); void bombExecutionFinished(); diff --git a/examples/animation/sub-attaq/graphicsscene.h b/examples/animation/sub-attaq/graphicsscene.h index 8b0ea96..1e6618a 100644 --- a/examples/animation/sub-attaq/graphicsscene.h +++ b/examples/animation/sub-attaq/graphicsscene.h @@ -90,7 +90,7 @@ public: void clearScene(); QGraphicsPixmapItem *addWelcomeItem(const QPixmap &pm); -Q_SIGNALS: +signals: void subMarineDestroyed(int); void allSubMarineDestroyed(int); diff --git a/examples/animation/sub-attaq/qanimationstate.h b/examples/animation/sub-attaq/qanimationstate.h index e5322ad..72bb2d9 100644 --- a/examples/animation/sub-attaq/qanimationstate.h +++ b/examples/animation/sub-attaq/qanimationstate.h @@ -70,7 +70,7 @@ public: void setAnimation(QAbstractAnimation *animation); QAbstractAnimation* animation() const; -Q_SIGNALS: +signals: void animationFinished(); protected: diff --git a/examples/animation/sub-attaq/submarine.h b/examples/animation/sub-attaq/submarine.h index 4001603..b8dd2da 100644 --- a/examples/animation/sub-attaq/submarine.h +++ b/examples/animation/sub-attaq/submarine.h @@ -75,7 +75,7 @@ public: virtual int type() const; -Q_SIGNALS: +signals: void subMarineDestroyed(); void subMarineExecutionFinished(); void subMarineStateChanged(); diff --git a/examples/animation/sub-attaq/torpedo.h b/examples/animation/sub-attaq/torpedo.h index 4a0f457..f5ab614 100644 --- a/examples/animation/sub-attaq/torpedo.h +++ b/examples/animation/sub-attaq/torpedo.h @@ -53,14 +53,13 @@ class PixmapItem; class Torpedo : public QGraphicsWidget { Q_OBJECT -Q_PROPERTY(QPointF pos READ pos WRITE setPos) public: Torpedo(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0); void launch(); void setCurrentSpeed(int speed); void destroy(); -Q_SIGNALS: +signals: void torpedoExplosed(); void torpedoExecutionFinished(); |