From 1629fa0c6c000127d84956c0604804a896e8f9bf Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 30 Jun 2021 11:28:32 +0200 Subject: Use nullptr rather than 0 for null pointers Change-Id: I2921298ad2e04001bdee8824c56f01c203efb7d6 Reviewed-by: Fabian Kosmale Reviewed-by: Andrei Golubev Reviewed-by: Shawn Rutledge --- examples/qml/referenceexamples/attached/person.h | 2 +- .../qml/tutorials/extending-qml/chapter1-basics/piechart.h | 2 +- .../qml/tutorials/extending-qml/chapter2-methods/piechart.h | 2 +- .../qml/tutorials/extending-qml/chapter3-bindings/piechart.h | 2 +- .../extending-qml/chapter4-customPropertyTypes/piechart.h | 2 +- .../extending-qml/chapter4-customPropertyTypes/pieslice.h | 2 +- .../extending-qml/chapter5-listproperties/piechart.h | 2 +- .../extending-qml/chapter5-listproperties/pieslice.h | 2 +- .../extending-qml/chapter6-plugins/import/piechart.h | 2 +- .../extending-qml/chapter6-plugins/import/pieslice.h | 2 +- examples/quick/customitems/maskedmousearea/maskedmousearea.h | 2 +- examples/quick/customitems/painteditem/textballoon.h | 2 +- examples/quick/quickwidgets/qquickviewcomparison/fbitem.h | 2 +- examples/quick/scenegraph/customgeometry/beziercurve.h | 2 +- src/particles/qquickdirection_p.h | 2 +- src/particles/qquickmaskextruder_p.h | 2 +- src/quick/items/qquickgraphicsinfo_p.h | 2 +- src/quicklayouts/qquicklayout_p.h | 4 ++-- src/quicklayouts/qquicklinearlayout_p.h | 12 ++++++------ src/quicklayouts/qquickstacklayout_p.h | 4 ++-- tools/qml/conf.h | 3 +-- 21 files changed, 28 insertions(+), 29 deletions(-) diff --git a/examples/qml/referenceexamples/attached/person.h b/examples/qml/referenceexamples/attached/person.h index 239f4405c0..7283f39f61 100644 --- a/examples/qml/referenceexamples/attached/person.h +++ b/examples/qml/referenceexamples/attached/person.h @@ -63,7 +63,7 @@ class ShoeDescription : public QObject Q_PROPERTY(qreal price READ price WRITE setPrice) QML_ANONYMOUS public: - ShoeDescription(QObject *parent = 0); + ShoeDescription(QObject *parent = nullptr); int size() const; void setSize(int); diff --git a/examples/qml/tutorials/extending-qml/chapter1-basics/piechart.h b/examples/qml/tutorials/extending-qml/chapter1-basics/piechart.h index 687f8e2b4d..b2a0f60893 100644 --- a/examples/qml/tutorials/extending-qml/chapter1-basics/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/piechart.h @@ -62,7 +62,7 @@ class PieChart : public QQuickPaintedItem QML_ELEMENT public: - PieChart(QQuickItem *parent = 0); + PieChart(QQuickItem *parent = nullptr); QString name() const; void setName(const QString &name); diff --git a/examples/qml/tutorials/extending-qml/chapter2-methods/piechart.h b/examples/qml/tutorials/extending-qml/chapter2-methods/piechart.h index 271afbf653..ca5bede67f 100644 --- a/examples/qml/tutorials/extending-qml/chapter2-methods/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/piechart.h @@ -65,7 +65,7 @@ class PieChart : public QQuickPaintedItem public: //![1] - PieChart(QQuickItem *parent = 0); + PieChart(QQuickItem *parent = nullptr); QString name() const; void setName(const QString &name); diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/piechart.h b/examples/qml/tutorials/extending-qml/chapter3-bindings/piechart.h index 58b1339298..5ff895b6b6 100644 --- a/examples/qml/tutorials/extending-qml/chapter3-bindings/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/piechart.h @@ -66,7 +66,7 @@ class PieChart : public QQuickPaintedItem public: //![1] - PieChart(QQuickItem *parent = 0); + PieChart(QQuickItem *parent = nullptr); QString name() const; void setName(const QString &name); diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h index 855ad7ae3a..885391c3a3 100644 --- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h @@ -67,7 +67,7 @@ class PieChart : public QQuickItem public: //![1] - PieChart(QQuickItem *parent = 0); + PieChart(QQuickItem *parent = nullptr); QString name() const; void setName(const QString &name); diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h index 6e64917851..9f8a66734b 100644 --- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h @@ -61,7 +61,7 @@ class PieSlice : public QQuickPaintedItem QML_ELEMENT public: - PieSlice(QQuickItem *parent = 0); + PieSlice(QQuickItem *parent = nullptr); QColor color() const; void setColor(const QColor &color); diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h b/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h index 236fa6796f..917d5f992f 100644 --- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h @@ -66,7 +66,7 @@ class PieChart : public QQuickItem //![1] public: //![1] - PieChart(QQuickItem *parent = 0); + PieChart(QQuickItem *parent = nullptr); QString name() const; void setName(const QString &name); diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h b/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h index 0b290851f0..89f23ea8a8 100644 --- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h @@ -64,7 +64,7 @@ class PieSlice : public QQuickPaintedItem //![0] public: - PieSlice(QQuickItem *parent = 0); + PieSlice(QQuickItem *parent = nullptr); QColor color() const; void setColor(const QColor &color); diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.h b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.h index e6b768b274..fbded1e3a2 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.h @@ -62,7 +62,7 @@ class PieChart : public QQuickItem QML_ELEMENT public: - PieChart(QQuickItem *parent = 0); + PieChart(QQuickItem *parent = nullptr); QString name() const; void setName(const QString &name); diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/pieslice.h b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/pieslice.h index 091870bd51..c8c02a839a 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/pieslice.h +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/pieslice.h @@ -62,7 +62,7 @@ class PieSlice : public QQuickPaintedItem QML_ELEMENT public: - PieSlice(QQuickItem *parent = 0); + PieSlice(QQuickItem *parent = nullptr); QColor color() const; void setColor(const QColor &color); diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.h b/examples/quick/customitems/maskedmousearea/maskedmousearea.h index 39d78a019a..2a9655f0c3 100644 --- a/examples/quick/customitems/maskedmousearea/maskedmousearea.h +++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.h @@ -65,7 +65,7 @@ class MaskedMouseArea : public QQuickItem QML_ELEMENT public: - MaskedMouseArea(QQuickItem *parent = 0); + MaskedMouseArea(QQuickItem *parent = nullptr); bool contains(const QPointF &point) const; diff --git a/examples/quick/customitems/painteditem/textballoon.h b/examples/quick/customitems/painteditem/textballoon.h index 129b0f7ee1..1bf96580e2 100644 --- a/examples/quick/customitems/painteditem/textballoon.h +++ b/examples/quick/customitems/painteditem/textballoon.h @@ -61,7 +61,7 @@ class TextBalloon : public QQuickPaintedItem QML_ELEMENT public: - TextBalloon(QQuickItem *parent = 0); + TextBalloon(QQuickItem *parent = nullptr); void paint(QPainter *painter); bool isRightAligned() const; diff --git a/examples/quick/quickwidgets/qquickviewcomparison/fbitem.h b/examples/quick/quickwidgets/qquickviewcomparison/fbitem.h index 6270e7adff..573cfd7866 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/fbitem.h +++ b/examples/quick/quickwidgets/qquickviewcomparison/fbitem.h @@ -114,7 +114,7 @@ class FbItem : public QQuickFramebufferObject QML_ELEMENT public: - explicit FbItem(QQuickItem *parent = 0); + explicit FbItem(QQuickItem *parent = nullptr); QQuickFramebufferObject::Renderer *createRenderer() const override; diff --git a/examples/quick/scenegraph/customgeometry/beziercurve.h b/examples/quick/scenegraph/customgeometry/beziercurve.h index fd0085a08e..c796c0e5a7 100644 --- a/examples/quick/scenegraph/customgeometry/beziercurve.h +++ b/examples/quick/scenegraph/customgeometry/beziercurve.h @@ -69,7 +69,7 @@ class BezierCurve : public QQuickItem //! [3] public: - BezierCurve(QQuickItem *parent = 0); + BezierCurve(QQuickItem *parent = nullptr); ~BezierCurve(); //! [2] diff --git a/src/particles/qquickdirection_p.h b/src/particles/qquickdirection_p.h index e671868ed2..58b5b43322 100644 --- a/src/particles/qquickdirection_p.h +++ b/src/particles/qquickdirection_p.h @@ -65,7 +65,7 @@ class QQuickDirection : public QObject QML_UNCREATABLE("Abstract type. Use one of the inheriting types instead.") public: - explicit QQuickDirection(QObject *parent = 0); + explicit QQuickDirection(QObject *parent = nullptr); virtual QPointF sample(const QPointF &from); Q_SIGNALS: diff --git a/src/particles/qquickmaskextruder_p.h b/src/particles/qquickmaskextruder_p.h index 0d3fa9c15a..61ff17806e 100644 --- a/src/particles/qquickmaskextruder_p.h +++ b/src/particles/qquickmaskextruder_p.h @@ -64,7 +64,7 @@ class QQuickMaskExtruder : public QQuickParticleExtruder QML_NAMED_ELEMENT(MaskShape) QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickMaskExtruder(QObject *parent = 0); + explicit QQuickMaskExtruder(QObject *parent = nullptr); QPointF extrude(const QRectF &) override; bool contains(const QRectF &bounds, const QPointF &point) override; diff --git a/src/quick/items/qquickgraphicsinfo_p.h b/src/quick/items/qquickgraphicsinfo_p.h index 66f3d4168e..192500d056 100644 --- a/src/quick/items/qquickgraphicsinfo_p.h +++ b/src/quick/items/qquickgraphicsinfo_p.h @@ -134,7 +134,7 @@ public: }; Q_ENUM(RenderableType) - QQuickGraphicsInfo(QQuickItem *item = 0); + QQuickGraphicsInfo(QQuickItem *item = nullptr); static QQuickGraphicsInfo *qmlAttachedProperties(QObject *object); diff --git a/src/quicklayouts/qquicklayout_p.h b/src/quicklayouts/qquicklayout_p.h index 0d577a113e..a7cbceb915 100644 --- a/src/quicklayouts/qquicklayout_p.h +++ b/src/quicklayouts/qquicklayout_p.h @@ -81,7 +81,7 @@ public: NSizes }; - explicit QQuickLayout(QQuickLayoutPrivate &dd, QQuickItem *parent = 0); + explicit QQuickLayout(QQuickLayoutPrivate &dd, QQuickItem *parent = nullptr); ~QQuickLayout(); static QQuickLayoutAttached *qmlAttachedProperties(QObject *object); @@ -90,7 +90,7 @@ public: void componentComplete() override; virtual QSizeF sizeHint(Qt::SizeHint whichSizeHint) const = 0; virtual void setAlignment(QQuickItem *item, Qt::Alignment align) = 0; - virtual void invalidate(QQuickItem * childItem = 0); + virtual void invalidate(QQuickItem * childItem = nullptr); virtual void updateLayoutItems() = 0; void ensureLayoutItemsUpdated() const; diff --git a/src/quicklayouts/qquicklinearlayout_p.h b/src/quicklayouts/qquicklinearlayout_p.h index bc9c395f0b..2373e7ad43 100644 --- a/src/quicklayouts/qquicklinearlayout_p.h +++ b/src/quicklayouts/qquicklinearlayout_p.h @@ -79,11 +79,11 @@ public: explicit QQuickGridLayoutBase(QQuickGridLayoutBasePrivate &dd, Qt::Orientation orientation, - QQuickItem *parent = 0); + QQuickItem *parent = nullptr); ~QQuickGridLayoutBase(); void componentComplete() override; - void invalidate(QQuickItem *childItem = 0) override; + void invalidate(QQuickItem *childItem = nullptr) override; Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); QSizeF sizeHint(Qt::SizeHint whichSizeHint) const override; @@ -160,7 +160,7 @@ class Q_QUICKLAYOUT_PRIVATE_EXPORT QQuickGridLayout : public QQuickGridLayoutBas QML_NAMED_ELEMENT(GridLayout) QML_ADDED_IN_VERSION(1, 0) public: - explicit QQuickGridLayout(QQuickItem *parent = 0); + explicit QQuickGridLayout(QQuickItem *parent = nullptr); qreal columnSpacing() const; void setColumnSpacing(qreal spacing); qreal rowSpacing() const; @@ -213,7 +213,7 @@ class QQuickLinearLayout : public QQuickGridLayoutBase Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing NOTIFY spacingChanged) public: explicit QQuickLinearLayout(Qt::Orientation orientation, - QQuickItem *parent = 0); + QQuickItem *parent = nullptr); void insertLayoutItem(QQuickItem *item); qreal spacing() const; void setSpacing(qreal spacing); @@ -246,7 +246,7 @@ class Q_QUICKLAYOUT_PRIVATE_EXPORT QQuickRowLayout : public QQuickLinearLayout QML_ADDED_IN_VERSION(1, 0) public: - explicit QQuickRowLayout(QQuickItem *parent = 0) + explicit QQuickRowLayout(QQuickItem *parent = nullptr) : QQuickLinearLayout(Qt::Horizontal, parent) {} }; @@ -263,7 +263,7 @@ class Q_QUICKLAYOUT_PRIVATE_EXPORT QQuickColumnLayout : public QQuickLinearLayou QML_ADDED_IN_VERSION(1, 0) public: - explicit QQuickColumnLayout(QQuickItem *parent = 0) + explicit QQuickColumnLayout(QQuickItem *parent = nullptr) : QQuickLinearLayout(Qt::Vertical, parent) {} }; diff --git a/src/quicklayouts/qquickstacklayout_p.h b/src/quicklayouts/qquickstacklayout_p.h index 07c2fc3727..9e82882373 100644 --- a/src/quicklayouts/qquickstacklayout_p.h +++ b/src/quicklayouts/qquickstacklayout_p.h @@ -69,7 +69,7 @@ class Q_QUICKLAYOUT_PRIVATE_EXPORT QQuickStackLayout : public QQuickLayout QML_ATTACHED(QQuickStackLayoutAttached) public: - explicit QQuickStackLayout(QQuickItem *parent = 0); + explicit QQuickStackLayout(QQuickItem *parent = nullptr); int count() const; int currentIndex() const; void setCurrentIndex(int index); @@ -78,7 +78,7 @@ public: void itemChange(ItemChange change, const ItemChangeData &value) override; QSizeF sizeHint(Qt::SizeHint whichSizeHint) const override; void setAlignment(QQuickItem *item, Qt::Alignment align) override; - void invalidate(QQuickItem *childItem = 0) override; + void invalidate(QQuickItem *childItem = nullptr) override; void updateLayoutItems() override; void rearrange(const QSizeF &) override; diff --git a/tools/qml/conf.h b/tools/qml/conf.h index 84167c9134..7431276735 100644 --- a/tools/qml/conf.h +++ b/tools/qml/conf.h @@ -78,8 +78,7 @@ class Config : public QObject QML_NAMED_ELEMENT(Configuration) QML_ADDED_IN_VERSION(1, 0) public: - Config (QObject* parent=0) : QObject(parent) - {} + Config (QObject *parent = nullptr) : QObject(parent) {} QQmlListProperty sceneCompleters() { -- cgit v1.2.3