diff options
50 files changed, 75 insertions, 72 deletions
diff --git a/src/charts/areachart/qareaseries.h b/src/charts/areachart/qareaseries.h index ab756551..867ac4cb 100644 --- a/src/charts/areachart/qareaseries.h +++ b/src/charts/areachart/qareaseries.h @@ -45,8 +45,8 @@ class QT_CHARTS_EXPORT QAreaSeries : public QAbstractSeries Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged) public: - explicit QAreaSeries(QObject *parent = 0); - explicit QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = 0); + explicit QAreaSeries(QObject *parent = Q_NULLPTR); + explicit QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = Q_NULLPTR); ~QAreaSeries(); public: diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h index 4d0a2413..ab0a993a 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h @@ -37,11 +37,11 @@ class QT_CHARTS_EXPORT QBarCategoryAxis : public QAbstractAxis Q_PROPERTY(int count READ count NOTIFY countChanged) public: - explicit QBarCategoryAxis(QObject *parent = 0); + explicit QBarCategoryAxis(QObject *parent = Q_NULLPTR); ~QBarCategoryAxis(); protected: - QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = 0); + QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.h b/src/charts/axis/categoryaxis/qcategoryaxis.h index 9987e58f..d1b42fa8 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis.h @@ -45,11 +45,11 @@ public: AxisLabelsPositionOnValue = 0x1 }; - explicit QCategoryAxis(QObject *parent = 0); + explicit QCategoryAxis(QObject *parent = Q_NULLPTR); ~QCategoryAxis(); protected: - QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = 0); + QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.h b/src/charts/axis/datetimeaxis/qdatetimeaxis.h index e35e04b2..c4d91e46 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis.h +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.h @@ -41,11 +41,11 @@ class QT_CHARTS_EXPORT QDateTimeAxis : public QAbstractAxis Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged) public: - explicit QDateTimeAxis(QObject *parent = 0); + explicit QDateTimeAxis(QObject *parent = Q_NULLPTR); ~QDateTimeAxis(); protected: - QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = 0); + QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.h b/src/charts/axis/logvalueaxis/qlogvalueaxis.h index 1bcff590..bd35c9f5 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis.h +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.h @@ -41,11 +41,11 @@ class QT_CHARTS_EXPORT QLogValueAxis : public QAbstractAxis Q_PROPERTY(qreal base READ base WRITE setBase NOTIFY baseChanged) public: - explicit QLogValueAxis(QObject *parent = 0); + explicit QLogValueAxis(QObject *parent = Q_NULLPTR); ~QLogValueAxis(); protected: - QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = 0); + QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; diff --git a/src/charts/axis/qabstractaxis.h b/src/charts/axis/qabstractaxis.h index e89cd9f4..df40bf78 100644 --- a/src/charts/axis/qabstractaxis.h +++ b/src/charts/axis/qabstractaxis.h @@ -84,7 +84,7 @@ public: Q_DECLARE_FLAGS(AxisTypes, AxisType) protected: - explicit QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent = 0); + explicit QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent = Q_NULLPTR); public: ~QAbstractAxis(); diff --git a/src/charts/axis/valueaxis/qvalueaxis.h b/src/charts/axis/valueaxis/qvalueaxis.h index 661facfe..a961b2a9 100644 --- a/src/charts/axis/valueaxis/qvalueaxis.h +++ b/src/charts/axis/valueaxis/qvalueaxis.h @@ -38,11 +38,11 @@ class QT_CHARTS_EXPORT QValueAxis : public QAbstractAxis Q_PROPERTY(int minorTickCount READ minorTickCount WRITE setMinorTickCount NOTIFY minorTickCountChanged) public: - explicit QValueAxis(QObject *parent = 0); + explicit QValueAxis(QObject *parent = Q_NULLPTR); ~QValueAxis(); protected: - QValueAxis(QValueAxisPrivate &d, QObject *parent = 0); + QValueAxis(QValueAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h index 14b0e9aa..fabbd283 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h @@ -32,7 +32,7 @@ class QT_CHARTS_EXPORT QHorizontalBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QHorizontalBarSeries(QObject *parent = 0); + explicit QHorizontalBarSeries(QObject *parent = Q_NULLPTR); ~QHorizontalBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h index e92ac3b2..b6b7eabc 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h @@ -32,7 +32,7 @@ class QT_CHARTS_EXPORT QHorizontalPercentBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QHorizontalPercentBarSeries(QObject *parent = 0); + explicit QHorizontalPercentBarSeries(QObject *parent = Q_NULLPTR); ~QHorizontalPercentBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h index c70ddbc7..7719ca57 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h @@ -32,7 +32,7 @@ class QT_CHARTS_EXPORT QHorizontalStackedBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QHorizontalStackedBarSeries(QObject *parent = 0); + explicit QHorizontalStackedBarSeries(QObject *parent = Q_NULLPTR); ~QHorizontalStackedBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/qabstractbarseries.h b/src/charts/barchart/qabstractbarseries.h index 6653787a..c41527c9 100644 --- a/src/charts/barchart/qabstractbarseries.h +++ b/src/charts/barchart/qabstractbarseries.h @@ -78,7 +78,7 @@ public: QAbstractBarSeries::LabelsPosition labelsPosition() const; protected: - explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = 0); + explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = Q_NULLPTR); Q_SIGNALS: void clicked(int index, QBarSet *barset); diff --git a/src/charts/barchart/qbarmodelmapper.cpp b/src/charts/barchart/qbarmodelmapper.cpp index 92caa0ae..7a0953f2 100644 --- a/src/charts/barchart/qbarmodelmapper.cpp +++ b/src/charts/barchart/qbarmodelmapper.cpp @@ -52,6 +52,7 @@ void QBarModelMapper::setModel(QAbstractItemModel *model) d->m_model = model; d->initializeBarFromModel(); // connect signals from the model + connect(d->m_model, SIGNAL(modelReset()), d, SLOT(initializeBarFromModel())); connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex))); connect(d->m_model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), d, SLOT(modelHeaderDataUpdated(Qt::Orientation,int,int))); connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelRowsAdded(QModelIndex,int,int))); diff --git a/src/charts/barchart/qbarmodelmapper.h b/src/charts/barchart/qbarmodelmapper.h index a5ea44f7..be82f8f9 100644 --- a/src/charts/barchart/qbarmodelmapper.h +++ b/src/charts/barchart/qbarmodelmapper.h @@ -39,7 +39,7 @@ class QT_CHARTS_EXPORT QBarModelMapper : public QObject Q_OBJECT protected: - explicit QBarModelMapper(QObject *parent = 0); + explicit QBarModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/barchart/qbarset.h b/src/charts/barchart/qbarset.h index ffd812de..81713d09 100644 --- a/src/charts/barchart/qbarset.h +++ b/src/charts/barchart/qbarset.h @@ -43,7 +43,7 @@ class QT_CHARTS_EXPORT QBarSet : public QObject Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged) public: - explicit QBarSet(const QString label, QObject *parent = 0); + explicit QBarSet(const QString label, QObject *parent = Q_NULLPTR); virtual ~QBarSet(); void setLabel(const QString label); diff --git a/src/charts/barchart/qhbarmodelmapper.h b/src/charts/barchart/qhbarmodelmapper.h index 1f835247..7044c5c4 100644 --- a/src/charts/barchart/qhbarmodelmapper.h +++ b/src/charts/barchart/qhbarmodelmapper.h @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged) public: - explicit QHBarModelMapper(QObject *parent = 0); + explicit QHBarModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/barchart/qvbarmodelmapper.h b/src/charts/barchart/qvbarmodelmapper.h index d20c924f..6af9d9bc 100644 --- a/src/charts/barchart/qvbarmodelmapper.h +++ b/src/charts/barchart/qvbarmodelmapper.h @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QVBarModelMapper : public QBarModelMapper Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVBarModelMapper(QObject *parent = 0); + explicit QVBarModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/barchart/vertical/bar/qbarseries.h b/src/charts/barchart/vertical/bar/qbarseries.h index 00abc121..f30ad33b 100644 --- a/src/charts/barchart/vertical/bar/qbarseries.h +++ b/src/charts/barchart/vertical/bar/qbarseries.h @@ -32,7 +32,7 @@ class QT_CHARTS_EXPORT QBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QBarSeries(QObject *parent = 0); + explicit QBarSeries(QObject *parent = Q_NULLPTR); ~QBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.h b/src/charts/barchart/vertical/percent/qpercentbarseries.h index c987901f..04507be6 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries.h +++ b/src/charts/barchart/vertical/percent/qpercentbarseries.h @@ -33,7 +33,7 @@ class QT_CHARTS_EXPORT QPercentBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QPercentBarSeries(QObject *parent = 0); + explicit QPercentBarSeries(QObject *parent = Q_NULLPTR); ~QPercentBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries.h b/src/charts/barchart/vertical/stacked/qstackedbarseries.h index 46a7fa0a..5dba4b7d 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries.h +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries.h @@ -33,7 +33,7 @@ class QT_CHARTS_EXPORT QStackedBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QStackedBarSeries(QObject *parent = 0); + explicit QStackedBarSeries(QObject *parent = Q_NULLPTR); ~QStackedBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.cpp b/src/charts/boxplotchart/qboxplotmodelmapper.cpp index 54cfe330..306b6772 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper.cpp +++ b/src/charts/boxplotchart/qboxplotmodelmapper.cpp @@ -52,6 +52,7 @@ void QBoxPlotModelMapper::setModel(QAbstractItemModel *model) d->m_model = model; d->initializeBoxFromModel(); // connect signals from the model + connect(d->m_model, SIGNAL(modelReset()), d, SLOT(initializeBoxFromModel())); connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex))); connect(d->m_model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), d, SLOT(modelHeaderDataUpdated(Qt::Orientation,int,int))); connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelRowsAdded(QModelIndex,int,int))); diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.h b/src/charts/boxplotchart/qboxplotmodelmapper.h index d76d5284..7eea95ec 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper.h +++ b/src/charts/boxplotchart/qboxplotmodelmapper.h @@ -39,7 +39,7 @@ class QT_CHARTS_EXPORT QBoxPlotModelMapper : public QObject Q_OBJECT protected: - explicit QBoxPlotModelMapper(QObject *parent = 0); + explicit QBoxPlotModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/boxplotchart/qboxplotseries.h b/src/charts/boxplotchart/qboxplotseries.h index 2e21e655..3087bc27 100644 --- a/src/charts/boxplotchart/qboxplotseries.h +++ b/src/charts/boxplotchart/qboxplotseries.h @@ -39,7 +39,7 @@ class QT_CHARTS_EXPORT QBoxPlotSeries : public QAbstractSeries Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged) Q_PROPERTY(int count READ count NOTIFY countChanged REVISION 1) public: - explicit QBoxPlotSeries(QObject *parent = 0); + explicit QBoxPlotSeries(QObject *parent = Q_NULLPTR); ~QBoxPlotSeries(); bool append(QBoxSet *box); diff --git a/src/charts/boxplotchart/qboxset.h b/src/charts/boxplotchart/qboxset.h index 30259299..7d809237 100644 --- a/src/charts/boxplotchart/qboxset.h +++ b/src/charts/boxplotchart/qboxset.h @@ -46,8 +46,8 @@ public: }; public: - explicit QBoxSet(const QString label = QString(), QObject *parent = 0); - explicit QBoxSet(const qreal le, const qreal lq, const qreal m, const qreal uq, const qreal ue, const QString label = QString(), QObject *parent = 0); + explicit QBoxSet(const QString label = QString(), QObject *parent = Q_NULLPTR); + 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); virtual ~QBoxSet(); void append(const qreal value); diff --git a/src/charts/boxplotchart/qvboxplotmodelmapper.h b/src/charts/boxplotchart/qvboxplotmodelmapper.h index e3779f19..a392216e 100644 --- a/src/charts/boxplotchart/qvboxplotmodelmapper.h +++ b/src/charts/boxplotchart/qvboxplotmodelmapper.h @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QVBoxPlotModelMapper : public QBoxPlotModelMapper Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVBoxPlotModelMapper(QObject *parent = 0); + explicit QVBoxPlotModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); 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) diff --git a/src/charts/linechart/qlineseries.h b/src/charts/linechart/qlineseries.h index 66a756f2..076207ae 100644 --- a/src/charts/linechart/qlineseries.h +++ b/src/charts/linechart/qlineseries.h @@ -35,12 +35,12 @@ class QT_CHARTS_EXPORT QLineSeries : public QXYSeries Q_OBJECT public: - explicit QLineSeries(QObject *parent = 0); + explicit QLineSeries(QObject *parent = Q_NULLPTR); ~QLineSeries(); QAbstractSeries::SeriesType type() const; protected: - QLineSeries(QLineSeriesPrivate &d, QObject *parent = 0); + QLineSeries(QLineSeriesPrivate &d, QObject *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QLineSeries) diff --git a/src/charts/piechart/qhpiemodelmapper.h b/src/charts/piechart/qhpiemodelmapper.h index fd798451..a0ad0143 100644 --- a/src/charts/piechart/qhpiemodelmapper.h +++ b/src/charts/piechart/qhpiemodelmapper.h @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QHPieModelMapper : public QPieModelMapper Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged) public: - explicit QHPieModelMapper(QObject *parent = 0); + explicit QHPieModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/piechart/qpiemodelmapper.cpp b/src/charts/piechart/qpiemodelmapper.cpp index bc04acc8..933f2b35 100644 --- a/src/charts/piechart/qpiemodelmapper.cpp +++ b/src/charts/piechart/qpiemodelmapper.cpp @@ -52,6 +52,7 @@ void QPieModelMapper::setModel(QAbstractItemModel *model) d->m_model = model; d->initializePieFromModel(); // connect signals from the model + connect(d->m_model, SIGNAL(modelReset()), d, SLOT(initializePieFromModel())); connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex))); connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelRowsAdded(QModelIndex,int,int))); connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int))); diff --git a/src/charts/piechart/qpiemodelmapper.h b/src/charts/piechart/qpiemodelmapper.h index 7d456b69..ed85ceee 100644 --- a/src/charts/piechart/qpiemodelmapper.h +++ b/src/charts/piechart/qpiemodelmapper.h @@ -39,7 +39,7 @@ class QT_CHARTS_EXPORT QPieModelMapper : public QObject Q_OBJECT protected: - explicit QPieModelMapper(QObject *parent = 0); + explicit QPieModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/piechart/qpieseries.h b/src/charts/piechart/qpieseries.h index 155e9ad0..6f99cf7f 100644 --- a/src/charts/piechart/qpieseries.h +++ b/src/charts/piechart/qpieseries.h @@ -41,7 +41,7 @@ class QT_CHARTS_EXPORT QPieSeries : public QAbstractSeries Q_PROPERTY(qreal holeSize READ holeSize WRITE setHoleSize) public: - explicit QPieSeries(QObject *parent = 0); + explicit QPieSeries(QObject *parent = Q_NULLPTR); virtual ~QPieSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/piechart/qpieslice.h b/src/charts/piechart/qpieslice.h index 2ac3b495..c7fd0af5 100644 --- a/src/charts/piechart/qpieslice.h +++ b/src/charts/piechart/qpieslice.h @@ -64,8 +64,8 @@ public: }; public: - explicit QPieSlice(QObject *parent = 0); - QPieSlice(QString label, qreal value, QObject *parent = 0); + explicit QPieSlice(QObject *parent = Q_NULLPTR); + QPieSlice(QString label, qreal value, QObject *parent = Q_NULLPTR); virtual ~QPieSlice(); void setLabel(QString label); diff --git a/src/charts/piechart/qvpiemodelmapper.h b/src/charts/piechart/qvpiemodelmapper.h index a4eae986..0a10958c 100644 --- a/src/charts/piechart/qvpiemodelmapper.h +++ b/src/charts/piechart/qvpiemodelmapper.h @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QVPieModelMapper : public QPieModelMapper Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVPieModelMapper(QObject *parent = 0); + explicit QVPieModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/qabstractseries.h b/src/charts/qabstractseries.h index ab794163..acab3989 100644 --- a/src/charts/qabstractseries.h +++ b/src/charts/qabstractseries.h @@ -59,7 +59,7 @@ public: }; protected: - QAbstractSeries(QAbstractSeriesPrivate &d, QObject *parent = 0); + QAbstractSeries(QAbstractSeriesPrivate &d, QObject *parent = Q_NULLPTR); public: ~QAbstractSeries(); diff --git a/src/charts/qchart.h b/src/charts/qchart.h index c854271c..216f9b9f 100644 --- a/src/charts/qchart.h +++ b/src/charts/qchart.h @@ -88,7 +88,7 @@ public: Q_DECLARE_FLAGS(AnimationOptions, AnimationOption) public: - explicit QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + explicit QChart(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~QChart(); void addSeries(QAbstractSeries *series); @@ -97,15 +97,15 @@ public: QList<QAbstractSeries *> series() const; // *** deprecated *** - void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0); - void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0); - QAbstractAxis *axisX(QAbstractSeries *series = 0) const; - QAbstractAxis *axisY(QAbstractSeries *series = 0) const; + void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = Q_NULLPTR); + void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = Q_NULLPTR); + QAbstractAxis *axisX(QAbstractSeries *series = Q_NULLPTR) const; + QAbstractAxis *axisY(QAbstractSeries *series = Q_NULLPTR) const; // ****************** void addAxis(QAbstractAxis *axis, Qt::Alignment alignment); void removeAxis(QAbstractAxis *axis); - QList<QAbstractAxis*> axes(Qt::Orientations orientation = Qt::Horizontal|Qt::Vertical, QAbstractSeries *series = 0) const; + QList<QAbstractAxis*> axes(Qt::Orientations orientation = Qt::Horizontal|Qt::Vertical, QAbstractSeries *series = Q_NULLPTR) const; void createDefaultAxes(); @@ -165,8 +165,8 @@ public: void setLocale(const QLocale &locale); QLocale locale() const; - QPointF mapToValue(const QPointF &position, QAbstractSeries *series = 0); - QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = 0); + QPointF mapToValue(const QPointF &position, QAbstractSeries *series = Q_NULLPTR); + QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = Q_NULLPTR); ChartType chartType() const; diff --git a/src/charts/qchartview.h b/src/charts/qchartview.h index c58f159f..b435af05 100644 --- a/src/charts/qchartview.h +++ b/src/charts/qchartview.h @@ -51,8 +51,8 @@ public: Q_DECLARE_FLAGS(RubberBands, RubberBand) - explicit QChartView(QWidget *parent = 0); - explicit QChartView(QChart *chart, QWidget *parent = 0); + explicit QChartView(QWidget *parent = Q_NULLPTR); + explicit QChartView(QChart *chart, QWidget *parent = Q_NULLPTR); ~QChartView(); void setRubberBand(const RubberBands &rubberBands); diff --git a/src/charts/qpolarchart.h b/src/charts/qpolarchart.h index 3e1c9624..fa50dd0a 100644 --- a/src/charts/qpolarchart.h +++ b/src/charts/qpolarchart.h @@ -43,12 +43,12 @@ public: Q_DECLARE_FLAGS(PolarOrientations, PolarOrientation) public: - explicit QPolarChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + explicit QPolarChart(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~QPolarChart(); void addAxis(QAbstractAxis *axis, PolarOrientation polarOrientation); - QList<QAbstractAxis*> axes(PolarOrientations polarOrientation = PolarOrientations(PolarOrientationRadial | PolarOrientationAngular), QAbstractSeries *series = 0) const; + QList<QAbstractAxis*> axes(PolarOrientations polarOrientation = PolarOrientations(PolarOrientationRadial | PolarOrientationAngular), QAbstractSeries *series = Q_NULLPTR) const; static PolarOrientation axisPolarOrientation(QAbstractAxis *axis); diff --git a/src/charts/scatterchart/qscatterseries.h b/src/charts/scatterchart/qscatterseries.h index f30458e7..14a98079 100644 --- a/src/charts/scatterchart/qscatterseries.h +++ b/src/charts/scatterchart/qscatterseries.h @@ -46,7 +46,7 @@ public: }; public: - explicit QScatterSeries(QObject *parent = 0); + explicit QScatterSeries(QObject *parent = Q_NULLPTR); ~QScatterSeries(); QAbstractSeries::SeriesType type() const; void setPen(const QPen &pen); diff --git a/src/charts/splinechart/qsplineseries.h b/src/charts/splinechart/qsplineseries.h index e1b04baa..3ce901a1 100644 --- a/src/charts/splinechart/qsplineseries.h +++ b/src/charts/splinechart/qsplineseries.h @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QSplineSeries : public QLineSeries Q_OBJECT public: - explicit QSplineSeries(QObject *parent = 0); + explicit QSplineSeries(QObject *parent = Q_NULLPTR); ~QSplineSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/xychart/qhxymodelmapper.h b/src/charts/xychart/qhxymodelmapper.h index fa9defdd..4e36d9b4 100644 --- a/src/charts/xychart/qhxymodelmapper.h +++ b/src/charts/xychart/qhxymodelmapper.h @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QHXYModelMapper : public QXYModelMapper Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged) public: - explicit QHXYModelMapper(QObject *parent = 0); + explicit QHXYModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/xychart/qvxymodelmapper.h b/src/charts/xychart/qvxymodelmapper.h index f24ed0af..b0984179 100644 --- a/src/charts/xychart/qvxymodelmapper.h +++ b/src/charts/xychart/qvxymodelmapper.h @@ -37,7 +37,7 @@ class QT_CHARTS_EXPORT QVXYModelMapper : public QXYModelMapper Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVXYModelMapper(QObject *parent = 0); + explicit QVXYModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/xychart/qxymodelmapper.h b/src/charts/xychart/qxymodelmapper.h index e991d3b1..3264d655 100644 --- a/src/charts/xychart/qxymodelmapper.h +++ b/src/charts/xychart/qxymodelmapper.h @@ -39,7 +39,7 @@ class QT_CHARTS_EXPORT QXYModelMapper : public QObject Q_OBJECT protected: - explicit QXYModelMapper(QObject *parent = 0); + explicit QXYModelMapper(QObject *parent = Q_NULLPTR); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/xychart/qxyseries.h b/src/charts/xychart/qxyseries.h index ddbccafe..a3e94fc1 100644 --- a/src/charts/xychart/qxyseries.h +++ b/src/charts/xychart/qxyseries.h @@ -48,7 +48,7 @@ class QT_CHARTS_EXPORT QXYSeries : public QAbstractSeries Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged) protected: - explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = 0); + explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = Q_NULLPTR); public: ~QXYSeries(); diff --git a/src/chartsqml2/declarativebarseries.cpp b/src/chartsqml2/declarativebarseries.cpp index 7d32cfe6..526d9af6 100644 --- a/src/chartsqml2/declarativebarseries.cpp +++ b/src/chartsqml2/declarativebarseries.cpp @@ -69,7 +69,7 @@ void DeclarativeBarSet::setValues(QVariantList values) while (count()) remove(count() - 1); - if (values.at(0).canConvert(QVariant::Point)) { + if (values.count() > 0 && values.at(0).canConvert(QVariant::Point)) { // Create list of values for appending if the first item is Qt.point int maxValue = 0; for (int i = 0; i < values.count(); i++) { diff --git a/tests/manual/chartwidgettest/mainwidget.cpp b/tests/manual/chartwidgettest/mainwidget.cpp index 61afdb2c..9287a028 100644 --- a/tests/manual/chartwidgettest/mainwidget.cpp +++ b/tests/manual/chartwidgettest/mainwidget.cpp @@ -208,9 +208,9 @@ QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QStr QList <qreal> newColumn; for (int i(0); i < rowCount; i++) { if (dataCharacteristics == "Sin") { - newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100)); + newColumn.append(std::abs(sin(3.14159265358979 / 50 * i) * 100)); } else if (dataCharacteristics == "Sin + random") { - newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5)); + newColumn.append(std::abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5)); } else if (dataCharacteristics == "Random") { newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX); } else if (dataCharacteristics == "Linear") { |