diff options
author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:54:54 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-29 20:04:02 +0000 |
commit | 2a74ffa1721d512f1c22a3d33af0ddbbdf953a90 (patch) | |
tree | 2fdba81f3bfab73323d652cf1cbee0bc56340b08 /src/charts/legend | |
parent | cca401d422961afe561111aceb926ea95944d87d (diff) |
Replace Q_NULLPTR with nullptr
Change-Id: I991b606cab434d02546173778eb3fbf755ea7727
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/charts/legend')
-rw-r--r-- | src/charts/legend/qarealegendmarker.h | 4 | ||||
-rw-r--r-- | src/charts/legend/qbarlegendmarker.h | 4 | ||||
-rw-r--r-- | src/charts/legend/qboxplotlegendmarker.h | 4 | ||||
-rw-r--r-- | src/charts/legend/qlegend.h | 4 | ||||
-rw-r--r-- | src/charts/legend/qlegendmarker.h | 2 | ||||
-rw-r--r-- | src/charts/legend/qpielegendmarker.h | 4 | ||||
-rw-r--r-- | src/charts/legend/qxylegendmarker.h | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/charts/legend/qarealegendmarker.h b/src/charts/legend/qarealegendmarker.h index e7541587..3d88fa08 100644 --- a/src/charts/legend/qarealegendmarker.h +++ b/src/charts/legend/qarealegendmarker.h @@ -43,7 +43,7 @@ class QT_CHARTS_EXPORT QAreaLegendMarker : public QLegendMarker Q_OBJECT public: - explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR); + explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = nullptr); virtual ~QAreaLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeArea; } @@ -52,7 +52,7 @@ public: virtual QAreaSeries* series(); protected: - QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QAreaLegendMarker) diff --git a/src/charts/legend/qbarlegendmarker.h b/src/charts/legend/qbarlegendmarker.h index 127d3f85..e1b3dcda 100644 --- a/src/charts/legend/qbarlegendmarker.h +++ b/src/charts/legend/qbarlegendmarker.h @@ -43,7 +43,7 @@ class QT_CHARTS_EXPORT QBarLegendMarker : public QLegendMarker { Q_OBJECT public: - explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = Q_NULLPTR); + explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = nullptr); virtual ~QBarLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeBar; } @@ -53,7 +53,7 @@ public: QBarSet* barset(); protected: - QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QBarLegendMarker) diff --git a/src/charts/legend/qboxplotlegendmarker.h b/src/charts/legend/qboxplotlegendmarker.h index 2f977325..db6e9edd 100644 --- a/src/charts/legend/qboxplotlegendmarker.h +++ b/src/charts/legend/qboxplotlegendmarker.h @@ -43,7 +43,7 @@ class QT_CHARTS_EXPORT QBoxPlotLegendMarker : public QLegendMarker Q_OBJECT public: - explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR); + explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = nullptr); virtual ~QBoxPlotLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeBoxPlot; } @@ -52,7 +52,7 @@ public: virtual QBoxPlotSeries* series(); protected: - QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QBoxPlotLegendMarker) diff --git a/src/charts/legend/qlegend.h b/src/charts/legend/qlegend.h index fa3a8258..7b5b3a2e 100644 --- a/src/charts/legend/qlegend.h +++ b/src/charts/legend/qlegend.h @@ -69,7 +69,7 @@ public: ~QLegend(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr); void setBrush(const QBrush &brush); QBrush brush() const; @@ -99,7 +99,7 @@ public: void setBackgroundVisible(bool visible = true); bool isBackgroundVisible() const; - QList <QLegendMarker*> markers(QAbstractSeries *series = Q_NULLPTR) const; + QList <QLegendMarker*> markers(QAbstractSeries *series = nullptr) const; bool reverseMarkers(); void setReverseMarkers(bool reverseMarkers = true); diff --git a/src/charts/legend/qlegendmarker.h b/src/charts/legend/qlegendmarker.h index 72ad384c..1ae65f0e 100644 --- a/src/charts/legend/qlegendmarker.h +++ b/src/charts/legend/qlegendmarker.h @@ -105,7 +105,7 @@ Q_SIGNALS: void shapeChanged(); protected: - explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = nullptr); QScopedPointer<QLegendMarkerPrivate> d_ptr; friend class QLegendPrivate; diff --git a/src/charts/legend/qpielegendmarker.h b/src/charts/legend/qpielegendmarker.h index 233f5558..a4a0463d 100644 --- a/src/charts/legend/qpielegendmarker.h +++ b/src/charts/legend/qpielegendmarker.h @@ -44,7 +44,7 @@ class QT_CHARTS_EXPORT QPieLegendMarker : public QLegendMarker Q_OBJECT public: - explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = Q_NULLPTR); + explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = nullptr); virtual ~QPieLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypePie; } @@ -54,7 +54,7 @@ public: QPieSlice* slice(); protected: - QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QPieLegendMarker) diff --git a/src/charts/legend/qxylegendmarker.h b/src/charts/legend/qxylegendmarker.h index 0c452305..0a714428 100644 --- a/src/charts/legend/qxylegendmarker.h +++ b/src/charts/legend/qxylegendmarker.h @@ -42,7 +42,7 @@ class QT_CHARTS_EXPORT QXYLegendMarker : public QLegendMarker { Q_OBJECT public: - explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR); + explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = nullptr); virtual ~QXYLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeXY; } @@ -51,7 +51,7 @@ public: virtual QXYSeries* series(); protected: - QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QXYLegendMarker) |