##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Make public headers compile with -Wzero-as-null-pointer-constant...
Marc Mutz -
r2871:cf15f38aab8d
parent child
Show More
Side by Side Unified
Context file:
r2871:cf15f38aab8d Loading diff...:
Show file before | Show file after | Hide comments
@@ -45,8 +45,8 class QT_CHARTS_EXPORT QAreaSeries : public QAbstractSeries
45 45 Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged)
46 46
47 47 public:
48 explicit QAreaSeries(QObject *parent = 0);
49 explicit QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = 0);
48 explicit QAreaSeries(QObject *parent = Q_NULLPTR);
49 explicit QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = Q_NULLPTR);
50 50 ~QAreaSeries();
51 51
52 52 public:
Show file before | Show file after | Hide comments
@@ -37,11 +37,11 class QT_CHARTS_EXPORT QBarCategoryAxis : public QAbstractAxis
37 37 Q_PROPERTY(int count READ count NOTIFY countChanged)
38 38
39 39 public:
40 explicit QBarCategoryAxis(QObject *parent = 0);
40 explicit QBarCategoryAxis(QObject *parent = Q_NULLPTR);
41 41 ~QBarCategoryAxis();
42 42
43 43 protected:
44 QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = 0);
44 QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR);
45 45
46 46 public:
47 47 AxisType type() const;
Show file before | Show file after | Hide comments
@@ -45,11 +45,11 public:
45 45 AxisLabelsPositionOnValue = 0x1
46 46 };
47 47
48 explicit QCategoryAxis(QObject *parent = 0);
48 explicit QCategoryAxis(QObject *parent = Q_NULLPTR);
49 49 ~QCategoryAxis();
50 50
51 51 protected:
52 QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = 0);
52 QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR);
53 53
54 54 public:
55 55 AxisType type() const;
Show file before | Show file after | Hide comments
@@ -41,11 +41,11 class QT_CHARTS_EXPORT QDateTimeAxis : public QAbstractAxis
41 41 Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged)
42 42
43 43 public:
44 explicit QDateTimeAxis(QObject *parent = 0);
44 explicit QDateTimeAxis(QObject *parent = Q_NULLPTR);
45 45 ~QDateTimeAxis();
46 46
47 47 protected:
48 QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = 0);
48 QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = Q_NULLPTR);
49 49
50 50 public:
51 51 AxisType type() const;
Show file before | Show file after | Hide comments
@@ -41,11 +41,11 class QT_CHARTS_EXPORT QLogValueAxis : public QAbstractAxis
41 41 Q_PROPERTY(qreal base READ base WRITE setBase NOTIFY baseChanged)
42 42
43 43 public:
44 explicit QLogValueAxis(QObject *parent = 0);
44 explicit QLogValueAxis(QObject *parent = Q_NULLPTR);
45 45 ~QLogValueAxis();
46 46
47 47 protected:
48 QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = 0);
48 QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = Q_NULLPTR);
49 49
50 50 public:
51 51 AxisType type() const;
Show file before | Show file after | Hide comments
@@ -84,7 +84,7 public:
84 84 Q_DECLARE_FLAGS(AxisTypes, AxisType)
85 85
86 86 protected:
87 explicit QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent = 0);
87 explicit QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent = Q_NULLPTR);
88 88
89 89 public:
90 90 ~QAbstractAxis();
Show file before | Show file after | Hide comments
@@ -38,11 +38,11 class QT_CHARTS_EXPORT QValueAxis : public QAbstractAxis
38 38 Q_PROPERTY(int minorTickCount READ minorTickCount WRITE setMinorTickCount NOTIFY minorTickCountChanged)
39 39
40 40 public:
41 explicit QValueAxis(QObject *parent = 0);
41 explicit QValueAxis(QObject *parent = Q_NULLPTR);
42 42 ~QValueAxis();
43 43
44 44 protected:
45 QValueAxis(QValueAxisPrivate &d, QObject *parent = 0);
45 QValueAxis(QValueAxisPrivate &d, QObject *parent = Q_NULLPTR);
46 46
47 47 public:
48 48 AxisType type() const;
Show file before | Show file after | Hide comments
@@ -32,7 +32,7 class QT_CHARTS_EXPORT QHorizontalBarSeries : public QAbstractBarSeries
32 32 {
33 33 Q_OBJECT
34 34 public:
35 explicit QHorizontalBarSeries(QObject *parent = 0);
35 explicit QHorizontalBarSeries(QObject *parent = Q_NULLPTR);
36 36 ~QHorizontalBarSeries();
37 37 QAbstractSeries::SeriesType type() const;
38 38
Show file before | Show file after | Hide comments
@@ -32,7 +32,7 class QT_CHARTS_EXPORT QHorizontalPercentBarSeries : public QAbstractBarSeries
32 32 {
33 33 Q_OBJECT
34 34 public:
35 explicit QHorizontalPercentBarSeries(QObject *parent = 0);
35 explicit QHorizontalPercentBarSeries(QObject *parent = Q_NULLPTR);
36 36 ~QHorizontalPercentBarSeries();
37 37 QAbstractSeries::SeriesType type() const;
38 38
Show file before | Show file after | Hide comments
@@ -32,7 +32,7 class QT_CHARTS_EXPORT QHorizontalStackedBarSeries : public QAbstractBarSeries
32 32 {
33 33 Q_OBJECT
34 34 public:
35 explicit QHorizontalStackedBarSeries(QObject *parent = 0);
35 explicit QHorizontalStackedBarSeries(QObject *parent = Q_NULLPTR);
36 36 ~QHorizontalStackedBarSeries();
37 37 QAbstractSeries::SeriesType type() const;
38 38
Show file before | Show file after | Hide comments
@@ -78,7 +78,7 public:
78 78 QAbstractBarSeries::LabelsPosition labelsPosition() const;
79 79
80 80 protected:
81 explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = 0);
81 explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = Q_NULLPTR);
82 82
83 83 Q_SIGNALS:
84 84 void clicked(int index, QBarSet *barset);
Show file before | Show file after | Hide comments
@@ -39,7 +39,7 class QT_CHARTS_EXPORT QBarModelMapper : public QObject
39 39 Q_OBJECT
40 40
41 41 protected:
42 explicit QBarModelMapper(QObject *parent = 0);
42 explicit QBarModelMapper(QObject *parent = Q_NULLPTR);
43 43
44 44 QAbstractItemModel *model() const;
45 45 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -43,7 +43,7 class QT_CHARTS_EXPORT QBarSet : public QObject
43 43 Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged)
44 44
45 45 public:
46 explicit QBarSet(const QString label, QObject *parent = 0);
46 explicit QBarSet(const QString label, QObject *parent = Q_NULLPTR);
47 47 virtual ~QBarSet();
48 48
49 49 void setLabel(const QString label);
Show file before | Show file after | Hide comments
@@ -37,7 +37,7 class QT_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper
37 37 Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged)
38 38
39 39 public:
40 explicit QHBarModelMapper(QObject *parent = 0);
40 explicit QHBarModelMapper(QObject *parent = Q_NULLPTR);
41 41
42 42 QAbstractItemModel *model() const;
43 43 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -37,7 +37,7 class QT_CHARTS_EXPORT QVBarModelMapper : public QBarModelMapper
37 37 Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged)
38 38
39 39 public:
40 explicit QVBarModelMapper(QObject *parent = 0);
40 explicit QVBarModelMapper(QObject *parent = Q_NULLPTR);
41 41
42 42 QAbstractItemModel *model() const;
43 43 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -32,7 +32,7 class QT_CHARTS_EXPORT QBarSeries : public QAbstractBarSeries
32 32 {
33 33 Q_OBJECT
34 34 public:
35 explicit QBarSeries(QObject *parent = 0);
35 explicit QBarSeries(QObject *parent = Q_NULLPTR);
36 36 ~QBarSeries();
37 37 QAbstractSeries::SeriesType type() const;
38 38
Show file before | Show file after | Hide comments
@@ -33,7 +33,7 class QT_CHARTS_EXPORT QPercentBarSeries : public QAbstractBarSeries
33 33 {
34 34 Q_OBJECT
35 35 public:
36 explicit QPercentBarSeries(QObject *parent = 0);
36 explicit QPercentBarSeries(QObject *parent = Q_NULLPTR);
37 37 ~QPercentBarSeries();
38 38 QAbstractSeries::SeriesType type() const;
39 39
Show file before | Show file after | Hide comments
@@ -33,7 +33,7 class QT_CHARTS_EXPORT QStackedBarSeries : public QAbstractBarSeries
33 33 {
34 34 Q_OBJECT
35 35 public:
36 explicit QStackedBarSeries(QObject *parent = 0);
36 explicit QStackedBarSeries(QObject *parent = Q_NULLPTR);
37 37 ~QStackedBarSeries();
38 38 QAbstractSeries::SeriesType type() const;
39 39
Show file before | Show file after | Hide comments
@@ -39,7 +39,7 class QT_CHARTS_EXPORT QBoxPlotModelMapper : public QObject
39 39 Q_OBJECT
40 40
41 41 protected:
42 explicit QBoxPlotModelMapper(QObject *parent = 0);
42 explicit QBoxPlotModelMapper(QObject *parent = Q_NULLPTR);
43 43
44 44 QAbstractItemModel *model() const;
45 45 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -39,7 +39,7 class QT_CHARTS_EXPORT QBoxPlotSeries : public QAbstractSeries
39 39 Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
40 40 Q_PROPERTY(int count READ count NOTIFY countChanged REVISION 1)
41 41 public:
42 explicit QBoxPlotSeries(QObject *parent = 0);
42 explicit QBoxPlotSeries(QObject *parent = Q_NULLPTR);
43 43 ~QBoxPlotSeries();
44 44
45 45 bool append(QBoxSet *box);
Show file before | Show file after | Hide comments
@@ -46,8 +46,8 public:
46 46 };
47 47
48 48 public:
49 explicit QBoxSet(const QString label = QString(), QObject *parent = 0);
50 explicit QBoxSet(const qreal le, const qreal lq, const qreal m, const qreal uq, const qreal ue, const QString label = QString(), QObject *parent = 0);
49 explicit QBoxSet(const QString label = QString(), QObject *parent = Q_NULLPTR);
50 explicit QBoxSet(const qreal le, const qreal lq, const qreal m, const qreal uq, const qreal ue, const QString label = QString(), QObject *parent = Q_NULLPTR);
51 51 virtual ~QBoxSet();
52 52
53 53 void append(const qreal value);
Show file before | Show file after | Hide comments
@@ -37,7 +37,7 class QT_CHARTS_EXPORT QVBoxPlotModelMapper : public QBoxPlotModelMapper
37 37 Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged)
38 38
39 39 public:
40 explicit QVBoxPlotModelMapper(QObject *parent = 0);
40 explicit QVBoxPlotModelMapper(QObject *parent = Q_NULLPTR);
41 41
42 42 QAbstractItemModel *model() const;
43 43 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -35,7 +35,7 class QT_CHARTS_EXPORT QAreaLegendMarker : public QLegendMarker
35 35 Q_OBJECT
36 36
37 37 public:
38 explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = 0);
38 explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR);
39 39 virtual ~QAreaLegendMarker();
40 40
41 41 virtual LegendMarkerType type() { return LegendMarkerTypeArea; }
@@ -44,7 +44,7 public:
44 44 virtual QAreaSeries* series();
45 45
46 46 protected:
47 QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = 0);
47 QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
48 48
49 49 private:
50 50 Q_DECLARE_PRIVATE(QAreaLegendMarker)
Show file before | Show file after | Hide comments
@@ -35,7 +35,7 class QT_CHARTS_EXPORT QBarLegendMarker : public QLegendMarker
35 35 {
36 36 Q_OBJECT
37 37 public:
38 explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = 0);
38 explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = Q_NULLPTR);
39 39 virtual ~QBarLegendMarker();
40 40
41 41 virtual LegendMarkerType type() { return LegendMarkerTypeBar; }
@@ -45,7 +45,7 public:
45 45 QBarSet* barset();
46 46
47 47 protected:
48 QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = 0);
48 QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
49 49
50 50 private:
51 51 Q_DECLARE_PRIVATE(QBarLegendMarker)
Show file before | Show file after | Hide comments
@@ -35,7 +35,7 class QT_CHARTS_EXPORT QBoxPlotLegendMarker : public QLegendMarker
35 35 Q_OBJECT
36 36
37 37 public:
38 explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = 0);
38 explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR);
39 39 virtual ~QBoxPlotLegendMarker();
40 40
41 41 virtual LegendMarkerType type() { return LegendMarkerTypeBoxPlot; }
@@ -44,7 +44,7 public:
44 44 virtual QBoxPlotSeries* series();
45 45
46 46 protected:
47 QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = 0);
47 QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
48 48
49 49 private:
50 50 Q_DECLARE_PRIVATE(QBoxPlotLegendMarker)
Show file before | Show file after | Hide comments
@@ -51,7 +51,7 private:
51 51 public:
52 52 ~QLegend();
53 53
54 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
54 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR);
55 55
56 56 void setBrush(const QBrush &brush);
57 57 QBrush brush() const;
@@ -81,7 +81,7 public:
81 81 void setBackgroundVisible(bool visible = true);
82 82 bool isBackgroundVisible() const;
83 83
84 QList <QLegendMarker*> markers(QAbstractSeries *series = 0) const;
84 QList <QLegendMarker*> markers(QAbstractSeries *series = Q_NULLPTR) const;
85 85
86 86 bool reverseMarkers();
87 87 void setReverseMarkers(bool reverseMarkers = true);
Show file before | Show file after | Hide comments
@@ -90,7 +90,7 Q_SIGNALS:
90 90 void visibleChanged();
91 91
92 92 protected:
93 explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = 0);
93 explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
94 94
95 95 QScopedPointer<QLegendMarkerPrivate> d_ptr;
96 96 friend class QLegendPrivate;
Show file before | Show file after | Hide comments
@@ -36,7 +36,7 class QT_CHARTS_EXPORT QPieLegendMarker : public QLegendMarker
36 36 Q_OBJECT
37 37
38 38 public:
39 explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = 0);
39 explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = Q_NULLPTR);
40 40 virtual ~QPieLegendMarker();
41 41
42 42 virtual LegendMarkerType type() { return LegendMarkerTypePie; }
@@ -46,7 +46,7 public:
46 46 QPieSlice* slice();
47 47
48 48 protected:
49 QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = 0);
49 QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
50 50
51 51 private:
52 52 Q_DECLARE_PRIVATE(QPieLegendMarker)
Show file before | Show file after | Hide comments
@@ -34,7 +34,7 class QT_CHARTS_EXPORT QXYLegendMarker : public QLegendMarker
34 34 {
35 35 Q_OBJECT
36 36 public:
37 explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = 0);
37 explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR);
38 38 virtual ~QXYLegendMarker();
39 39
40 40 virtual LegendMarkerType type() { return LegendMarkerTypeXY; }
@@ -43,7 +43,7 public:
43 43 virtual QXYSeries* series();
44 44
45 45 protected:
46 QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = 0);
46 QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
47 47
48 48 private:
49 49 Q_DECLARE_PRIVATE(QXYLegendMarker)
Show file before | Show file after | Hide comments
@@ -35,12 +35,12 class QT_CHARTS_EXPORT QLineSeries : public QXYSeries
35 35 Q_OBJECT
36 36
37 37 public:
38 explicit QLineSeries(QObject *parent = 0);
38 explicit QLineSeries(QObject *parent = Q_NULLPTR);
39 39 ~QLineSeries();
40 40 QAbstractSeries::SeriesType type() const;
41 41
42 42 protected:
43 QLineSeries(QLineSeriesPrivate &d, QObject *parent = 0);
43 QLineSeries(QLineSeriesPrivate &d, QObject *parent = Q_NULLPTR);
44 44
45 45 private:
46 46 Q_DECLARE_PRIVATE(QLineSeries)
Show file before | Show file after | Hide comments
@@ -37,7 +37,7 class QT_CHARTS_EXPORT QHPieModelMapper : public QPieModelMapper
37 37 Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged)
38 38
39 39 public:
40 explicit QHPieModelMapper(QObject *parent = 0);
40 explicit QHPieModelMapper(QObject *parent = Q_NULLPTR);
41 41
42 42 QAbstractItemModel *model() const;
43 43 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -39,7 +39,7 class QT_CHARTS_EXPORT QPieModelMapper : public QObject
39 39 Q_OBJECT
40 40
41 41 protected:
42 explicit QPieModelMapper(QObject *parent = 0);
42 explicit QPieModelMapper(QObject *parent = Q_NULLPTR);
43 43
44 44 QAbstractItemModel *model() const;
45 45 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -41,7 +41,7 class QT_CHARTS_EXPORT QPieSeries : public QAbstractSeries
41 41 Q_PROPERTY(qreal holeSize READ holeSize WRITE setHoleSize)
42 42
43 43 public:
44 explicit QPieSeries(QObject *parent = 0);
44 explicit QPieSeries(QObject *parent = Q_NULLPTR);
45 45 virtual ~QPieSeries();
46 46
47 47 QAbstractSeries::SeriesType type() const;
Show file before | Show file after | Hide comments
@@ -64,8 +64,8 public:
64 64 };
65 65
66 66 public:
67 explicit QPieSlice(QObject *parent = 0);
68 QPieSlice(QString label, qreal value, QObject *parent = 0);
67 explicit QPieSlice(QObject *parent = Q_NULLPTR);
68 QPieSlice(QString label, qreal value, QObject *parent = Q_NULLPTR);
69 69 virtual ~QPieSlice();
70 70
71 71 void setLabel(QString label);
Show file before | Show file after | Hide comments
@@ -37,7 +37,7 class QT_CHARTS_EXPORT QVPieModelMapper : public QPieModelMapper
37 37 Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged)
38 38
39 39 public:
40 explicit QVPieModelMapper(QObject *parent = 0);
40 explicit QVPieModelMapper(QObject *parent = Q_NULLPTR);
41 41
42 42 QAbstractItemModel *model() const;
43 43 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -59,7 +59,7 public:
59 59 };
60 60
61 61 protected:
62 QAbstractSeries(QAbstractSeriesPrivate &d, QObject *parent = 0);
62 QAbstractSeries(QAbstractSeriesPrivate &d, QObject *parent = Q_NULLPTR);
63 63
64 64 public:
65 65 ~QAbstractSeries();
Show file before | Show file after | Hide comments
@@ -88,7 +88,7 public:
88 88 Q_DECLARE_FLAGS(AnimationOptions, AnimationOption)
89 89
90 90 public:
91 explicit QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
91 explicit QChart(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags());
92 92 ~QChart();
93 93
94 94 void addSeries(QAbstractSeries *series);
@@ -97,15 +97,15 public:
97 97 QList<QAbstractSeries *> series() const;
98 98
99 99 // *** deprecated ***
100 void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0);
101 void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0);
102 QAbstractAxis *axisX(QAbstractSeries *series = 0) const;
103 QAbstractAxis *axisY(QAbstractSeries *series = 0) const;
100 void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = Q_NULLPTR);
101 void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = Q_NULLPTR);
102 QAbstractAxis *axisX(QAbstractSeries *series = Q_NULLPTR) const;
103 QAbstractAxis *axisY(QAbstractSeries *series = Q_NULLPTR) const;
104 104 // ******************
105 105
106 106 void addAxis(QAbstractAxis *axis, Qt::Alignment alignment);
107 107 void removeAxis(QAbstractAxis *axis);
108 QList<QAbstractAxis*> axes(Qt::Orientations orientation = Qt::Horizontal|Qt::Vertical, QAbstractSeries *series = 0) const;
108 QList<QAbstractAxis*> axes(Qt::Orientations orientation = Qt::Horizontal|Qt::Vertical, QAbstractSeries *series = Q_NULLPTR) const;
109 109
110 110 void createDefaultAxes();
111 111
@@ -165,8 +165,8 public:
165 165 void setLocale(const QLocale &locale);
166 166 QLocale locale() const;
167 167
168 QPointF mapToValue(const QPointF &position, QAbstractSeries *series = 0);
169 QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = 0);
168 QPointF mapToValue(const QPointF &position, QAbstractSeries *series = Q_NULLPTR);
169 QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = Q_NULLPTR);
170 170
171 171 ChartType chartType() const;
172 172
Show file before | Show file after | Hide comments
@@ -51,8 +51,8 public:
51 51
52 52 Q_DECLARE_FLAGS(RubberBands, RubberBand)
53 53
54 explicit QChartView(QWidget *parent = 0);
55 explicit QChartView(QChart *chart, QWidget *parent = 0);
54 explicit QChartView(QWidget *parent = Q_NULLPTR);
55 explicit QChartView(QChart *chart, QWidget *parent = Q_NULLPTR);
56 56 ~QChartView();
57 57
58 58 void setRubberBand(const RubberBands &rubberBands);
Show file before | Show file after | Hide comments
@@ -43,12 +43,12 public:
43 43 Q_DECLARE_FLAGS(PolarOrientations, PolarOrientation)
44 44
45 45 public:
46 explicit QPolarChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
46 explicit QPolarChart(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags());
47 47 ~QPolarChart();
48 48
49 49 void addAxis(QAbstractAxis *axis, PolarOrientation polarOrientation);
50 50
51 QList<QAbstractAxis*> axes(PolarOrientations polarOrientation = PolarOrientations(PolarOrientationRadial | PolarOrientationAngular), QAbstractSeries *series = 0) const;
51 QList<QAbstractAxis*> axes(PolarOrientations polarOrientation = PolarOrientations(PolarOrientationRadial | PolarOrientationAngular), QAbstractSeries *series = Q_NULLPTR) const;
52 52
53 53 static PolarOrientation axisPolarOrientation(QAbstractAxis *axis);
54 54
Show file before | Show file after | Hide comments
@@ -46,7 +46,7 public:
46 46 };
47 47
48 48 public:
49 explicit QScatterSeries(QObject *parent = 0);
49 explicit QScatterSeries(QObject *parent = Q_NULLPTR);
50 50 ~QScatterSeries();
51 51 QAbstractSeries::SeriesType type() const;
52 52 void setPen(const QPen &pen);
Show file before | Show file after | Hide comments
@@ -37,7 +37,7 class QT_CHARTS_EXPORT QSplineSeries : public QLineSeries
37 37 Q_OBJECT
38 38
39 39 public:
40 explicit QSplineSeries(QObject *parent = 0);
40 explicit QSplineSeries(QObject *parent = Q_NULLPTR);
41 41 ~QSplineSeries();
42 42 QAbstractSeries::SeriesType type() const;
43 43
Show file before | Show file after | Hide comments
@@ -37,7 +37,7 class QT_CHARTS_EXPORT QHXYModelMapper : public QXYModelMapper
37 37 Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged)
38 38
39 39 public:
40 explicit QHXYModelMapper(QObject *parent = 0);
40 explicit QHXYModelMapper(QObject *parent = Q_NULLPTR);
41 41
42 42 QAbstractItemModel *model() const;
43 43 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -37,7 +37,7 class QT_CHARTS_EXPORT QVXYModelMapper : public QXYModelMapper
37 37 Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged)
38 38
39 39 public:
40 explicit QVXYModelMapper(QObject *parent = 0);
40 explicit QVXYModelMapper(QObject *parent = Q_NULLPTR);
41 41
42 42 QAbstractItemModel *model() const;
43 43 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -39,7 +39,7 class QT_CHARTS_EXPORT QXYModelMapper : public QObject
39 39 Q_OBJECT
40 40
41 41 protected:
42 explicit QXYModelMapper(QObject *parent = 0);
42 explicit QXYModelMapper(QObject *parent = Q_NULLPTR);
43 43
44 44 QAbstractItemModel *model() const;
45 45 void setModel(QAbstractItemModel *model);
Show file before | Show file after | Hide comments
@@ -48,7 +48,7 class QT_CHARTS_EXPORT QXYSeries : public QAbstractSeries
48 48 Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged)
49 49
50 50 protected:
51 explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = 0);
51 explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = Q_NULLPTR);
52 52
53 53 public:
54 54 ~QXYSeries();
General Comments 0
You need to be logged in to leave comments. Login now