summaryrefslogtreecommitdiffstats
path: root/src/charts/legend
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-03 13:42:58 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-03 12:57:10 +0000
commitcf15f38aab8d89112b7c1f124482b626823827f5 (patch)
treee86ae9688cdc322f8d21c9f16682f3955ae2674f /src/charts/legend
parentea9744cf9a347aa7a94c96337390649fbf389547 (diff)
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I79c74046eaf224235cc80a4323fefd2c083b007f Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'src/charts/legend')
-rw-r--r--src/charts/legend/qarealegendmarker.h4
-rw-r--r--src/charts/legend/qbarlegendmarker.h4
-rw-r--r--src/charts/legend/qboxplotlegendmarker.h4
-rw-r--r--src/charts/legend/qlegend.h4
-rw-r--r--src/charts/legend/qlegendmarker.h2
-rw-r--r--src/charts/legend/qpielegendmarker.h4
-rw-r--r--src/charts/legend/qxylegendmarker.h4
7 files changed, 13 insertions, 13 deletions
diff --git a/src/charts/legend/qarealegendmarker.h b/src/charts/legend/qarealegendmarker.h
index 70386899..1f0adc61 100644
--- a/src/charts/legend/qarealegendmarker.h
+++ b/src/charts/legend/qarealegendmarker.h
@@ -35,7 +35,7 @@ class QT_CHARTS_EXPORT QAreaLegendMarker : public QLegendMarker
Q_OBJECT
public:
- explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = 0);
+ explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR);
virtual ~QAreaLegendMarker();
virtual LegendMarkerType type() { return LegendMarkerTypeArea; }
@@ -44,7 +44,7 @@ public:
virtual QAreaSeries* series();
protected:
- QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = 0);
+ QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QAreaLegendMarker)
diff --git a/src/charts/legend/qbarlegendmarker.h b/src/charts/legend/qbarlegendmarker.h
index 02822df1..3d8e022a 100644
--- a/src/charts/legend/qbarlegendmarker.h
+++ b/src/charts/legend/qbarlegendmarker.h
@@ -35,7 +35,7 @@ class QT_CHARTS_EXPORT QBarLegendMarker : public QLegendMarker
{
Q_OBJECT
public:
- explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = 0);
+ explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = Q_NULLPTR);
virtual ~QBarLegendMarker();
virtual LegendMarkerType type() { return LegendMarkerTypeBar; }
@@ -45,7 +45,7 @@ public:
QBarSet* barset();
protected:
- QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = 0);
+ QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QBarLegendMarker)
diff --git a/src/charts/legend/qboxplotlegendmarker.h b/src/charts/legend/qboxplotlegendmarker.h
index d98a33e1..95264796 100644
--- a/src/charts/legend/qboxplotlegendmarker.h
+++ b/src/charts/legend/qboxplotlegendmarker.h
@@ -35,7 +35,7 @@ class QT_CHARTS_EXPORT QBoxPlotLegendMarker : public QLegendMarker
Q_OBJECT
public:
- explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = 0);
+ explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR);
virtual ~QBoxPlotLegendMarker();
virtual LegendMarkerType type() { return LegendMarkerTypeBoxPlot; }
@@ -44,7 +44,7 @@ public:
virtual QBoxPlotSeries* series();
protected:
- QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = 0);
+ QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QBoxPlotLegendMarker)
diff --git a/src/charts/legend/qlegend.h b/src/charts/legend/qlegend.h
index ad1d0a7d..7e352396 100644
--- a/src/charts/legend/qlegend.h
+++ b/src/charts/legend/qlegend.h
@@ -51,7 +51,7 @@ private:
public:
~QLegend();
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR);
void setBrush(const QBrush &brush);
QBrush brush() const;
@@ -81,7 +81,7 @@ public:
void setBackgroundVisible(bool visible = true);
bool isBackgroundVisible() const;
- QList <QLegendMarker*> markers(QAbstractSeries *series = 0) const;
+ QList <QLegendMarker*> markers(QAbstractSeries *series = Q_NULLPTR) const;
bool reverseMarkers();
void setReverseMarkers(bool reverseMarkers = true);
diff --git a/src/charts/legend/qlegendmarker.h b/src/charts/legend/qlegendmarker.h
index 2f3b8cdc..39c6caf9 100644
--- a/src/charts/legend/qlegendmarker.h
+++ b/src/charts/legend/qlegendmarker.h
@@ -90,7 +90,7 @@ Q_SIGNALS:
void visibleChanged();
protected:
- explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = 0);
+ explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
QScopedPointer<QLegendMarkerPrivate> d_ptr;
friend class QLegendPrivate;
diff --git a/src/charts/legend/qpielegendmarker.h b/src/charts/legend/qpielegendmarker.h
index 20adaabc..81276848 100644
--- a/src/charts/legend/qpielegendmarker.h
+++ b/src/charts/legend/qpielegendmarker.h
@@ -36,7 +36,7 @@ class QT_CHARTS_EXPORT QPieLegendMarker : public QLegendMarker
Q_OBJECT
public:
- explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = 0);
+ explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = Q_NULLPTR);
virtual ~QPieLegendMarker();
virtual LegendMarkerType type() { return LegendMarkerTypePie; }
@@ -46,7 +46,7 @@ public:
QPieSlice* slice();
protected:
- QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = 0);
+ QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QPieLegendMarker)
diff --git a/src/charts/legend/qxylegendmarker.h b/src/charts/legend/qxylegendmarker.h
index 601ffcaa..3c879cb6 100644
--- a/src/charts/legend/qxylegendmarker.h
+++ b/src/charts/legend/qxylegendmarker.h
@@ -34,7 +34,7 @@ class QT_CHARTS_EXPORT QXYLegendMarker : public QLegendMarker
{
Q_OBJECT
public:
- explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = 0);
+ explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR);
virtual ~QXYLegendMarker();
virtual LegendMarkerType type() { return LegendMarkerTypeXY; }
@@ -43,7 +43,7 @@ public:
virtual QXYSeries* series();
protected:
- QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = 0);
+ QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(QXYLegendMarker)