diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /examples/widgets/graphicsview/dragdroprobot/robot.h | |
parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
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] |