diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
commit | d49d076431d7579ecb33147187fe07eb148112ba (patch) | |
tree | 668370fb9a2eec50000e371125136921ef4518ab /examples/widgets/graphicsview/dragdroprobot/robot.h | |
parent | b01e69684b9b36492cc43472edeb72058be9f706 (diff) | |
parent | 35cdcddd605d8823b7b57129e8d7279133a3ca89 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic1fd51143f903b7e9086fc19ca960dfd9654ee00
Diffstat (limited to 'examples/widgets/graphicsview/dragdroprobot/robot.h')
-rw-r--r-- | examples/widgets/graphicsview/dragdroprobot/robot.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/examples/widgets/graphicsview/dragdroprobot/robot.h b/examples/widgets/graphicsview/dragdroprobot/robot.h index e25966c7c4..67f6bb4100 100644 --- a/examples/widgets/graphicsview/dragdroprobot/robot.h +++ b/examples/widgets/graphicsview/dragdroprobot/robot.h @@ -62,15 +62,15 @@ QT_END_NAMESPACE class RobotPart : public QGraphicsObject { public: - RobotPart(QGraphicsItem *parent = 0); + RobotPart(QGraphicsItem *parent = nullptr); protected: void dragEnterEvent(QGraphicsSceneDragDropEvent *event) override; void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) override; void dropEvent(QGraphicsSceneDragDropEvent *event) override; - QColor color; - bool dragOver; + QColor color = Qt::lightGray; + bool dragOver = false; }; //! [0] @@ -78,10 +78,10 @@ protected: class RobotHead : public RobotPart { public: - RobotHead(QGraphicsItem *parent = 0); + RobotHead(QGraphicsItem *parent = nullptr); QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; protected: void dragEnterEvent(QGraphicsSceneDragDropEvent *event) override; @@ -96,10 +96,10 @@ private: class RobotTorso : public RobotPart { public: - RobotTorso(QGraphicsItem *parent = 0); + using RobotPart::RobotPart; QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; }; //! [2] @@ -107,10 +107,10 @@ public: class RobotLimb : public RobotPart { public: - RobotLimb(QGraphicsItem *parent = 0); + RobotLimb(QGraphicsItem *parent = nullptr); QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; }; //! [3] @@ -118,10 +118,10 @@ public: class Robot : public RobotPart { public: - Robot(QGraphicsItem *parent = 0); + Robot(QGraphicsItem *parent = nullptr); QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; }; //! [4] |