diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:59 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:59 +0100 |
commit | 2856c5e52bdd2cb736d8394dd87a0726ea5fb560 (patch) | |
tree | a71e216d3ef7abd75647146284c91199c256bf13 /examples/svg/network/bearercloud/cloud.h | |
parent | 3246c09fa5dd9c9354be8ec7d41fa5d5a57f0d0e (diff) | |
parent | eb74919884f14c0ceebb63d512768ea1c8823b84 (diff) | |
download | qtsvg-2856c5e52bdd2cb736d8394dd87a0726ea5fb560.tar.gz |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Iaac1c139f074e4e82267654a2fbfdcf0a3f5e71c
Diffstat (limited to 'examples/svg/network/bearercloud/cloud.h')
-rw-r--r-- | examples/svg/network/bearercloud/cloud.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/svg/network/bearercloud/cloud.h b/examples/svg/network/bearercloud/cloud.h index 99af08c..1342945 100644 --- a/examples/svg/network/bearercloud/cloud.h +++ b/examples/svg/network/bearercloud/cloud.h @@ -59,7 +59,7 @@ public: ~Cloud(); enum { Type = UserType + 1 }; - int type() const { return Type; } + int type() const override { return Type; } void setFinalScale(qreal factor); void setDeleteAfterAnimation(bool deleteAfter); @@ -67,14 +67,14 @@ public: void calculateForces(); bool advance(); - QRectF boundingRect() const; - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); + QRectF boundingRect() const override; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; static qreal getRadiusForState(QNetworkConfiguration::StateFlags state); protected: - QVariant itemChange(GraphicsItemChange change, const QVariant &value); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; private Q_SLOTS: void stateChanged(QNetworkSession::State state); |