From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 11:49:52 +0200 Subject: Replace Q_NULLPTR with nullptr where possible Remaining uses of Q_NULLPTR are in: src/corelib/global/qcompilerdetection.h (definition and documentation of Q_NULLPTR) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a Reviewed-by: Ville Voutilainen Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/widgets/graphicsview/qgraphicsanchorlayout.h | 2 +- src/widgets/graphicsview/qgraphicsgridlayout.h | 2 +- src/widgets/graphicsview/qgraphicsitem.h | 64 +++++++++++------------ src/widgets/graphicsview/qgraphicsitemanimation.h | 2 +- src/widgets/graphicsview/qgraphicslayout.h | 2 +- src/widgets/graphicsview/qgraphicslayoutitem.h | 2 +- src/widgets/graphicsview/qgraphicslinearlayout.h | 4 +- src/widgets/graphicsview/qgraphicsproxywidget.h | 2 +- src/widgets/graphicsview/qgraphicsscene.h | 12 ++--- src/widgets/graphicsview/qgraphicstransform.h | 6 +-- src/widgets/graphicsview/qgraphicsview.h | 6 +-- src/widgets/graphicsview/qgraphicswidget.cpp | 2 +- src/widgets/graphicsview/qgraphicswidget.h | 6 +-- 13 files changed, 56 insertions(+), 56 deletions(-) (limited to 'src/widgets/graphicsview') diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index 34c6e12c16..e392be1568 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h @@ -76,7 +76,7 @@ private: class Q_WIDGETS_EXPORT QGraphicsAnchorLayout : public QGraphicsLayout { public: - QGraphicsAnchorLayout(QGraphicsLayoutItem *parent = Q_NULLPTR); + QGraphicsAnchorLayout(QGraphicsLayoutItem *parent = nullptr); virtual ~QGraphicsAnchorLayout(); QGraphicsAnchor *addAnchor(QGraphicsLayoutItem *firstItem, Qt::AnchorPoint firstEdge, diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index c20a931617..4c0a1b4527 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.h +++ b/src/widgets/graphicsview/qgraphicsgridlayout.h @@ -53,7 +53,7 @@ class QGraphicsGridLayoutPrivate; class Q_WIDGETS_EXPORT QGraphicsGridLayout : public QGraphicsLayout { public: - QGraphicsGridLayout(QGraphicsLayoutItem *parent = Q_NULLPTR); + QGraphicsGridLayout(QGraphicsLayoutItem *parent = nullptr); virtual ~QGraphicsGridLayout(); void addItem(QGraphicsLayoutItem *item, int row, int column, int rowSpan, int columnSpan, diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index c291f94c78..47ef5ba80e 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -158,7 +158,7 @@ public: SceneModal }; - explicit QGraphicsItem(QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsItem(QGraphicsItem *parent = nullptr); virtual ~QGraphicsItem(); QGraphicsScene *scene() const; @@ -194,7 +194,7 @@ public: PanelModality panelModality() const; void setPanelModality(PanelModality panelModality); - bool isBlockedByModalPanel(QGraphicsItem **blockingPanel = Q_NULLPTR) const; + bool isBlockedByModalPanel(QGraphicsItem **blockingPanel = nullptr) const; #ifndef QT_NO_TOOLTIP QString toolTip() const; @@ -290,7 +290,7 @@ public: QTransform transform() const; QTransform sceneTransform() const; QTransform deviceTransform(const QTransform &viewportTransform) const; - QTransform itemTransform(const QGraphicsItem *other, bool *ok = Q_NULLPTR) const; + QTransform itemTransform(const QGraphicsItem *other, bool *ok = nullptr) const; void setTransform(const QTransform &matrix, bool combine = false); void resetTransform(); #if QT_DEPRECATED_SINCE(5, 0) @@ -341,7 +341,7 @@ public: void setBoundingRegionGranularity(qreal granularity); // Drawing - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) = 0; + virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) = 0; void update(const QRectF &rect = QRectF()); inline void update(qreal x, qreal y, qreal width, qreal height); void scroll(qreal dx, qreal dy, const QRectF &rect = QRectF()); @@ -558,7 +558,7 @@ class Q_WIDGETS_EXPORT QGraphicsObject : public QObject, public QGraphicsItem Q_CLASSINFO("DefaultProperty", "children") Q_INTERFACES(QGraphicsItem) public: - explicit QGraphicsObject(QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsObject(QGraphicsItem *parent = nullptr); ~QGraphicsObject(); using QObject::children; @@ -600,7 +600,7 @@ class QAbstractGraphicsShapeItemPrivate; class Q_WIDGETS_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem { public: - explicit QAbstractGraphicsShapeItem(QGraphicsItem *parent = Q_NULLPTR); + explicit QAbstractGraphicsShapeItem(QGraphicsItem *parent = nullptr); ~QAbstractGraphicsShapeItem(); QPen pen() const; @@ -625,8 +625,8 @@ class QGraphicsPathItemPrivate; class Q_WIDGETS_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem { public: - explicit QGraphicsPathItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsPathItem(const QPainterPath &path, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsPathItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsPathItem(const QPainterPath &path, QGraphicsItem *parent = nullptr); ~QGraphicsPathItem(); QPainterPath path() const; @@ -636,7 +636,7 @@ public: QPainterPath shape() const override; bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; bool isObscuredBy(const QGraphicsItem *item) const override; QPainterPath opaqueArea() const override; @@ -658,9 +658,9 @@ class QGraphicsRectItemPrivate; class Q_WIDGETS_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem { public: - explicit QGraphicsRectItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsRectItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent = nullptr); + explicit QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = nullptr); ~QGraphicsRectItem(); QRectF rect() const; @@ -671,7 +671,7 @@ public: QPainterPath shape() const override; bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; bool isObscuredBy(const QGraphicsItem *item) const override; QPainterPath opaqueArea() const override; @@ -696,9 +696,9 @@ class QGraphicsEllipseItemPrivate; class Q_WIDGETS_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem { public: - explicit QGraphicsEllipseItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsEllipseItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *parent = nullptr); + explicit QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = nullptr); ~QGraphicsEllipseItem(); QRectF rect() const; @@ -715,7 +715,7 @@ public: QPainterPath shape() const override; bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; bool isObscuredBy(const QGraphicsItem *item) const override; QPainterPath opaqueArea() const override; @@ -740,9 +740,9 @@ class QGraphicsPolygonItemPrivate; class Q_WIDGETS_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem { public: - explicit QGraphicsPolygonItem(QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsPolygonItem(QGraphicsItem *parent = nullptr); explicit QGraphicsPolygonItem(const QPolygonF &polygon, - QGraphicsItem *parent = Q_NULLPTR); + QGraphicsItem *parent = nullptr); ~QGraphicsPolygonItem(); QPolygonF polygon() const; @@ -755,7 +755,7 @@ public: QPainterPath shape() const override; bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; bool isObscuredBy(const QGraphicsItem *item) const override; QPainterPath opaqueArea() const override; @@ -777,9 +777,9 @@ class QGraphicsLineItemPrivate; class Q_WIDGETS_EXPORT QGraphicsLineItem : public QGraphicsItem { public: - explicit QGraphicsLineItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsLineItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent = nullptr); + explicit QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGraphicsItem *parent = nullptr); ~QGraphicsLineItem(); QPen pen() const; @@ -794,7 +794,7 @@ public: QPainterPath shape() const override; bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; bool isObscuredBy(const QGraphicsItem *item) const override; QPainterPath opaqueArea() const override; @@ -822,8 +822,8 @@ public: HeuristicMaskShape }; - explicit QGraphicsPixmapItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsPixmapItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = nullptr); ~QGraphicsPixmapItem(); QPixmap pixmap() const; @@ -874,8 +874,8 @@ class Q_WIDGETS_EXPORT QGraphicsTextItem : public QGraphicsObject QDOC_PROPERTY(QTextCursor textCursor READ textCursor WRITE setTextCursor) public: - explicit QGraphicsTextItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsTextItem(const QString &text, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsTextItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsTextItem(const QString &text, QGraphicsItem *parent = nullptr); ~QGraphicsTextItem(); QString toHtml() const; @@ -965,8 +965,8 @@ class QGraphicsSimpleTextItemPrivate; class Q_WIDGETS_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem { public: - explicit QGraphicsSimpleTextItem(QGraphicsItem *parent = Q_NULLPTR); - explicit QGraphicsSimpleTextItem(const QString &text, QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsSimpleTextItem(QGraphicsItem *parent = nullptr); + explicit QGraphicsSimpleTextItem(const QString &text, QGraphicsItem *parent = nullptr); ~QGraphicsSimpleTextItem(); void setText(const QString &text); @@ -1001,14 +1001,14 @@ class QGraphicsItemGroupPrivate; class Q_WIDGETS_EXPORT QGraphicsItemGroup : public QGraphicsItem { public: - explicit QGraphicsItemGroup(QGraphicsItem *parent = Q_NULLPTR); + explicit QGraphicsItemGroup(QGraphicsItem *parent = nullptr); ~QGraphicsItemGroup(); void addToGroup(QGraphicsItem *item); void removeFromGroup(QGraphicsItem *item); QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; bool isObscuredBy(const QGraphicsItem *item) const override; QPainterPath opaqueArea() const override; diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h index a819acc880..7417d7729c 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.h +++ b/src/widgets/graphicsview/qgraphicsitemanimation.h @@ -58,7 +58,7 @@ class Q_WIDGETS_EXPORT QGraphicsItemAnimation : public QObject { Q_OBJECT public: - QGraphicsItemAnimation(QObject *parent = Q_NULLPTR); + QGraphicsItemAnimation(QObject *parent = nullptr); virtual ~QGraphicsItemAnimation(); QGraphicsItem *item() const; diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index 60c9a35037..28b335ceaa 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -54,7 +54,7 @@ class QGraphicsWidget; class Q_WIDGETS_EXPORT QGraphicsLayout : public QGraphicsLayoutItem { public: - QGraphicsLayout(QGraphicsLayoutItem *parent = Q_NULLPTR); + QGraphicsLayout(QGraphicsLayoutItem *parent = nullptr); ~QGraphicsLayout(); void setContentsMargins(qreal left, qreal top, qreal right, qreal bottom); diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 10c7870412..44f430034b 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -54,7 +54,7 @@ class QGraphicsItem; class Q_WIDGETS_EXPORT QGraphicsLayoutItem { public: - QGraphicsLayoutItem(QGraphicsLayoutItem *parent = Q_NULLPTR, bool isLayout = false); + QGraphicsLayoutItem(QGraphicsLayoutItem *parent = nullptr, bool isLayout = false); virtual ~QGraphicsLayoutItem(); void setSizePolicy(const QSizePolicy &policy); diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index a46ec660e7..d27191adb3 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.h +++ b/src/widgets/graphicsview/qgraphicslinearlayout.h @@ -53,8 +53,8 @@ class QGraphicsLinearLayoutPrivate; class Q_WIDGETS_EXPORT QGraphicsLinearLayout : public QGraphicsLayout { public: - QGraphicsLinearLayout(QGraphicsLayoutItem *parent = Q_NULLPTR); - QGraphicsLinearLayout(Qt::Orientation orientation, QGraphicsLayoutItem *parent = Q_NULLPTR); + QGraphicsLinearLayout(QGraphicsLayoutItem *parent = nullptr); + QGraphicsLinearLayout(Qt::Orientation orientation, QGraphicsLayoutItem *parent = nullptr); virtual ~QGraphicsLinearLayout(); void setOrientation(Qt::Orientation orientation); diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index bb06ac3c16..76fdf8aeba 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget.h @@ -53,7 +53,7 @@ class Q_WIDGETS_EXPORT QGraphicsProxyWidget : public QGraphicsWidget { Q_OBJECT public: - QGraphicsProxyWidget(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags()); + QGraphicsProxyWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~QGraphicsProxyWidget(); void setWidget(QWidget *widget); diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index 071f83aeb6..5ecd2baab8 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -121,9 +121,9 @@ public: }; Q_DECLARE_FLAGS(SceneLayers, SceneLayer) - QGraphicsScene(QObject *parent = Q_NULLPTR); - QGraphicsScene(const QRectF &sceneRect, QObject *parent = Q_NULLPTR); - QGraphicsScene(qreal x, qreal y, qreal width, qreal height, QObject *parent = Q_NULLPTR); + QGraphicsScene(QObject *parent = nullptr); + QGraphicsScene(const QRectF &sceneRect, QObject *parent = nullptr); + QGraphicsScene(qreal x, qreal y, qreal width, qreal height, QObject *parent = nullptr); virtual ~QGraphicsScene(); QRectF sceneRect() const; @@ -159,7 +159,7 @@ public: #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED inline QGraphicsItem *itemAt(const QPointF &position) const { QList itemsAtPoint = items(position); - return itemsAtPoint.isEmpty() ? Q_NULLPTR : itemsAtPoint.first(); + return itemsAtPoint.isEmpty() ? nullptr : itemsAtPoint.first(); } #endif QGraphicsItem *itemAt(const QPointF &pos, const QTransform &deviceTransform) const; @@ -173,7 +173,7 @@ public: #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED inline QGraphicsItem *itemAt(qreal x, qreal y) const { QList itemsAtPoint = items(QPointF(x, y)); - return itemsAtPoint.isEmpty() ? Q_NULLPTR : itemsAtPoint.first(); + return itemsAtPoint.isEmpty() ? nullptr : itemsAtPoint.first(); } #endif inline QGraphicsItem *itemAt(qreal x, qreal y, const QTransform &deviceTransform) const @@ -285,7 +285,7 @@ protected: virtual void drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[], - QWidget *widget = Q_NULLPTR); + QWidget *widget = nullptr); protected Q_SLOTS: // ### Qt 6: make unconditional diff --git a/src/widgets/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h index 4c0535f419..b8455781c5 100644 --- a/src/widgets/graphicsview/qgraphicstransform.h +++ b/src/widgets/graphicsview/qgraphicstransform.h @@ -57,7 +57,7 @@ class Q_WIDGETS_EXPORT QGraphicsTransform : public QObject { Q_OBJECT public: - QGraphicsTransform(QObject *parent = Q_NULLPTR); + QGraphicsTransform(QObject *parent = nullptr); ~QGraphicsTransform(); virtual void applyTo(QMatrix4x4 *matrix) const = 0; @@ -85,7 +85,7 @@ class Q_WIDGETS_EXPORT QGraphicsScale : public QGraphicsTransform Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY yScaleChanged) Q_PROPERTY(qreal zScale READ zScale WRITE setZScale NOTIFY zScaleChanged) public: - QGraphicsScale(QObject *parent = Q_NULLPTR); + QGraphicsScale(QObject *parent = nullptr); ~QGraphicsScale(); QVector3D origin() const; @@ -123,7 +123,7 @@ class Q_WIDGETS_EXPORT QGraphicsRotation : public QGraphicsTransform Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged) Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged) public: - QGraphicsRotation(QObject *parent = Q_NULLPTR); + QGraphicsRotation(QObject *parent = nullptr); ~QGraphicsRotation(); QVector3D origin() const; diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index 20273ad068..e02fba69c9 100644 --- a/src/widgets/graphicsview/qgraphicsview.h +++ b/src/widgets/graphicsview/qgraphicsview.h @@ -114,8 +114,8 @@ public: }; Q_DECLARE_FLAGS(OptimizationFlags, OptimizationFlag) - QGraphicsView(QWidget *parent = Q_NULLPTR); - QGraphicsView(QGraphicsScene *scene, QWidget *parent = Q_NULLPTR); + QGraphicsView(QWidget *parent = nullptr); + QGraphicsView(QGraphicsScene *scene, QWidget *parent = nullptr); ~QGraphicsView(); QSize sizeHint() const override; @@ -236,7 +236,7 @@ protected Q_SLOTS: void setupViewport(QWidget *widget) override; protected: - QGraphicsView(QGraphicsViewPrivate &, QWidget *parent = Q_NULLPTR); + QGraphicsView(QGraphicsViewPrivate &, QWidget *parent = nullptr); bool event(QEvent *event) override; bool viewportEvent(QEvent *event) override; diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index c658e40a9e..4108dd803a 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -276,7 +276,7 @@ QGraphicsWidget::~QGraphicsWidget() // Unset the parent here, when we're still a QGraphicsWidget. // It is otherwise done in ~QGraphicsItem() where we'd be // calling QGraphicsWidget members on an ex-QGraphicsWidget object - setParentItem(Q_NULLPTR); + setParentItem(nullptr); } /*! diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index f71e2f8149..481fb55db3 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -80,7 +80,7 @@ class Q_WIDGETS_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphic Q_PROPERTY(bool autoFillBackground READ autoFillBackground WRITE setAutoFillBackground) Q_PROPERTY(QGraphicsLayout* layout READ layout WRITE setLayout NOTIFY layoutChanged) public: - QGraphicsWidget(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags()); + QGraphicsWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~QGraphicsWidget(); QGraphicsLayout *layout() const; void setLayout(QGraphicsLayout *layout); @@ -163,8 +163,8 @@ public: }; int type() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; - virtual void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; + virtual void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr); QRectF boundingRect() const override; QPainterPath shape() const override; -- cgit v1.2.3