diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-16 09:41:23 +0200 |
commit | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (patch) | |
tree | 9a799be282e6c0d6544d9f8c872073f83e6c0475 /examples/widgets/animation/stickman/stickman.h | |
parent | 7e8705f6632428a8d9a937ab5fe087999347b3dd (diff) | |
parent | f255b1e8e297e7e1363921580007145cff574e0d (diff) |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'examples/widgets/animation/stickman/stickman.h')
-rw-r--r-- | examples/widgets/animation/stickman/stickman.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/examples/widgets/animation/stickman/stickman.h b/examples/widgets/animation/stickman/stickman.h index f2311a0358..63c02abc8f 100644 --- a/examples/widgets/animation/stickman/stickman.h +++ b/examples/widgets/animation/stickman/stickman.h @@ -57,8 +57,6 @@ static const int NodeCount = 16; static const int BoneCount = 24; class Node; -QT_BEGIN_NAMESPACE -QT_END_NAMESPACE class StickMan: public QGraphicsObject { Q_OBJECT @@ -67,7 +65,6 @@ class StickMan: public QGraphicsObject Q_PROPERTY(bool isDead WRITE setIsDead READ isDead) public: StickMan(); - ~StickMan(); QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; @@ -101,13 +98,11 @@ private: Node *m_nodes[NodeCount]; qreal m_perfectBoneLengths[BoneCount]; - uint m_sticks : 1; - uint m_isDead : 1; - uint m_reserved : 30; + bool m_sticks = true; + bool m_isDead = false; - QPixmap m_pixmap; - QColor m_penColor; - QColor m_fillColor; + QColor m_penColor = Qt::white; + QColor m_fillColor = Qt::black; }; #endif // STICKMAN_H |