diff options
Diffstat (limited to 'examples/widgets/animation')
17 files changed, 66 insertions, 66 deletions
diff --git a/examples/widgets/animation/animatedtiles/main.cpp b/examples/widgets/animation/animatedtiles/main.cpp index 2202f6194b..0511fe8162 100644 --- a/examples/widgets/animation/animatedtiles/main.cpp +++ b/examples/widgets/animation/animatedtiles/main.cpp @@ -75,19 +75,19 @@ public: setCacheMode(DeviceCoordinateCache); } - QRectF boundingRect() const Q_DECL_OVERRIDE + QRectF boundingRect() const override { return QRectF(-65, -65, 130, 130); } - QPainterPath shape() const Q_DECL_OVERRIDE + QPainterPath shape() const override { QPainterPath path; path.addEllipse(boundingRect()); return path; } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) Q_DECL_OVERRIDE + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) override { bool down = option->state & QStyle::State_Sunken; QRectF r = boundingRect(); @@ -112,13 +112,13 @@ signals: void pressed(); protected: - void mousePressEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE + void mousePressEvent(QGraphicsSceneMouseEvent *) override { emit pressed(); update(); } - void mouseReleaseEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE + void mouseReleaseEvent(QGraphicsSceneMouseEvent *) override { update(); } @@ -133,7 +133,7 @@ public: View(QGraphicsScene *scene) : QGraphicsView(scene) { } protected: - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE + void resizeEvent(QResizeEvent *event) override { QGraphicsView::resizeEvent(event); fitInView(sceneRect(), Qt::KeepAspectRatio); diff --git a/examples/widgets/animation/appchooser/main.cpp b/examples/widgets/animation/appchooser/main.cpp index 59611274ef..c9821450c9 100644 --- a/examples/widgets/animation/appchooser/main.cpp +++ b/examples/widgets/animation/appchooser/main.cpp @@ -62,17 +62,17 @@ public: { } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) Q_DECL_OVERRIDE + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override { painter->drawPixmap(QPointF(), p); } - virtual void mousePressEvent(QGraphicsSceneMouseEvent * ) Q_DECL_OVERRIDE + virtual void mousePressEvent(QGraphicsSceneMouseEvent *) override { emit clicked(); } - virtual void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE + virtual void setGeometry(const QRectF &rect) override { QGraphicsWidget::setGeometry(rect); @@ -98,7 +98,7 @@ public: { } - virtual void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE + virtual void resizeEvent(QResizeEvent *) override { fitInView(sceneRect(), Qt::KeepAspectRatio); } diff --git a/examples/widgets/animation/easing/animation.h b/examples/widgets/animation/easing/animation.h index f8373ef686..696257bb4a 100644 --- a/examples/widgets/animation/easing/animation.h +++ b/examples/widgets/animation/easing/animation.h @@ -77,7 +77,7 @@ public: m_path = QPainterPath(); } - void updateCurrentTime(int currentTime) Q_DECL_OVERRIDE + void updateCurrentTime(int currentTime) override { if (m_pathType == CirclePath) { if (m_path.isEmpty()) { diff --git a/examples/widgets/animation/moveblocks/main.cpp b/examples/widgets/animation/moveblocks/main.cpp index 3b271339e4..f85211ef88 100644 --- a/examples/widgets/animation/moveblocks/main.cpp +++ b/examples/widgets/animation/moveblocks/main.cpp @@ -80,7 +80,7 @@ class QGraphicsRectWidget : public QGraphicsWidget { public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *, - QWidget *) Q_DECL_OVERRIDE + QWidget *) override { painter->fillRect(rect(), Qt::blue); } @@ -98,14 +98,14 @@ public: protected: //![14] - virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE + virtual bool eventTest(QEvent *event) override { return (event->type() == QEvent::Type(StateSwitchEvent::StateSwitchType)) && (static_cast<StateSwitchEvent *>(event)->rand() == m_rand); } //![14] - virtual void onTransition(QEvent *) Q_DECL_OVERRIDE {} + virtual void onTransition(QEvent *) override {} private: int m_rand; @@ -122,7 +122,7 @@ public: //![10] //![11] - virtual void onEntry(QEvent *) Q_DECL_OVERRIDE + virtual void onEntry(QEvent *) override { int n; while ((n = (qrand() % m_stateCount + 1)) == m_lastIndex) @@ -130,7 +130,7 @@ public: m_lastIndex = n; machine()->postEvent(new StateSwitchEvent(n)); } - virtual void onExit(QEvent *) Q_DECL_OVERRIDE {} + virtual void onExit(QEvent *) override {} //![11] //![12] @@ -174,7 +174,7 @@ public: } protected: - virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE + virtual void resizeEvent(QResizeEvent *event) override { fitInView(scene()->sceneRect()); QGraphicsView::resizeEvent(event); diff --git a/examples/widgets/animation/states/main.cpp b/examples/widgets/animation/states/main.cpp index 1c5cb2d12d..a3c7256933 100644 --- a/examples/widgets/animation/states/main.cpp +++ b/examples/widgets/animation/states/main.cpp @@ -58,12 +58,12 @@ public: { } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) Q_DECL_OVERRIDE + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override { painter->drawPixmap(QPointF(), p); } - QRectF boundingRect() const Q_DECL_OVERRIDE + QRectF boundingRect() const override { return QRectF( QPointF(0, 0), p.size()); } @@ -79,7 +79,7 @@ public: { } - virtual void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE + virtual void resizeEvent(QResizeEvent *) override { fitInView(sceneRect(), Qt::KeepAspectRatio); } diff --git a/examples/widgets/animation/stickman/graphicsview.h b/examples/widgets/animation/stickman/graphicsview.h index 64201f4e3d..4b9b8fc028 100644 --- a/examples/widgets/animation/stickman/graphicsview.h +++ b/examples/widgets/animation/stickman/graphicsview.h @@ -61,8 +61,8 @@ public: GraphicsView(QWidget *parent = 0); protected: - virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; + virtual void resizeEvent(QResizeEvent *event) override; + void keyPressEvent(QKeyEvent *) override; signals: void keyPressed(int key); diff --git a/examples/widgets/animation/stickman/lifecycle.cpp b/examples/widgets/animation/stickman/lifecycle.cpp index c0623d02fe..fcb351cf36 100644 --- a/examples/widgets/animation/stickman/lifecycle.cpp +++ b/examples/widgets/animation/stickman/lifecycle.cpp @@ -70,7 +70,7 @@ public: setTargetState(target); } - virtual bool eventTest(QEvent *e) Q_DECL_OVERRIDE + virtual bool eventTest(QEvent *e) override { if (QSignalTransition::eventTest(e)) { QVariant key = static_cast<QStateMachine::SignalEvent*>(e)->arguments().at(0); @@ -95,7 +95,7 @@ public: startTimer(1000); } - virtual bool eventTest(QEvent *e) Q_DECL_OVERRIDE + virtual bool eventTest(QEvent *e) override { return QEventTransition::eventTest(e) && ((qrand() % 50) == 0); } diff --git a/examples/widgets/animation/stickman/node.h b/examples/widgets/animation/stickman/node.h index cdf2df46cb..679999b7e8 100644 --- a/examples/widgets/animation/stickman/node.h +++ b/examples/widgets/animation/stickman/node.h @@ -60,18 +60,18 @@ public: explicit Node(const QPointF &pos, QGraphicsItem *parent = 0); ~Node(); - QRectF boundingRect() const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; signals: void positionChanged(); protected: - QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - void mousePressEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE; + void mousePressEvent(QGraphicsSceneMouseEvent *) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *) override; private: bool m_dragging; diff --git a/examples/widgets/animation/stickman/rectbutton.h b/examples/widgets/animation/stickman/rectbutton.h index 79902c9d38..864a2c179e 100644 --- a/examples/widgets/animation/stickman/rectbutton.h +++ b/examples/widgets/animation/stickman/rectbutton.h @@ -60,13 +60,13 @@ public: RectButton(QString buttonText); ~RectButton(); - virtual QRectF boundingRect() const Q_DECL_OVERRIDE; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + virtual QRectF boundingRect() const override; + virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; protected: QString m_ButtonText; - virtual void mousePressEvent (QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + virtual void mousePressEvent (QGraphicsSceneMouseEvent *event) override; signals: void clicked(); diff --git a/examples/widgets/animation/stickman/stickman.h b/examples/widgets/animation/stickman/stickman.h index 302de06704..b5fbd14872 100644 --- a/examples/widgets/animation/stickman/stickman.h +++ b/examples/widgets/animation/stickman/stickman.h @@ -69,8 +69,8 @@ public: StickMan(); ~StickMan(); - virtual QRectF boundingRect() const Q_DECL_OVERRIDE; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + virtual QRectF boundingRect() const override; + virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; int nodeCount() const; Node *node(int idx) const; @@ -92,7 +92,7 @@ public slots: void childPositionChanged(); protected: - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; private: diff --git a/examples/widgets/animation/sub-attaq/boat.h b/examples/widgets/animation/sub-attaq/boat.h index 4b7b20c390..24b004a108 100644 --- a/examples/widgets/animation/sub-attaq/boat.h +++ b/examples/widgets/animation/sub-attaq/boat.h @@ -86,7 +86,7 @@ public: void updateBoatMovement(); - virtual int type() const Q_DECL_OVERRIDE; + virtual int type() const override; signals: void boatDestroyed(); diff --git a/examples/widgets/animation/sub-attaq/boat_p.h b/examples/widgets/animation/sub-attaq/boat_p.h index 6d3c3f69f8..5cad6bde96 100644 --- a/examples/widgets/animation/sub-attaq/boat_p.h +++ b/examples/widgets/animation/sub-attaq/boat_p.h @@ -81,7 +81,7 @@ public: { } protected: - virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE + virtual bool eventTest(QEvent *event) override { if (!QKeyEventTransition::eventTest(event)) return false; @@ -100,13 +100,13 @@ public: { } protected: - virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE + virtual bool eventTest(QEvent *event) override { if (!QKeyEventTransition::eventTest(event)) return false; return (boat->currentSpeed() >= 0); } - void onTransition(QEvent *) Q_DECL_OVERRIDE + void onTransition(QEvent *) override { //We decrease the speed if needed if (key == Qt::Key_Left && boat->currentDirection() == Boat::Right) @@ -131,7 +131,7 @@ public: { } protected: - virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE + virtual bool eventTest(QEvent *event) override { if (!QKeyEventTransition::eventTest(event)) return false; @@ -150,7 +150,7 @@ public: { } protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE + void onEntry(QEvent *) override { boat->setCurrentDirection(Boat::Right); boat->updateBoatMovement(); @@ -167,7 +167,7 @@ public: { } protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE + void onEntry(QEvent *) override { boat->setCurrentDirection(Boat::Left); boat->updateBoatMovement(); @@ -184,7 +184,7 @@ public: { } protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE + void onEntry(QEvent *) override { boat->setCurrentSpeed(0); boat->setCurrentDirection(Boat::None); @@ -202,7 +202,7 @@ public: { } protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE + void onEntry(QEvent *) override { Bomb *b = new Bomb(); b->setPos(boat->x()+boat->size().width(),boat->y()); @@ -223,7 +223,7 @@ public: { } protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE + void onEntry(QEvent *) override { Bomb *b = new Bomb(); b->setPos(boat->x() - b->size().width(), boat->y()); diff --git a/examples/widgets/animation/sub-attaq/pixmapitem.h b/examples/widgets/animation/sub-attaq/pixmapitem.h index 139537bcc9..de8ed67a38 100644 --- a/examples/widgets/animation/sub-attaq/pixmapitem.h +++ b/examples/widgets/animation/sub-attaq/pixmapitem.h @@ -63,8 +63,8 @@ public: PixmapItem(const QString &fileName, GraphicsScene::Mode mode, QGraphicsItem * parent = 0); PixmapItem(const QString &fileName, QGraphicsScene *scene); QSizeF size() const; - QRectF boundingRect() const Q_DECL_OVERRIDE; - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; private: QPixmap pix; }; diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.h b/examples/widgets/animation/sub-attaq/qanimationstate.h index b4afdd699d..06ab4dfbcf 100644 --- a/examples/widgets/animation/sub-attaq/qanimationstate.h +++ b/examples/widgets/animation/sub-attaq/qanimationstate.h @@ -80,9 +80,9 @@ signals: void animationFinished(); protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE; - void onExit(QEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *e) Q_DECL_OVERRIDE; + void onEntry(QEvent *) override; + void onExit(QEvent *) override; + bool event(QEvent *e) override; private: Q_DISABLE_COPY(QAnimationState) diff --git a/examples/widgets/animation/sub-attaq/states.h b/examples/widgets/animation/sub-attaq/states.h index 5b6b38bee7..1d50abbf02 100644 --- a/examples/widgets/animation/sub-attaq/states.h +++ b/examples/widgets/animation/sub-attaq/states.h @@ -72,7 +72,7 @@ public: ~PlayState(); protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE; + void onEntry(QEvent *) override; private : GraphicsScene *scene; @@ -94,7 +94,7 @@ class LevelState : public QState public: LevelState(GraphicsScene *scene, PlayState *game, QState *parent = 0); protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE; + void onEntry(QEvent *) override; private : void initializeLevel(); GraphicsScene *scene; @@ -107,8 +107,8 @@ public: explicit PauseState(GraphicsScene *scene, QState *parent = 0); protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE; - void onExit(QEvent *) Q_DECL_OVERRIDE; + void onEntry(QEvent *) override; + void onExit(QEvent *) override; private : GraphicsScene *scene; }; @@ -119,8 +119,8 @@ public: LostState(GraphicsScene *scene, PlayState *game, QState *parent = 0); protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE; - void onExit(QEvent *) Q_DECL_OVERRIDE; + void onEntry(QEvent *) override; + void onExit(QEvent *) override; private : GraphicsScene *scene; PlayState *game; @@ -132,8 +132,8 @@ public: WinState(GraphicsScene *scene, PlayState *game, QState *parent = 0); protected: - void onEntry(QEvent *) Q_DECL_OVERRIDE; - void onExit(QEvent *) Q_DECL_OVERRIDE; + void onEntry(QEvent *) override; + void onExit(QEvent *) override; private : GraphicsScene *scene; PlayState *game; @@ -152,7 +152,7 @@ class UpdateScoreTransition : public QSignalTransition public: UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target); protected: - virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + virtual bool eventTest(QEvent *event) override; private: PlayState * game; GraphicsScene *scene; @@ -164,7 +164,7 @@ class WinTransition : public QSignalTransition public: WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target); protected: - virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + virtual bool eventTest(QEvent *event) override; private: PlayState * game; GraphicsScene *scene; @@ -176,7 +176,7 @@ private: public: CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key); protected: - virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + virtual bool eventTest(QEvent *event) override; private: PlayState *game; }; diff --git a/examples/widgets/animation/sub-attaq/submarine.h b/examples/widgets/animation/sub-attaq/submarine.h index 179fe62ed0..abfdca6195 100644 --- a/examples/widgets/animation/sub-attaq/submarine.h +++ b/examples/widgets/animation/sub-attaq/submarine.h @@ -81,7 +81,7 @@ public: void launchTorpedo(int speed); void destroy(); - virtual int type() const Q_DECL_OVERRIDE; + virtual int type() const override; QGraphicsRotation *rotation() const { return graphicsRotation; } diff --git a/examples/widgets/animation/sub-attaq/submarine_p.h b/examples/widgets/animation/sub-attaq/submarine_p.h index 72aa761ed4..b8d5532962 100644 --- a/examples/widgets/animation/sub-attaq/submarine_p.h +++ b/examples/widgets/animation/sub-attaq/submarine_p.h @@ -93,7 +93,7 @@ protected slots: } protected: - void onEntry(QEvent *e) Q_DECL_OVERRIDE + void onEntry(QEvent *e) override { if (submarine->currentDirection() == SubMarine::Left) { movementAnimation->setEndValue(QPointF(0,submarine->y())); @@ -125,14 +125,14 @@ public: } protected: - void onEntry(QEvent *e) Q_DECL_OVERRIDE + void onEntry(QEvent *e) override { returnAnimation->stop(); returnAnimation->setEndValue(submarine->currentDirection() == SubMarine::Right ? 360. : 180.); QAnimationState::onEntry(e); } - void onExit(QEvent *e) Q_DECL_OVERRIDE + void onExit(QEvent *e) override { submarine->currentDirection() == SubMarine::Right ? submarine->setCurrentDirection(SubMarine::Left) : submarine->setCurrentDirection(SubMarine::Right); QAnimationState::onExit(e); |