diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
| commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
| tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /examples/widgets/animation/stickman/stickman.h | |
| parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
| parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
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 |