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/basicgraphicslayouts/layoutitem.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/basicgraphicslayouts/layoutitem.h')
| -rw-r--r-- | examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.h b/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.h index 3535a26670..3dc431d513 100644 --- a/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.h +++ b/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.h @@ -53,23 +53,24 @@ #include <QGraphicsLayoutItem> #include <QGraphicsItem> +#include <QPixmap> //! [0] class LayoutItem : public QGraphicsLayoutItem, public QGraphicsItem { public: - LayoutItem(QGraphicsItem *parent = 0); - ~LayoutItem(); + LayoutItem(QGraphicsItem *parent = nullptr); + // Inherited from QGraphicsLayoutItem void setGeometry(const QRectF &geom) override; QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; // Inherited from QGraphicsItem 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; private: - QPixmap *m_pix; + QPixmap m_pix; }; //! [0] |