diff options
author | Alexander Volkov <avolkov@astralinux.ru> | 2020-06-24 16:21:07 +0300 |
---|---|---|
committer | Alexander Volkov <avolkov@astralinux.ru> | 2020-06-25 13:57:55 +0300 |
commit | b01f476957f31a109b5e293b596aee2fb3c07c7f (patch) | |
tree | 16f9a2d61563e816cc4bef76d50abbb85ad41ca9 /src | |
parent | 2b1698862d93c4256ea4deae720d00269c448d5e (diff) |
Add missing override
Change-Id: I9544a80e1f73b3490c5c2d6bb246f83c41561c53
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src')
133 files changed, 535 insertions, 533 deletions
diff --git a/src/charts/animations/axisanimation_p.h b/src/charts/animations/axisanimation_p.h index 43144161..b094a915 100644 --- a/src/charts/animations/axisanimation_p.h +++ b/src/charts/animations/axisanimation_p.h @@ -57,8 +57,8 @@ public: void setAnimationPoint(const QPointF &point); void setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayout); protected: - QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const; - void updateCurrentValue(const QVariant &value); + QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const override; + void updateCurrentValue(const QVariant &value) override; private: ChartAxisElement *m_axis; Animation m_type; diff --git a/src/charts/animations/baranimation_p.h b/src/charts/animations/baranimation_p.h index d0fcc286..9d0af101 100644 --- a/src/charts/animations/baranimation_p.h +++ b/src/charts/animations/baranimation_p.h @@ -55,8 +55,8 @@ public: ~BarAnimation(); public: // from QVariantAnimation - virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const; - virtual void updateCurrentValue(const QVariant &value); + QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const override; + void updateCurrentValue(const QVariant &value) override; void setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout); diff --git a/src/charts/animations/boxwhiskersanimation_p.h b/src/charts/animations/boxwhiskersanimation_p.h index 34f30012..2e31ddc3 100644 --- a/src/charts/animations/boxwhiskersanimation_p.h +++ b/src/charts/animations/boxwhiskersanimation_p.h @@ -59,8 +59,8 @@ public: ~BoxWhiskersAnimation(); public: // from QVariantAnimation - virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const; - virtual void updateCurrentValue(const QVariant &value); + QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const override; + void updateCurrentValue(const QVariant &value) override; void setup(const BoxWhiskersData &startData, const BoxWhiskersData &endData); void setEndData(const BoxWhiskersData &endData); diff --git a/src/charts/animations/candlestickbodywicksanimation_p.h b/src/charts/animations/candlestickbodywicksanimation_p.h index cf015e08..5411c23e 100644 --- a/src/charts/animations/candlestickbodywicksanimation_p.h +++ b/src/charts/animations/candlestickbodywicksanimation_p.h @@ -62,8 +62,8 @@ public: void setEndData(const CandlestickData &endData); // from QVariantAnimation - virtual void updateCurrentValue(const QVariant &value); - virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const; + void updateCurrentValue(const QVariant &value) override; + QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const override; protected: Candlestick *m_candlestick; diff --git a/src/charts/animations/pieanimation_p.h b/src/charts/animations/pieanimation_p.h index 8a9b2e5f..45862da9 100644 --- a/src/charts/animations/pieanimation_p.h +++ b/src/charts/animations/pieanimation_p.h @@ -60,7 +60,7 @@ public: ChartAnimation *removeSlice(PieSliceItem *sliceItem); public: // from QVariantAnimation - void updateCurrentValue(const QVariant &value); + void updateCurrentValue(const QVariant &value) override; private: PieChartItem *m_item; diff --git a/src/charts/animations/piesliceanimation_p.h b/src/charts/animations/piesliceanimation_p.h index 15d5ed91..4c85b764 100644 --- a/src/charts/animations/piesliceanimation_p.h +++ b/src/charts/animations/piesliceanimation_p.h @@ -57,8 +57,8 @@ public: PieSliceData currentSliceValue(); protected: - QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const; - void updateCurrentValue(const QVariant &value); + QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const override; + void updateCurrentValue(const QVariant &value) override; private: PieSliceItem *m_sliceItem; diff --git a/src/charts/animations/scatteranimation_p.h b/src/charts/animations/scatteranimation_p.h index bb3021c1..ab42ee40 100644 --- a/src/charts/animations/scatteranimation_p.h +++ b/src/charts/animations/scatteranimation_p.h @@ -53,7 +53,8 @@ public: ~ScatterAnimation(); protected: - void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState); + + void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override; }; QT_CHARTS_END_NAMESPACE diff --git a/src/charts/animations/splineanimation_p.h b/src/charts/animations/splineanimation_p.h index d49e8523..46f58ac8 100644 --- a/src/charts/animations/splineanimation_p.h +++ b/src/charts/animations/splineanimation_p.h @@ -57,9 +57,9 @@ public: void setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldContorlPoints, QVector<QPointF> &newControlPoints, int index = -1); protected: - QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const; - void updateCurrentValue(const QVariant &value); - void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState); + QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const override; + void updateCurrentValue(const QVariant &value) override; + void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override; private: SplineVector m_oldSpline; diff --git a/src/charts/animations/xyanimation_p.h b/src/charts/animations/xyanimation_p.h index a120c559..9ce36e77 100644 --- a/src/charts/animations/xyanimation_p.h +++ b/src/charts/animations/xyanimation_p.h @@ -58,9 +58,9 @@ public: Animation animationType() const { return m_type; }; protected: - QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const; - void updateCurrentValue(const QVariant &value); - void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState); + QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const override; + void updateCurrentValue(const QVariant &value) override; + void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override; XYChart *chartItem() { return m_item; } protected: Animation m_type; diff --git a/src/charts/areachart/areachartitem_p.h b/src/charts/areachart/areachartitem_p.h index e71bf34e..4d966bf7 100644 --- a/src/charts/areachart/areachartitem_p.h +++ b/src/charts/areachart/areachartitem_p.h @@ -57,27 +57,27 @@ public: ~AreaChartItem(); //from QGraphicsItem - QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - QPainterPath shape() const; + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + QPainterPath shape() const override; LineChartItem *upperLineItem() const { return m_upper; } LineChartItem *lowerLineItem() const { return m_lower; } void updatePath(); - void setPresenter(ChartPresenter *presenter); + void setPresenter(ChartPresenter *presenter) override; QAreaSeries *series() const { return m_series; } void setUpperSeries(QLineSeries *series); void setLowerSeries(QLineSeries *series); protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; Q_SIGNALS: void clicked(const QPointF &point); @@ -88,7 +88,7 @@ Q_SIGNALS: public Q_SLOTS: void handleUpdated(); - void handleDomainUpdated(); + void handleDomainUpdated() override; private: void fixEdgeSeriesDomain(LineChartItem *edgeSeries); @@ -126,7 +126,7 @@ public: } ~AreaBoundItem() {} - void updateGeometry() + void updateGeometry() override { // Make sure the series is in a chart before trying to update if (m_item->series()->chart()) { diff --git a/src/charts/areachart/qareaseries.h b/src/charts/areachart/qareaseries.h index ba775f7e..871a4f8b 100644 --- a/src/charts/areachart/qareaseries.h +++ b/src/charts/areachart/qareaseries.h @@ -60,7 +60,7 @@ public: ~QAreaSeries(); public: - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; void setUpperSeries(QLineSeries *series); QLineSeries *upperSeries() const; diff --git a/src/charts/areachart/qareaseries_p.h b/src/charts/areachart/qareaseries_p.h index 6b111d15..8904712a 100644 --- a/src/charts/areachart/qareaseries_p.h +++ b/src/charts/areachart/qareaseries_p.h @@ -54,17 +54,17 @@ class Q_CHARTS_PRIVATE_EXPORT QAreaSeriesPrivate: public QAbstractSeriesPrivate public: QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries, QAreaSeries *q); - void initializeDomain(); - void initializeAxes(); - void initializeGraphics(QGraphicsItem* parent); - void initializeTheme(int index, ChartTheme* theme, bool forced = false); + void initializeDomain() override; + void initializeAxes() override; + void initializeGraphics(QGraphicsItem* parent) override; + void initializeTheme(int index, ChartTheme* theme, bool forced = false) override; void initializeAnimations(QChart::AnimationOptions options, int duration, - QEasingCurve &curve); + QEasingCurve &curve) override; - QList<QLegendMarker *> createLegendMarkers(QLegend *legend); + QList<QLegendMarker *> createLegendMarkers(QLegend *legend) override; - QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; - QAbstractAxis* createDefaultAxis(Qt::Orientation) const; + QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const override; + QAbstractAxis* createDefaultAxis(Qt::Orientation) const override; Q_SIGNALS: void updated(); diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h index 0bfdd089..0dfc3926 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h @@ -54,10 +54,10 @@ public: ChartBarCategoryAxisX(QBarCategoryAxis *axis, QGraphicsItem* item = 0); ~ChartBarCategoryAxisX(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override; protected: - QVector<qreal> calculateLayout() const; - void updateGeometry(); + QVector<qreal> calculateLayout() const override; + void updateGeometry() override; private: QStringList createCategoryLabels(const QVector<qreal>& layout) const; public Q_SLOTS: diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h index 5a67f93e..3f4b0966 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h @@ -54,10 +54,10 @@ public: ChartBarCategoryAxisY(QBarCategoryAxis *axis, QGraphicsItem* item = 0); ~ChartBarCategoryAxisY(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override; protected: - QVector<qreal> calculateLayout() const; - void updateGeometry(); + QVector<qreal> calculateLayout() const override; + void updateGeometry() override; private: QStringList createCategoryLabels(const QVector<qreal>& layout) const; public Q_SLOTS: diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h index d4b405c4..2f85eb06 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h @@ -52,7 +52,7 @@ protected: QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = nullptr); public: - AxisType type() const; + AxisType type() const override; void append(const QStringList &categories); void append(const QString &category); void remove(const QString &category); diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h index 4671de1e..2512bbac 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h @@ -56,19 +56,19 @@ public: ~QBarCategoryAxisPrivate(); public: - void initializeGraphics(QGraphicsItem* parent); - void initializeDomain(AbstractDomain *domain); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeDomain(AbstractDomain *domain) override; void updateCategoryDomain(); //interface for manipulating range form base class - void setRange(const QVariant &min, const QVariant &max); - void setMin(const QVariant &min); - void setMax(const QVariant &max); + void setRange(const QVariant &min, const QVariant &max) override; + void setMin(const QVariant &min) override; + void setMax(const QVariant &max) override; //interface manipulating range form domain - qreal min() { return m_min; } - qreal max() { return m_max; } - void setRange(qreal min,qreal max); + qreal min() override { return m_min; } + qreal max() override { return m_max; } + void setRange(qreal min,qreal max) override; private: //range handling diff --git a/src/charts/axis/cartesianchartaxis_p.h b/src/charts/axis/cartesianchartaxis_p.h index 3361aaf7..6e9d59bf 100644 --- a/src/charts/axis/cartesianchartaxis_p.h +++ b/src/charts/axis/cartesianchartaxis_p.h @@ -56,28 +56,28 @@ public: CartesianChartAxis(QAbstractAxis *axis, QGraphicsItem *item = 0, bool intervalAxis = false); ~CartesianChartAxis(); - void setGeometry(const QRectF &axis, const QRectF &grid); - QRectF gridGeometry() const { return m_gridRect; } - bool isEmpty(); + void setGeometry(const QRectF &axis, const QRectF &grid) override; + QRectF gridGeometry() const override { return m_gridRect; } + bool isEmpty() override; - virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; void setDateTimeLabelsFormat(const QString &format); protected: - void setGeometry(const QRectF &size) { Q_UNUSED(size);} - virtual void updateGeometry() = 0; - void updateLayout(QVector<qreal> &layout); + void setGeometry(const QRectF &size) override { Q_UNUSED(size);} + void updateGeometry() override = 0; + void updateLayout(QVector<qreal> &layout) override; public Q_SLOTS: - virtual void handleArrowPenChanged(const QPen &pen); - virtual void handleGridPenChanged(const QPen &pen); - virtual void handleShadesBrushChanged(const QBrush &brush); - virtual void handleShadesPenChanged(const QPen &pen); - virtual void handleMinorArrowPenChanged(const QPen &pen); - virtual void handleMinorGridPenChanged(const QPen &pen); - virtual void handleGridLineColorChanged(const QColor &color); - virtual void handleMinorGridLineColorChanged(const QColor &color); + void handleArrowPenChanged(const QPen &pen) override; + void handleGridPenChanged(const QPen &pen) override; + void handleShadesBrushChanged(const QBrush &brush) override; + void handleShadesPenChanged(const QPen &pen) override; + void handleMinorArrowPenChanged(const QPen &pen) override; + void handleMinorGridPenChanged(const QPen &pen) override; + void handleGridLineColorChanged(const QColor &color) override; + void handleMinorGridLineColorChanged(const QColor &color) override; protected: void updateLabelsValues(QValueAxis *axis); diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h index 9dd07f98..547d9a63 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h +++ b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h @@ -53,14 +53,14 @@ public: ChartCategoryAxisX(QCategoryAxis *axis, QGraphicsItem* item = 0); ~ChartCategoryAxisX(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override; public Q_SLOTS: void handleCategoriesChanged(); protected: - QVector<qreal> calculateLayout() const; - void updateGeometry(); + QVector<qreal> calculateLayout() const override; + void updateGeometry() override; private: QCategoryAxis *m_axis; diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h index 10b84d0f..736dfb60 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h +++ b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h @@ -53,14 +53,14 @@ public: ChartCategoryAxisY(QCategoryAxis *axis, QGraphicsItem* item = 0); ~ChartCategoryAxisY(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override; public Q_SLOTS: void handleCategoriesChanged(); protected: - QVector<qreal> calculateLayout() const; - void updateGeometry(); + QVector<qreal> calculateLayout() const override; + void updateGeometry() override; private: QCategoryAxis *m_axis; diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h index 2e3dec54..ff03a9cc 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h @@ -54,8 +54,8 @@ public: PolarChartCategoryAxisAngular(QCategoryAxis *axis, QGraphicsItem *item); ~PolarChartCategoryAxisAngular(); - virtual QVector<qreal> calculateLayout() const; - virtual void createAxisLabels(const QVector<qreal> &layout); + QVector<qreal> calculateLayout() const override; + void createAxisLabels(const QVector<qreal> &layout) override; public Q_SLOTS: void handleCategoriesChanged(); diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h index c9761cb0..3a5a913f 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h @@ -54,8 +54,8 @@ public: PolarChartCategoryAxisRadial(QCategoryAxis *axis, QGraphicsItem *item); ~PolarChartCategoryAxisRadial(); - virtual QVector<qreal> calculateLayout() const; - virtual void createAxisLabels(const QVector<qreal> &layout); + QVector<qreal> calculateLayout() const override; + void createAxisLabels(const QVector<qreal> &layout) override; public Q_SLOTS: void handleCategoriesChanged(); diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.h b/src/charts/axis/categoryaxis/qcategoryaxis.h index 6c6f9bf4..4d6c6fee 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis.h @@ -60,7 +60,7 @@ protected: QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = nullptr); public: - AxisType type() const; + AxisType type() const override; void append(const QString &label, qreal categoryEndValue); void remove(const QString &label); diff --git a/src/charts/axis/categoryaxis/qcategoryaxis_p.h b/src/charts/axis/categoryaxis/qcategoryaxis_p.h index f0fdc0d6..4fa5ad2a 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis_p.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis_p.h @@ -55,7 +55,7 @@ public: QCategoryAxisPrivate(QCategoryAxis *q); ~QCategoryAxisPrivate(); - void initializeGraphics(QGraphicsItem* parent); + void initializeGraphics(QGraphicsItem* parent) override; int ticksCount() const; private: diff --git a/src/charts/axis/chartaxiselement_p.h b/src/charts/axis/chartaxiselement_p.h index 32ed9425..c32896c4 100644 --- a/src/charts/axis/chartaxiselement_p.h +++ b/src/charts/axis/chartaxiselement_p.h @@ -70,7 +70,7 @@ public: virtual bool isEmpty() = 0; void setAnimation(AxisAnimation *animation) { m_animation = animation; } - AxisAnimation *animation() const { return m_animation; } + AxisAnimation *animation() const override { return m_animation; } QAbstractAxis *axis() const { return m_axis; } void setLayout(QVector<qreal> &layout) { m_layout = layout; } @@ -104,13 +104,13 @@ public: QStringList createDateTimeLabels(qreal max, qreal min, int ticks, const QString &format) const; // from QGraphicsLayoutItem - QRectF boundingRect() const + QRectF boundingRect() const override { return QRectF(); } // from QGraphicsLayoutItem - void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) + void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) override { } diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h index 37653049..7f1e1417 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h @@ -53,10 +53,10 @@ public: ChartDateTimeAxisX(QDateTimeAxis *axis, QGraphicsItem* item = 0); ~ChartDateTimeAxisX(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override; protected: - QVector<qreal> calculateLayout() const; - void updateGeometry(); + QVector<qreal> calculateLayout() const override; + void updateGeometry() override; private Q_SLOTS: void handleTickCountChanged(int tick); void handleFormatChanged(const QString &format); diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h index 01b4f876..29b5d0c1 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h @@ -53,10 +53,10 @@ public: ChartDateTimeAxisY(QDateTimeAxis *axis, QGraphicsItem* item = 0); ~ChartDateTimeAxisY(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override; protected: - QVector<qreal> calculateLayout() const; - void updateGeometry(); + QVector<qreal> calculateLayout() const override; + void updateGeometry() override; private Q_SLOTS: void handleTickCountChanged(int tick); void handleFormatChanged(const QString &format); diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h index 9b64dc9a..a0311b6f 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h @@ -53,8 +53,8 @@ public: PolarChartDateTimeAxisAngular(QDateTimeAxis *axis, QGraphicsItem *item); ~PolarChartDateTimeAxisAngular(); - virtual QVector<qreal> calculateLayout() const; - virtual void createAxisLabels(const QVector<qreal> &layout); + QVector<qreal> calculateLayout() const override; + void createAxisLabels(const QVector<qreal> &layout) override; private Q_SLOTS: void handleTickCountChanged(int tick); diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h index e3aed15c..b4ccc373 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h @@ -53,8 +53,8 @@ public: PolarChartDateTimeAxisRadial(QDateTimeAxis *axis, QGraphicsItem *item); ~PolarChartDateTimeAxisRadial(); - virtual QVector<qreal> calculateLayout() const; - virtual void createAxisLabels(const QVector<qreal> &layout); + QVector<qreal> calculateLayout() const override; + void createAxisLabels(const QVector<qreal> &layout) override; private Q_SLOTS: void handleTickCountChanged(int tick); diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.h b/src/charts/axis/datetimeaxis/qdatetimeaxis.h index 101737d3..a2ce4145 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis.h +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.h @@ -56,7 +56,7 @@ protected: QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = nullptr); public: - AxisType type() const; + AxisType type() const override; //range handling void setMin(QDateTime min); diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h index 30ddd214..5ca8bc89 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h @@ -54,18 +54,18 @@ public: ~QDateTimeAxisPrivate(); public: - void initializeGraphics(QGraphicsItem* parent); - void initializeDomain(AbstractDomain *domain); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeDomain(AbstractDomain *domain) override; //interface for manipulating range form base class - void setMin(const QVariant &min); - void setMax(const QVariant &max); - void setRange(const QVariant &min, const QVariant &max); + void setMin(const QVariant &min) override; + void setMax(const QVariant &max) override; + void setRange(const QVariant &min, const QVariant &max) override; //interface manipulating range form domain - qreal min() { return m_min; } - qreal max() { return m_max; } - void setRange(qreal min,qreal max); + qreal min() override { return m_min; } + qreal max() override { return m_max; } + void setRange(qreal min,qreal max) override; protected: int tickCount() const; diff --git a/src/charts/axis/editableaxislabel_p.h b/src/charts/axis/editableaxislabel_p.h index a29736c1..56800b52 100644 --- a/src/charts/axis/editableaxislabel_p.h +++ b/src/charts/axis/editableaxislabel_p.h @@ -53,13 +53,13 @@ class Q_CHARTS_PRIVATE_EXPORT EditableAxisLabel : public QGraphicsTextItem public: EditableAxisLabel(QGraphicsItem *parent = nullptr); - void focusInEvent(QFocusEvent *event); - void focusOutEvent(QFocusEvent *event); - bool sceneEvent(QEvent *event); + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + bool sceneEvent(QEvent *event) override; void setEditable(bool editable); void reloadBeforeEditContent(); - QRectF boundingRect() const; + QRectF boundingRect() const override; protected: QString m_htmlBeforeEdit; diff --git a/src/charts/axis/linearrowitem_p.h b/src/charts/axis/linearrowitem_p.h index 2ea3812f..4635452e 100644 --- a/src/charts/axis/linearrowitem_p.h +++ b/src/charts/axis/linearrowitem_p.h @@ -57,18 +57,18 @@ public: } protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event) + void mousePressEvent(QGraphicsSceneMouseEvent *event) override { m_axis->axisSelected(); QGraphicsLineItem::mousePressEvent(event); } - QRectF boundingRect() const + QRectF boundingRect() const override { return shape().boundingRect(); } - QPainterPath shape() const + QPainterPath shape() const override { QPainterPath path = QGraphicsLineItem::shape(); QRectF rect = path.boundingRect(); diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h index 1b61a38b..74bf83a4 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h @@ -54,11 +54,11 @@ public: ChartLogValueAxisX(QLogValueAxis *axis, QGraphicsItem *item); ~ChartLogValueAxisX(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override; protected: - QVector<qreal> calculateLayout() const; - void updateGeometry(); + QVector<qreal> calculateLayout() const override; + void updateGeometry() override; private Q_SLOTS: void handleBaseChanged(qreal base); diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h index 070a02b1..5a584ee4 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h @@ -54,11 +54,11 @@ public: ChartLogValueAxisY(QLogValueAxis *axis, QGraphicsItem *item); ~ChartLogValueAxisY(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override; protected: - QVector<qreal> calculateLayout() const; - void updateGeometry(); + QVector<qreal> calculateLayout() const override; + void updateGeometry() override; private Q_SLOTS: void handleBaseChanged(qreal base); diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h index 9703ef4d..591038d4 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h @@ -54,8 +54,8 @@ public: ~PolarChartLogValueAxisAngular(); protected: - virtual QVector<qreal> calculateLayout() const; - virtual void createAxisLabels(const QVector<qreal> &layout); + QVector<qreal> calculateLayout() const override; + void createAxisLabels(const QVector<qreal> &layout) override; private Q_SLOTS: void handleBaseChanged(qreal base); diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h index aece4fa1..d7197577 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h @@ -54,8 +54,8 @@ public: ~PolarChartLogValueAxisRadial(); protected: - virtual QVector<qreal> calculateLayout() const; - virtual void createAxisLabels(const QVector<qreal> &layout); + QVector<qreal> calculateLayout() const override; + void createAxisLabels(const QVector<qreal> &layout) override; private Q_SLOTS: void handleBaseChanged(qreal base); diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.h b/src/charts/axis/logvalueaxis/qlogvalueaxis.h index 5952fc5e..266e985f 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis.h +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.h @@ -58,7 +58,7 @@ protected: QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = nullptr); public: - AxisType type() const; + AxisType type() const override; //range handling void setMin(qreal min); diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h index 85145dfe..137959a0 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h @@ -53,19 +53,19 @@ class Q_CHARTS_PRIVATE_EXPORT QLogValueAxisPrivate : public QAbstractAxisPrivate ~QLogValueAxisPrivate(); public: - void initializeGraphics(QGraphicsItem* parent); - void initializeDomain(AbstractDomain *domain); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeDomain(AbstractDomain *domain) override; - qreal min() { return m_min; } - qreal max() { return m_max; } - void setRange(qreal min,qreal max); + qreal min() override { return m_min; } + qreal max() override { return m_max; } + void setRange(qreal min,qreal max) override; void updateTickCount(); protected: - void setMin(const QVariant &min); - void setMax(const QVariant &max); - void setRange(const QVariant &min, const QVariant &max); + void setMin(const QVariant &min) override; + void setMax(const QVariant &max) override; + void setRange(const QVariant &min, const QVariant &max) override; protected: qreal m_min; diff --git a/src/charts/axis/polarchartaxis_p.h b/src/charts/axis/polarchartaxis_p.h index d8f0d9f6..3f068519 100644 --- a/src/charts/axis/polarchartaxis_p.h +++ b/src/charts/axis/polarchartaxis_p.h @@ -52,16 +52,16 @@ public: PolarChartAxis(QAbstractAxis *axis, QGraphicsItem *item, bool intervalAxis = false); ~PolarChartAxis(); - void setGeometry(const QRectF &axis, const QRectF &grid); + void setGeometry(const QRectF &axis, const QRectF &grid) override; virtual qreal preferredAxisRadius(const QSizeF &maxSize) = 0; int tickWidth() { return 3; } public: // from ChartAxisElement - QRectF gridGeometry() const; - bool isEmpty(); + QRectF gridGeometry() const override; + bool isEmpty() override; protected: - void updateLayout(QVector<qreal> &layout); + void updateLayout(QVector<qreal> &layout) override; protected: // virtual functions virtual void createItems(int count) = 0; @@ -69,8 +69,8 @@ protected: // virtual functions virtual void updateMinorTickItems() = 0; public Q_SLOTS: - virtual void handleShadesBrushChanged(const QBrush &brush); - virtual void handleShadesPenChanged(const QPen &pen); + void handleShadesBrushChanged(const QBrush &brush) override; + void handleShadesPenChanged(const QPen &pen) override; private: void deleteItems(int count); diff --git a/src/charts/axis/polarchartaxisangular_p.h b/src/charts/axis/polarchartaxisangular_p.h index de11e52b..5d8522fe 100644 --- a/src/charts/axis/polarchartaxisangular_p.h +++ b/src/charts/axis/polarchartaxisangular_p.h @@ -54,21 +54,21 @@ public: ~PolarChartAxisAngular(); Qt::Orientation orientation() const; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; - virtual void updateGeometry(); - virtual void createItems(int count); - virtual void updateMinorTickItems(); + void updateGeometry() override; + void createItems(int count) override; + void updateMinorTickItems() override; - qreal preferredAxisRadius(const QSizeF &maxSize); + qreal preferredAxisRadius(const QSizeF &maxSize) override; public Q_SLOTS: - virtual void handleArrowPenChanged(const QPen &pen); - virtual void handleGridPenChanged(const QPen &pen); - virtual void handleMinorArrowPenChanged(const QPen &pen); - virtual void handleMinorGridPenChanged(const QPen &pen); - virtual void handleGridLineColorChanged(const QColor &color); - virtual void handleMinorGridLineColorChanged(const QColor &color); + void handleArrowPenChanged(const QPen &pen) override; + void handleGridPenChanged(const QPen &pen) override; + void handleMinorArrowPenChanged(const QPen &pen) override; + void handleMinorGridPenChanged(const QPen &pen) override; + void handleGridLineColorChanged(const QColor &color) override; + void handleMinorGridLineColorChanged(const QColor &color) override; private: QRectF moveLabelToPosition(qreal angularCoordinate, QPointF labelPoint, QRectF labelRect) const; diff --git a/src/charts/axis/polarchartaxisradial_p.h b/src/charts/axis/polarchartaxisradial_p.h index 9ec55235..25e1f870 100644 --- a/src/charts/axis/polarchartaxisradial_p.h +++ b/src/charts/axis/polarchartaxisradial_p.h @@ -54,21 +54,21 @@ public: ~PolarChartAxisRadial(); Qt::Orientation orientation() const; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; - virtual void updateGeometry(); - virtual void createItems(int count); - virtual void updateMinorTickItems(); + void updateGeometry() override; + void createItems(int count) override; + void updateMinorTickItems() override; - qreal preferredAxisRadius(const QSizeF &maxSize); + qreal preferredAxisRadius(const QSizeF &maxSize) override; public Q_SLOTS: - virtual void handleArrowPenChanged(const QPen &pen); - virtual void handleGridPenChanged(const QPen &pen); - virtual void handleMinorArrowPenChanged(const QPen &pen); - virtual void handleMinorGridPenChanged(const QPen &pen); - virtual void handleGridLineColorChanged(const QColor &color); - virtual void handleMinorGridLineColorChanged(const QColor &color); + void handleArrowPenChanged(const QPen &pen) override; + void handleGridPenChanged(const QPen &pen) override; + void handleMinorArrowPenChanged(const QPen &pen) override; + void handleMinorGridPenChanged(const QPen &pen) override; + void handleGridLineColorChanged(const QColor &color) override; + void handleMinorGridLineColorChanged(const QColor &color) override; private: void updateMinorTickGeometry(); diff --git a/src/charts/axis/valueaxis/chartvalueaxisx_p.h b/src/charts/axis/valueaxis/chartvalueaxisx_p.h index 05de436e..b1b14617 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisx_p.h +++ b/src/charts/axis/valueaxis/chartvalueaxisx_p.h @@ -53,10 +53,10 @@ public: ChartValueAxisX(QValueAxis *axis, QGraphicsItem *item = 0); ~ChartValueAxisX(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override; protected: - QVector<qreal> calculateLayout() const; - void updateGeometry(); + QVector<qreal> calculateLayout() const override; + void updateGeometry() override; private Q_SLOTS: void handleTickCountChanged(int tick); void handleMinorTickCountChanged(int tick); diff --git a/src/charts/axis/valueaxis/chartvalueaxisy_p.h b/src/charts/axis/valueaxis/chartvalueaxisy_p.h index 0b3adfad..1e2b5c55 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisy_p.h +++ b/src/charts/axis/valueaxis/chartvalueaxisy_p.h @@ -53,10 +53,10 @@ public: ChartValueAxisY(QValueAxis *axis, QGraphicsItem *item = 0); ~ChartValueAxisY(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override; protected: - QVector<qreal> calculateLayout() const; - void updateGeometry(); + QVector<qreal> calculateLayout() const override; + void updateGeometry() override; private Q_SLOTS: void handleTickCountChanged(int tick); void handleMinorTickCountChanged(int tick); diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h index beb81d0a..3d658267 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h +++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h @@ -54,8 +54,8 @@ public: PolarChartValueAxisAngular(QValueAxis *axis, QGraphicsItem *item); ~PolarChartValueAxisAngular(); - virtual QVector<qreal> calculateLayout() const; - virtual void createAxisLabels(const QVector<qreal> &layout); + QVector<qreal> calculateLayout() const override; + void createAxisLabels(const QVector<qreal> &layout) override; private Q_SLOTS: void handleTickCountChanged(int tick); diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h index a1b82070..a60c3ae7 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h +++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h @@ -53,8 +53,8 @@ public: PolarChartValueAxisRadial(QValueAxis *axis, QGraphicsItem *item); ~PolarChartValueAxisRadial(); - virtual QVector<qreal> calculateLayout() const; - virtual void createAxisLabels(const QVector<qreal> &layout); + QVector<qreal> calculateLayout() const override; + void createAxisLabels(const QVector<qreal> &layout) override; private Q_SLOTS: void handleTickCountChanged(int tick); diff --git a/src/charts/axis/valueaxis/qvalueaxis.h b/src/charts/axis/valueaxis/qvalueaxis.h index 03b82342..ebcd399c 100644 --- a/src/charts/axis/valueaxis/qvalueaxis.h +++ b/src/charts/axis/valueaxis/qvalueaxis.h @@ -63,7 +63,7 @@ protected: QValueAxis(QValueAxisPrivate &d, QObject *parent = nullptr); public: - AxisType type() const; + AxisType type() const override; //range handling void setMin(qreal min); diff --git a/src/charts/axis/valueaxis/qvalueaxis_p.h b/src/charts/axis/valueaxis/qvalueaxis_p.h index 42ed6b41..07603086 100644 --- a/src/charts/axis/valueaxis/qvalueaxis_p.h +++ b/src/charts/axis/valueaxis/qvalueaxis_p.h @@ -53,20 +53,20 @@ public: ~QValueAxisPrivate(); public: - void initializeGraphics(QGraphicsItem* parent); - void initializeDomain(AbstractDomain *domain); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeDomain(AbstractDomain *domain) override; - qreal min() { return m_min; } - qreal max() { return m_max; } - void setRange(qreal min,qreal max); + qreal min() override { return m_min; } + qreal max() override { return m_max; } + void setRange(qreal min,qreal max) override; qreal tickInterval() { return m_tickInterval; } qreal tickAnchor() { return m_tickAnchor; } protected: - void setMin(const QVariant &min); - void setMax(const QVariant &max); - void setRange(const QVariant &min, const QVariant &max); + void setMin(const QVariant &min) override; + void setMax(const QVariant &max) override; + void setRange(const QVariant &min, const QVariant &max) override; private: qreal m_min; diff --git a/src/charts/barchart/abstractbarchartitem_p.h b/src/charts/barchart/abstractbarchartitem_p.h index 92e2304a..72f3ad5b 100644 --- a/src/charts/barchart/abstractbarchartitem_p.h +++ b/src/charts/barchart/abstractbarchartitem_p.h @@ -63,21 +63,21 @@ public: virtual ~AbstractBarChartItem(); public: - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - QRectF boundingRect() const; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + QRectF boundingRect() const override; virtual QVector<QRectF> calculateLayout() = 0; void initializeFullLayout(); virtual void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) = 0; virtual void applyLayout(const QVector<QRectF> &layout); virtual void setAnimation(BarAnimation *animation); - virtual ChartAnimation *animation() const; + ChartAnimation *animation() const override; void setLayout(const QVector<QRectF> &layout); QRectF geometry() const { return m_rect;} void resetAnimation(); public Q_SLOTS: - void handleDomainUpdated(); + void handleDomainUpdated() override; void handleLayoutChanged(); void handleLabelsVisibleChanged(bool visible); void handleDataStructureChanged(); // structure of of series has changed, recreate graphic items diff --git a/src/charts/barchart/bar_p.h b/src/charts/barchart/bar_p.h index d29ce5a9..7b18a048 100644 --- a/src/charts/barchart/bar_p.h +++ b/src/charts/barchart/bar_p.h @@ -57,13 +57,13 @@ public: ~Bar(); public: - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; void setVisualsDirty(bool dirty) { m_visualsDirty = dirty; } bool visualsDirty() const { return m_visualsDirty; } void setLabelDirty(bool dirty) { m_labelDirty = dirty; } diff --git a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h index 64154e8e..9e303440 100644 --- a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h +++ b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h @@ -52,8 +52,8 @@ public: HorizontalBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0); private: - virtual QVector<QRectF> calculateLayout(); - void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation); + QVector<QRectF> calculateLayout() override; + void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) override; QPointF topLeftPoint(int set, int setCount, int category, qreal barWidth, qreal value); QPointF bottomRightPoint(int set, int setCount, int category, qreal barWidth, qreal value); }; diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h index bf5ed30f..0b736a3f 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h @@ -42,7 +42,7 @@ class Q_CHARTS_EXPORT QHorizontalBarSeries : public QAbstractBarSeries public: explicit QHorizontalBarSeries(QObject *parent = nullptr); ~QHorizontalBarSeries(); - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; private: Q_DECLARE_PRIVATE(QHorizontalBarSeries) diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h index d66ade48..3ef294a9 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h @@ -49,8 +49,8 @@ class Q_CHARTS_PRIVATE_EXPORT QHorizontalBarSeriesPrivate: public QAbstractBarSe { public: QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q); - void initializeGraphics(QGraphicsItem* parent); - void initializeDomain(); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeDomain() override; private: Q_DECLARE_PUBLIC(QHorizontalBarSeries) }; diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h index ac2eb4aa..0006202d 100644 --- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h +++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h @@ -50,12 +50,12 @@ class Q_CHARTS_PRIVATE_EXPORT HorizontalPercentBarChartItem : public AbstractBar Q_OBJECT public: HorizontalPercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0); - virtual QString generateLabelText(int set, int category, qreal value); + QString generateLabelText(int set, int category, qreal value) override; private: - virtual QVector<QRectF> calculateLayout(); - void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation); - void markLabelsDirty(QBarSet *barset, int index, int count); + QVector<QRectF> calculateLayout() override; + void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) override; + void markLabelsDirty(QBarSet *barset, int index, int count) override; QPointF topLeftPoint(int category, qreal barWidth, qreal value); QPointF bottomRightPoint(int category, qreal barWidth, qreal value); }; diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h index 49b3ad2b..8bbdda8c 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h @@ -42,7 +42,7 @@ class Q_CHARTS_EXPORT QHorizontalPercentBarSeries : public QAbstractBarSeries public: explicit QHorizontalPercentBarSeries(QObject *parent = nullptr); ~QHorizontalPercentBarSeries(); - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; private: Q_DECLARE_PRIVATE(QHorizontalPercentBarSeries) diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h index 24c0bf67..7001a212 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h @@ -49,8 +49,8 @@ class Q_CHARTS_PRIVATE_EXPORT QHorizontalPercentBarSeriesPrivate: public QAbstra { public: QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries *q); - void initializeGraphics(QGraphicsItem* parent); - void initializeDomain(); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeDomain() override; private: Q_DECLARE_PUBLIC(QHorizontalPercentBarSeries) }; diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h index a05c1107..f779415f 100644 --- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h +++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h @@ -52,8 +52,8 @@ public: HorizontalStackedBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0); private: - virtual QVector<QRectF> calculateLayout(); - void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation); + QVector<QRectF> calculateLayout() override; + void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) override; QPointF topLeftPoint(int category, qreal barWidth, qreal value); QPointF bottomRightPoint(int category, qreal barWidth, qreal value); }; diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h index dff60ff5..ab50d6d1 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h @@ -42,7 +42,7 @@ class Q_CHARTS_EXPORT QHorizontalStackedBarSeries : public QAbstractBarSeries public: explicit QHorizontalStackedBarSeries(QObject *parent = nullptr); ~QHorizontalStackedBarSeries(); - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; private: Q_DECLARE_PRIVATE(QHorizontalStackedBarSeries) diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h index a5810336..73108206 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h @@ -49,8 +49,8 @@ class Q_CHARTS_PRIVATE_EXPORT QHorizontalStackedBarSeriesPrivate: public QAbstra { public: QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q); - void initializeGraphics(QGraphicsItem* parent); - void initializeDomain(); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeDomain() override; private: Q_DECLARE_PUBLIC(QHorizontalStackedBarSeries) }; diff --git a/src/charts/barchart/qabstractbarseries_p.h b/src/charts/barchart/qabstractbarseries_p.h index a2902fb6..e4ffb840 100644 --- a/src/charts/barchart/qabstractbarseries_p.h +++ b/src/charts/barchart/qabstractbarseries_p.h @@ -64,15 +64,15 @@ public: void setVisible(bool visible); void setLabelsVisible(bool visible); - void initializeDomain(); - void initializeAxes(); - void initializeAnimations(QChart::AnimationOptions options, int duration, QEasingCurve &curve); - void initializeTheme(int index, ChartTheme* theme, bool forced = false); + void initializeDomain() override; + void initializeAxes() override; + void initializeAnimations(QChart::AnimationOptions options, int duration, QEasingCurve &curve) override; + void initializeTheme(int index, ChartTheme* theme, bool forced = false) override; - QList<QLegendMarker*> createLegendMarkers(QLegend *legend); + QList<QLegendMarker*> createLegendMarkers(QLegend *legend) override; - virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; - QAbstractAxis* createDefaultAxis(Qt::Orientation orientation) const; + virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const override; + QAbstractAxis* createDefaultAxis(Qt::Orientation orientation) const override; bool append(QBarSet *set); bool remove(QBarSet *set); diff --git a/src/charts/barchart/vertical/bar/barchartitem_p.h b/src/charts/barchart/vertical/bar/barchartitem_p.h index f6e8b71f..da62dee7 100644 --- a/src/charts/barchart/vertical/bar/barchartitem_p.h +++ b/src/charts/barchart/vertical/bar/barchartitem_p.h @@ -55,12 +55,12 @@ public: private Q_SLOTS: void handleLabelsPositionChanged(); - void positionLabels(); + void positionLabels() override; private: - virtual QVector<QRectF> calculateLayout(); + QVector<QRectF> calculateLayout() override; void initializeLayout(int set, int category, - int layoutIndex, bool resetAnimation); + int layoutIndex, bool resetAnimation) override; QPointF topLeftPoint(int set, int setCount, int category, qreal barWidth, qreal value); QPointF bottomRightPoint(int set, int setCount, int category, qreal barWidth, qreal value); }; diff --git a/src/charts/barchart/vertical/bar/qbarseries.h b/src/charts/barchart/vertical/bar/qbarseries.h index c6cde538..d56e0849 100644 --- a/src/charts/barchart/vertical/bar/qbarseries.h +++ b/src/charts/barchart/vertical/bar/qbarseries.h @@ -42,7 +42,7 @@ class Q_CHARTS_EXPORT QBarSeries : public QAbstractBarSeries public: explicit QBarSeries(QObject *parent = nullptr); ~QBarSeries(); - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; private: Q_DECLARE_PRIVATE(QBarSeries) diff --git a/src/charts/barchart/vertical/bar/qbarseries_p.h b/src/charts/barchart/vertical/bar/qbarseries_p.h index 16b633cb..6fc3e011 100644 --- a/src/charts/barchart/vertical/bar/qbarseries_p.h +++ b/src/charts/barchart/vertical/bar/qbarseries_p.h @@ -50,8 +50,8 @@ class Q_CHARTS_PRIVATE_EXPORT QBarSeriesPrivate: public QAbstractBarSeriesPrivat { public: QBarSeriesPrivate(QBarSeries *q); - void initializeGraphics(QGraphicsItem* parent); - void initializeDomain(); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeDomain() override; private: Q_DECLARE_PUBLIC(QBarSeries) diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h index 344e23fb..73c50490 100644 --- a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h +++ b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h @@ -53,16 +53,16 @@ class Q_CHARTS_PRIVATE_EXPORT PercentBarChartItem : public AbstractBarChartItem Q_OBJECT public: PercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0); - QString generateLabelText(int set, int category, qreal value); + QString generateLabelText(int set, int category, qreal value) override; private Q_SLOTS: void handleLabelsPositionChanged(); - void positionLabels(); + void positionLabels() override; private: - virtual QVector<QRectF> calculateLayout(); - void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation); - void markLabelsDirty(QBarSet *barset, int index, int count); + QVector<QRectF> calculateLayout() override; + void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) override; + void markLabelsDirty(QBarSet *barset, int index, int count) override; QPointF topLeftPoint(int category, qreal barWidth, qreal value); QPointF bottomRightPoint(int category, qreal barWidth, qreal value); }; diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.h b/src/charts/barchart/vertical/percent/qpercentbarseries.h index 71ecdcf9..542e1512 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries.h +++ b/src/charts/barchart/vertical/percent/qpercentbarseries.h @@ -43,7 +43,7 @@ class Q_CHARTS_EXPORT QPercentBarSeries : public QAbstractBarSeries public: explicit QPercentBarSeries(QObject *parent = nullptr); ~QPercentBarSeries(); - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; private: Q_DECLARE_PRIVATE(QPercentBarSeries) diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h index 96dd0d77..550e4464 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h +++ b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h @@ -50,8 +50,8 @@ class Q_CHARTS_PRIVATE_EXPORT QPercentBarSeriesPrivate: public QAbstractBarSerie { public: QPercentBarSeriesPrivate(QPercentBarSeries *q); - void initializeDomain(); - void initializeGraphics(QGraphicsItem* parent); + void initializeDomain() override; + void initializeGraphics(QGraphicsItem* parent) override; private: Q_DECLARE_PUBLIC(QPercentBarSeries) }; diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries.h b/src/charts/barchart/vertical/stacked/qstackedbarseries.h index 466baf08..9ebf9fcd 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries.h +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries.h @@ -43,7 +43,7 @@ class Q_CHARTS_EXPORT QStackedBarSeries : public QAbstractBarSeries public: explicit QStackedBarSeries(QObject *parent = nullptr); ~QStackedBarSeries(); - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; private: Q_DECLARE_PRIVATE(QStackedBarSeries) diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h index 5b9d4cd4..25234f4f 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h @@ -50,8 +50,8 @@ class Q_CHARTS_PRIVATE_EXPORT QStackedBarSeriesPrivate: public QAbstractBarSerie { public: QStackedBarSeriesPrivate(QStackedBarSeries *q); - void initializeGraphics(QGraphicsItem* parent); - void initializeDomain(); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeDomain() override; private: Q_DECLARE_PUBLIC(QStackedBarSeries) }; diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h index cef0aec9..0aded9a3 100644 --- a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h +++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h @@ -55,11 +55,11 @@ public: private Q_SLOTS: void handleLabelsPositionChanged(); - void positionLabels(); + void positionLabels() override; private: - virtual QVector<QRectF> calculateLayout(); - void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation); + QVector<QRectF> calculateLayout() override; + void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) override; QPointF topLeftPoint(int category, qreal barWidth, qreal value); QPointF bottomRightPoint(int category, qreal barWidth, qreal value); }; diff --git a/src/charts/boxplotchart/boxplotchartitem_p.h b/src/charts/boxplotchart/boxplotchartitem_p.h index 8a53f438..7d4c36db 100644 --- a/src/charts/boxplotchart/boxplotchartitem_p.h +++ b/src/charts/boxplotchart/boxplotchartitem_p.h @@ -61,14 +61,14 @@ public: void setAnimation(BoxPlotAnimation *animation); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - QRectF boundingRect() const; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + QRectF boundingRect() const override; public Q_SLOTS: void handleSeriesVisibleChanged(); void handleOpacityChanged(); void handleDataStructureChanged(); - void handleDomainUpdated(); + void handleDomainUpdated() override; void handleLayoutChanged(); void handleUpdatedBars(); void handleBoxsetRemove(QList<QBoxSet *> barSets); diff --git a/src/charts/boxplotchart/boxwhiskers_p.h b/src/charts/boxplotchart/boxwhiskers_p.h index 6e6b8a21..d0a80087 100644 --- a/src/charts/boxplotchart/boxwhiskers_p.h +++ b/src/charts/boxplotchart/boxwhiskers_p.h @@ -67,14 +67,14 @@ public: void setBoxOutlined(const bool outlined) { m_boxOutlined = outlined; } void setBoxWidth(const qreal width); - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); - - QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; + + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; void updateGeometry(AbstractDomain *domain); protected: diff --git a/src/charts/boxplotchart/qboxplotseries.h b/src/charts/boxplotchart/qboxplotseries.h index 7c9c129a..958ece58 100644 --- a/src/charts/boxplotchart/qboxplotseries.h +++ b/src/charts/boxplotchart/qboxplotseries.h @@ -59,7 +59,7 @@ public: QList<QBoxSet *> boxSets() const; void clear(); - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; void setBoxOutlineVisible(bool visible); bool boxOutlineVisible(); diff --git a/src/charts/boxplotchart/qboxplotseries_p.h b/src/charts/boxplotchart/qboxplotseries_p.h index a4551015..160b179c 100644 --- a/src/charts/boxplotchart/qboxplotseries_p.h +++ b/src/charts/boxplotchart/qboxplotseries_p.h @@ -57,16 +57,16 @@ public: QBoxPlotSeriesPrivate(QBoxPlotSeries *q); ~QBoxPlotSeriesPrivate(); - void initializeGraphics(QGraphicsItem *parent); - void initializeDomain(); - void initializeAxes(); - void initializeAnimations(QChart::AnimationOptions options, int duration, QEasingCurve &curve); - void initializeTheme(int index, ChartTheme *theme, bool forced = false); + void initializeGraphics(QGraphicsItem *parent) override; + void initializeDomain() override; + void initializeAxes() override; + void initializeAnimations(QChart::AnimationOptions options, int duration, QEasingCurve &curve) override; + void initializeTheme(int index, ChartTheme *theme, bool forced = false) override; - QList<QLegendMarker*> createLegendMarkers(QLegend *legend); + QList<QLegendMarker*> createLegendMarkers(QLegend *legend) override; - virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; - QAbstractAxis *createDefaultAxis(Qt::Orientation orientation) const; + QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const override; + QAbstractAxis *createDefaultAxis(Qt::Orientation orientation) const override; bool append(QBoxSet *set); bool remove(QBoxSet *set); diff --git a/src/charts/candlestickchart/candlestick_p.h b/src/charts/candlestickchart/candlestick_p.h index 0f4c8984..809cb0ba 100644 --- a/src/charts/candlestickchart/candlestick_p.h +++ b/src/charts/candlestickchart/candlestick_p.h @@ -72,14 +72,14 @@ public: void setPen(const QPen &pen); void setLayout(const CandlestickData &data); - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); - - QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,QWidget *widget = nullptr); + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; + + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,QWidget *widget = nullptr) override; Q_SIGNALS: void clicked(QCandlestickSet *set); diff --git a/src/charts/candlestickchart/candlestickchartitem_p.h b/src/charts/candlestickchart/candlestickchartitem_p.h index 8f47121a..fe3a317e 100644 --- a/src/charts/candlestickchart/candlestickchartitem_p.h +++ b/src/charts/candlestickchart/candlestickchartitem_p.h @@ -59,11 +59,11 @@ public: void setAnimation(CandlestickAnimation *animation); - QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; public Q_SLOTS: - void handleDomainUpdated(); + void handleDomainUpdated() override; void handleLayoutUpdated(); void handleCandlesticksUpdated(); void handleCandlestickSeriesChange(); diff --git a/src/charts/candlestickchart/qcandlestickseries.h b/src/charts/candlestickchart/qcandlestickseries.h index 9a223c12..b27f5185 100644 --- a/src/charts/candlestickchart/qcandlestickseries.h +++ b/src/charts/candlestickchart/qcandlestickseries.h @@ -67,7 +67,7 @@ public: QList<QCandlestickSet *> sets() const; int count() const; - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; void setMaximumColumnWidth(qreal maximumColumnWidth); qreal maximumColumnWidth() const; diff --git a/src/charts/candlestickchart/qcandlestickseries_p.h b/src/charts/candlestickchart/qcandlestickseries_p.h index 56a2b6d4..5fd2e695 100644 --- a/src/charts/candlestickchart/qcandlestickseries_p.h +++ b/src/charts/candlestickchart/qcandlestickseries_p.h @@ -58,16 +58,16 @@ public: QCandlestickSeriesPrivate(QCandlestickSeries *q); ~QCandlestickSeriesPrivate(); - void initializeDomain(); - void initializeAxes(); - void initializeTheme(int index, ChartTheme* theme, bool forced = false); - void initializeGraphics(QGraphicsItem* parent); - void initializeAnimations(QChart::AnimationOptions options, int duration, QEasingCurve &curve); + void initializeDomain() override; + void initializeAxes() override; + void initializeTheme(int index, ChartTheme* theme, bool forced = false) override; + void initializeGraphics(QGraphicsItem* parent) override; + void initializeAnimations(QChart::AnimationOptions options, int duration, QEasingCurve &curve) override; - QList<QLegendMarker *> createLegendMarkers(QLegend *legend); + QList<QLegendMarker *> createLegendMarkers(QLegend *legend) override; - virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; - QAbstractAxis *createDefaultAxis(Qt::Orientation orientation) const; + QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const override; + QAbstractAxis *createDefaultAxis(Qt::Orientation orientation) const override; bool append(const QList<QCandlestickSet *> &sets); bool remove(const QList<QCandlestickSet *> &sets); diff --git a/src/charts/candlestickchart/qhcandlestickmodelmapper.h b/src/charts/candlestickchart/qhcandlestickmodelmapper.h index 6ba86b8f..ecec977f 100644 --- a/src/charts/candlestickchart/qhcandlestickmodelmapper.h +++ b/src/charts/candlestickchart/qhcandlestickmodelmapper.h @@ -48,7 +48,7 @@ class Q_CHARTS_EXPORT QHCandlestickModelMapper : public QCandlestickModelMapper public: explicit QHCandlestickModelMapper(QObject *parent = nullptr); - Qt::Orientation orientation() const; + Qt::Orientation orientation() const override; void setTimestampColumn(int timestampColumn); int timestampColumn() const; diff --git a/src/charts/candlestickchart/qvcandlestickmodelmapper.h b/src/charts/candlestickchart/qvcandlestickmodelmapper.h index 0707859d..f39d9b3f 100644 --- a/src/charts/candlestickchart/qvcandlestickmodelmapper.h +++ b/src/charts/candlestickchart/qvcandlestickmodelmapper.h @@ -48,7 +48,7 @@ class Q_CHARTS_EXPORT QVCandlestickModelMapper : public QCandlestickModelMapper public: explicit QVCandlestickModelMapper(QObject *parent = nullptr); - Qt::Orientation orientation() const; + Qt::Orientation orientation() const override; void setTimestampRow(int timestampRow); int timestampRow() const; diff --git a/src/charts/chartbackground_p.h b/src/charts/chartbackground_p.h index 1a2bdfd8..66958c99 100644 --- a/src/charts/chartbackground_p.h +++ b/src/charts/chartbackground_p.h @@ -61,7 +61,7 @@ public: bool isDropShadowEnabled() { return m_dropShadow != 0; } protected: - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; private: qreal m_diameter; diff --git a/src/charts/domain/logxlogydomain_p.h b/src/charts/domain/logxlogydomain_p.h index c16ac01f..99d6daa7 100644 --- a/src/charts/domain/logxlogydomain_p.h +++ b/src/charts/domain/logxlogydomain_p.h @@ -52,24 +52,24 @@ public: explicit LogXLogYDomain(QObject *object = 0); virtual ~LogXLogYDomain(); - DomainType type(){ return AbstractDomain::LogXLogYDomain;} + DomainType type() override { return AbstractDomain::LogXLogYDomain; } - void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY); + void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY) override; friend bool Q_AUTOTEST_EXPORT operator== (const LogXLogYDomain &domain1, const LogXLogYDomain &domain2); friend bool Q_AUTOTEST_EXPORT operator!= (const LogXLogYDomain &domain1, const LogXLogYDomain &domain2); friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYDomain &domain); - void zoomIn(const QRectF &rect); - void zoomOut(const QRectF &rect); - void move(qreal dx, qreal dy); + void zoomIn(const QRectF &rect) override; + void zoomOut(const QRectF &rect) override; + void move(qreal dx, qreal dy) override; - QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const; - QPointF calculateDomainPoint(const QPointF &point) const; - QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const; + QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const override; + QPointF calculateDomainPoint(const QPointF &point) const override; + QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const override; - bool attachAxis(QAbstractAxis *axis); - bool detachAxis(QAbstractAxis *axis); + bool attachAxis(QAbstractAxis *axis) override; + bool detachAxis(QAbstractAxis *axis) override; public Q_SLOTS: void handleVerticalAxisBaseChanged(qreal baseY); diff --git a/src/charts/domain/logxlogypolardomain_p.h b/src/charts/domain/logxlogypolardomain_p.h index 4ed090e9..f2f61651 100644 --- a/src/charts/domain/logxlogypolardomain_p.h +++ b/src/charts/domain/logxlogypolardomain_p.h @@ -52,30 +52,30 @@ public: explicit LogXLogYPolarDomain(QObject *object = 0); virtual ~LogXLogYPolarDomain(); - DomainType type() { return AbstractDomain::LogXLogYPolarDomain; } + DomainType type() override { return AbstractDomain::LogXLogYPolarDomain; } - void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY); + void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY) override; friend bool Q_AUTOTEST_EXPORT operator== (const LogXLogYPolarDomain &domain1, const LogXLogYPolarDomain &domain2); friend bool Q_AUTOTEST_EXPORT operator!= (const LogXLogYPolarDomain &domain1, const LogXLogYPolarDomain &domain2); friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYPolarDomain &domain); - void zoomIn(const QRectF &rect); - void zoomOut(const QRectF &rect); - void move(qreal dx, qreal dy); + void zoomIn(const QRectF &rect) override; + void zoomOut(const QRectF &rect) override; + void move(qreal dx, qreal dy) override; - QPointF calculateDomainPoint(const QPointF &point) const; + QPointF calculateDomainPoint(const QPointF &point) const override; - bool attachAxis(QAbstractAxis *axis); - bool detachAxis(QAbstractAxis *axis); + bool attachAxis(QAbstractAxis *axis) override; + bool detachAxis(QAbstractAxis *axis) override; public Q_SLOTS: void handleVerticalAxisBaseChanged(qreal baseY); void handleHorizontalAxisBaseChanged(qreal baseX); protected: - qreal toAngularCoordinate(qreal value, bool &ok) const; - qreal toRadialCoordinate(qreal value, bool &ok) const; + qreal toAngularCoordinate(qreal value, bool &ok) const override; + qreal toRadialCoordinate(qreal value, bool &ok) const override; private: qreal m_logLeftX; diff --git a/src/charts/domain/logxydomain_p.h b/src/charts/domain/logxydomain_p.h index 9c85c7d7..4f1e2637 100644 --- a/src/charts/domain/logxydomain_p.h +++ b/src/charts/domain/logxydomain_p.h @@ -52,24 +52,24 @@ public: explicit LogXYDomain(QObject *object = 0); virtual ~LogXYDomain(); - DomainType type(){ return AbstractDomain::LogXYDomain;} + DomainType type() override { return AbstractDomain::LogXYDomain; } - void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY); + void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY) override; friend bool Q_AUTOTEST_EXPORT operator== (const LogXYDomain &domain1, const LogXYDomain &domain2); friend bool Q_AUTOTEST_EXPORT operator!= (const LogXYDomain &domain1, const LogXYDomain &domain2); friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYDomain &domain); - void zoomIn(const QRectF &rect); - void zoomOut(const QRectF &rect); - void move(qreal dx, qreal dy); + void zoomIn(const QRectF &rect) override; + void zoomOut(const QRectF &rect) override; + void move(qreal dx, qreal dy) override; - QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const; - QPointF calculateDomainPoint(const QPointF &point) const; - QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const; + QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const override; + QPointF calculateDomainPoint(const QPointF &point) const override; + QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const override; - bool attachAxis(QAbstractAxis *axis); - bool detachAxis(QAbstractAxis *axis); + bool attachAxis(QAbstractAxis *axis) override; + bool detachAxis(QAbstractAxis *axis) override; public Q_SLOTS: void handleHorizontalAxisBaseChanged(qreal baseX); diff --git a/src/charts/domain/logxypolardomain_p.h b/src/charts/domain/logxypolardomain_p.h index 2697dc2c..5e86b957 100644 --- a/src/charts/domain/logxypolardomain_p.h +++ b/src/charts/domain/logxypolardomain_p.h @@ -52,29 +52,29 @@ public: explicit LogXYPolarDomain(QObject *object = 0); virtual ~LogXYPolarDomain(); - DomainType type() { return AbstractDomain::LogXYPolarDomain; } + DomainType type() override { return AbstractDomain::LogXYPolarDomain; } - void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY); + void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY) override; friend bool Q_AUTOTEST_EXPORT operator== (const LogXYPolarDomain &domain1, const LogXYPolarDomain &domain2); friend bool Q_AUTOTEST_EXPORT operator!= (const LogXYPolarDomain &domain1, const LogXYPolarDomain &domain2); friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYPolarDomain &domain); - void zoomIn(const QRectF &rect); - void zoomOut(const QRectF &rect); - void move(qreal dx, qreal dy); + void zoomIn(const QRectF &rect) override; + void zoomOut(const QRectF &rect) override; + void move(qreal dx, qreal dy) override; - QPointF calculateDomainPoint(const QPointF &point) const; + QPointF calculateDomainPoint(const QPointF &point) const override; - bool attachAxis(QAbstractAxis *axis); - bool detachAxis(QAbstractAxis *axis); + bool attachAxis(QAbstractAxis *axis) override; + bool detachAxis(QAbstractAxis *axis) override; public Q_SLOTS: void handleHorizontalAxisBaseChanged(qreal baseX); protected: - qreal toAngularCoordinate(qreal value, bool &ok) const; - qreal toRadialCoordinate(qreal value, bool &ok) const; + qreal toAngularCoordinate(qreal value, bool &ok) const override; + qreal toRadialCoordinate(qreal value, bool &ok) const override; private: qreal m_logLeftX; diff --git a/src/charts/domain/polardomain_p.h b/src/charts/domain/polardomain_p.h index 7631bd9e..e049a271 100644 --- a/src/charts/domain/polardomain_p.h +++ b/src/charts/domain/polardomain_p.h @@ -52,10 +52,10 @@ public: explicit PolarDomain(QObject *object = 0); virtual ~PolarDomain(); - void setSize(const QSizeF &size); + void setSize(const QSizeF &size) override; - QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const; - QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const; + QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const override; + QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const override; virtual qreal toAngularCoordinate(qreal value, bool &ok) const = 0; virtual qreal toRadialCoordinate(qreal value, bool &ok) const = 0; diff --git a/src/charts/domain/xlogydomain_p.h b/src/charts/domain/xlogydomain_p.h index ddf174a7..e9e8b943 100644 --- a/src/charts/domain/xlogydomain_p.h +++ b/src/charts/domain/xlogydomain_p.h @@ -52,24 +52,24 @@ public: explicit XLogYDomain(QObject *object = 0); virtual ~XLogYDomain(); - DomainType type(){ return AbstractDomain::XLogYDomain;}; + DomainType type() override { return AbstractDomain::XLogYDomain; } - void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY); + void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY) override; friend bool Q_AUTOTEST_EXPORT operator== (const XLogYDomain &domain1, const XLogYDomain &domain2); friend bool Q_AUTOTEST_EXPORT operator!= (const XLogYDomain &domain1, const XLogYDomain &domain2); friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYDomain &domain); - void zoomIn(const QRectF &rect); - void zoomOut(const QRectF &rect); - void move(qreal dx, qreal dy); + void zoomIn(const QRectF &rect) override; + void zoomOut(const QRectF &rect) override; + void move(qreal dx, qreal dy) override; - QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const; - QPointF calculateDomainPoint(const QPointF &point) const; - QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const; + QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const override; + QPointF calculateDomainPoint(const QPointF &point) const override; + QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const override; - bool attachAxis(QAbstractAxis *axis); - bool detachAxis(QAbstractAxis *axis); + bool attachAxis(QAbstractAxis *axis) override; + bool detachAxis(QAbstractAxis *axis) override; public Q_SLOTS: void handleVerticalAxisBaseChanged(qreal baseY); diff --git a/src/charts/domain/xlogypolardomain_p.h b/src/charts/domain/xlogypolardomain_p.h index 4870cc67..7030ff3e 100644 --- a/src/charts/domain/xlogypolardomain_p.h +++ b/src/charts/domain/xlogypolardomain_p.h @@ -52,29 +52,29 @@ public: explicit XLogYPolarDomain(QObject *object = 0); virtual ~XLogYPolarDomain(); - DomainType type() { return AbstractDomain::XLogYPolarDomain; } + DomainType type() override { return AbstractDomain::XLogYPolarDomain; } - void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY); + void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY) override; friend bool Q_AUTOTEST_EXPORT operator== (const XLogYPolarDomain &domain1, const XLogYPolarDomain &domain2); friend bool Q_AUTOTEST_EXPORT operator!= (const XLogYPolarDomain &domain1, const XLogYPolarDomain &domain2); friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYPolarDomain &domain); - void zoomIn(const QRectF &rect); - void zoomOut(const QRectF &rect); - void move(qreal dx, qreal dy); + void zoomIn(const QRectF &rect) override; + void zoomOut(const QRectF &rect) override; + void move(qreal dx, qreal dy) override; - QPointF calculateDomainPoint(const QPointF &point) const; + QPointF calculateDomainPoint(const QPointF &point) const override; - bool attachAxis(QAbstractAxis *axis); - bool detachAxis(QAbstractAxis *axis); + bool attachAxis(QAbstractAxis *axis) override; + bool detachAxis(QAbstractAxis *axis) override; public Q_SLOTS: void handleVerticalAxisBaseChanged(qreal baseY); protected: - qreal toAngularCoordinate(qreal value, bool &ok) const; - qreal toRadialCoordinate(qreal value, bool &ok) const; + qreal toAngularCoordinate(qreal value, bool &ok) const override; + qreal toRadialCoordinate(qreal value, bool &ok) const override; private: qreal m_logInnerY; diff --git a/src/charts/domain/xydomain_p.h b/src/charts/domain/xydomain_p.h index 5a586a32..5733adfa 100644 --- a/src/charts/domain/xydomain_p.h +++ b/src/charts/domain/xydomain_p.h @@ -52,21 +52,21 @@ public: explicit XYDomain(QObject *object = 0); virtual ~XYDomain(); - DomainType type(){ return AbstractDomain::XYDomain;} + DomainType type() override { return AbstractDomain::XYDomain; } - void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY); + void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY) override; friend bool Q_AUTOTEST_EXPORT operator== (const XYDomain &Domain1, const XYDomain &Domain2); friend bool Q_AUTOTEST_EXPORT operator!= (const XYDomain &Domain1, const XYDomain &Domain2); friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYDomain &AbstractDomain); - void zoomIn(const QRectF &rect); - void zoomOut(const QRectF &rect); - void move(qreal dx, qreal dy); + void zoomIn(const QRectF &rect) override; + void zoomOut(const QRectF &rect) override; + void move(qreal dx, qreal dy) override; - QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const; - QPointF calculateDomainPoint(const QPointF &point) const; - QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const; + QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const override; + QPointF calculateDomainPoint(const QPointF &point) const override; + QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const override; }; QT_CHARTS_END_NAMESPACE diff --git a/src/charts/domain/xypolardomain_p.h b/src/charts/domain/xypolardomain_p.h index 5dc6de9e..2b9fba6d 100644 --- a/src/charts/domain/xypolardomain_p.h +++ b/src/charts/domain/xypolardomain_p.h @@ -51,23 +51,23 @@ public: explicit XYPolarDomain(QObject *object = 0); virtual ~XYPolarDomain(); - DomainType type(){ return AbstractDomain::XYPolarDomain;} + DomainType type() override { return AbstractDomain::XYPolarDomain; } - void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY); + void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY) override; friend bool Q_AUTOTEST_EXPORT operator== (const XYPolarDomain &Domain1, const XYPolarDomain &Domain2); friend bool Q_AUTOTEST_EXPORT operator!= (const XYPolarDomain &Domain1, const XYPolarDomain &Domain2); friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &AbstractDomain); - void zoomIn(const QRectF &rect); - void zoomOut(const QRectF &rect); - void move(qreal dx, qreal dy); + void zoomIn(const QRectF &rect) override; + void zoomOut(const QRectF &rect) override; + void move(qreal dx, qreal dy) override; - QPointF calculateDomainPoint(const QPointF &point) const; + QPointF calculateDomainPoint(const QPointF &point) const override; protected: - qreal toAngularCoordinate(qreal value, bool &ok) const; - qreal toRadialCoordinate(qreal value, bool &ok) const; + qreal toAngularCoordinate(qreal value, bool &ok) const override; + qreal toRadialCoordinate(qreal value, bool &ok) const override; }; QT_CHARTS_END_NAMESPACE diff --git a/src/charts/layout/abstractchartlayout_p.h b/src/charts/layout/abstractchartlayout_p.h index f120ea91..aeaa643c 100644 --- a/src/charts/layout/abstractchartlayout_p.h +++ b/src/charts/layout/abstractchartlayout_p.h @@ -60,7 +60,7 @@ public: virtual void setMargins(const QMargins &margins); virtual QMargins margins() const; - virtual void setGeometry(const QRectF &rect); + void setGeometry(const QRectF &rect) override; protected: virtual QRectF calculateBackgroundGeometry(const QRectF &geometry, ChartBackground *background, @@ -82,10 +82,10 @@ protected: const QList<ChartAxisElement *>& axes) const = 0; // from QGraphicsLayout - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; - int count() const { return 0; } - QGraphicsLayoutItem *itemAt(int) const { return 0; }; - void removeAt(int) {}; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; + int count() const override { return 0; } + QGraphicsLayoutItem *itemAt(int) const override { return 0; }; + void removeAt(int) override {}; ChartPresenter *m_presenter; QMargins m_margins; diff --git a/src/charts/layout/cartesianchartlayout_p.h b/src/charts/layout/cartesianchartlayout_p.h index b61d3a78..42c95645 100644 --- a/src/charts/layout/cartesianchartlayout_p.h +++ b/src/charts/layout/cartesianchartlayout_p.h @@ -51,9 +51,9 @@ public: virtual ~CartesianChartLayout(); // from AbstractChartLayout - QRectF calculateAxisMinimum(const QRectF &minimum, const QList<ChartAxisElement *> &axes) const; + QRectF calculateAxisMinimum(const QRectF &minimum, const QList<ChartAxisElement *> &axes) const override; QRectF calculateAxisGeometry(const QRectF &geometry, const QList<ChartAxisElement *> &axes, - bool update = true) const; + bool update = true) const override; }; QT_CHARTS_END_NAMESPACE diff --git a/src/charts/layout/polarchartlayout_p.h b/src/charts/layout/polarchartlayout_p.h index a2f3ef80..c4b3958d 100644 --- a/src/charts/layout/polarchartlayout_p.h +++ b/src/charts/layout/polarchartlayout_p.h @@ -51,9 +51,9 @@ public: virtual ~PolarChartLayout(); // from AbstractChartLayout - QRectF calculateAxisMinimum(const QRectF &minimum, const QList<ChartAxisElement *> &axes) const; + QRectF calculateAxisMinimum(const QRectF &minimum, const QList<ChartAxisElement *> &axes) const override; QRectF calculateAxisGeometry(const QRectF &geometry, const QList<ChartAxisElement *> &axes, - bool update = true) const; + bool update = true) const override; }; QT_CHARTS_END_NAMESPACE diff --git a/src/charts/legend/legendlayout_p.h b/src/charts/legend/legendlayout_p.h index 13593b16..6135d7bd 100644 --- a/src/charts/legend/legendlayout_p.h +++ b/src/charts/legend/legendlayout_p.h @@ -54,17 +54,17 @@ public: LegendLayout(QLegend *legend); virtual ~LegendLayout(); - void setGeometry(const QRectF &rect); + void setGeometry(const QRectF &rect) override; void setOffset(qreal x, qreal y); QPointF offset() const; - void invalidate(); + void invalidate() override; protected: - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; - int count() const { return 0; } - QGraphicsLayoutItem *itemAt(int) const { return 0; }; - void removeAt(int) {}; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; + int count() const override { return 0; } + QGraphicsLayoutItem *itemAt(int) const override { return 0; }; + void removeAt(int) override {}; private: void setAttachedGeometry(const QRectF &rect); diff --git a/src/charts/legend/legendmarkeritem_p.h b/src/charts/legend/legendmarkeritem_p.h index 708c2709..20130b6e 100644 --- a/src/charts/legend/legendmarkeritem_p.h +++ b/src/charts/legend/legendmarkeritem_p.h @@ -85,15 +85,15 @@ public: void setLabelBrush(const QBrush &brush); QBrush labelBrush() const; - void setGeometry(const QRectF &rect); - QRectF boundingRect() const; + void setGeometry(const QRectF &rect) override; + QRectF boundingRect() const override; QRectF markerRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,QWidget *widget = nullptr); - QSizeF sizeHint (Qt::SizeHint which, const QSizeF &constraint) const; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,QWidget *widget = nullptr) override; + QSizeF sizeHint (Qt::SizeHint which, const QSizeF &constraint) const override; - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; QString displayedLabel() const; void setToolTip(const QString &tooltip); diff --git a/src/charts/legend/legendscroller_p.h b/src/charts/legend/legendscroller_p.h index 919a27b8..3d8096b0 100644 --- a/src/charts/legend/legendscroller_p.h +++ b/src/charts/legend/legendscroller_p.h @@ -54,12 +54,13 @@ class Q_CHARTS_PRIVATE_EXPORT LegendScroller: public QLegend, public Scroller public: LegendScroller(QChart *chart); - void setOffset(const QPointF &point); - QPointF offset() const; - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); + void setOffset(const QPointF &point) override; + QPointF offset() const override; + + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; }; QT_CHARTS_END_NAMESPACE diff --git a/src/charts/legend/qarealegendmarker.h b/src/charts/legend/qarealegendmarker.h index 13b774c7..a16e7622 100644 --- a/src/charts/legend/qarealegendmarker.h +++ b/src/charts/legend/qarealegendmarker.h @@ -46,10 +46,10 @@ public: explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = nullptr); virtual ~QAreaLegendMarker(); - virtual LegendMarkerType type() { return LegendMarkerTypeArea; } + LegendMarkerType type() override { return LegendMarkerTypeArea; } // Related series - virtual QAreaSeries* series(); + QAreaSeries* series() override; protected: QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = nullptr); diff --git a/src/charts/legend/qarealegendmarker_p.h b/src/charts/legend/qarealegendmarker_p.h index 9bea4708..b386fa8b 100644 --- a/src/charts/legend/qarealegendmarker_p.h +++ b/src/charts/legend/qarealegendmarker_p.h @@ -56,11 +56,11 @@ public: explicit QAreaLegendMarkerPrivate(QAreaLegendMarker *q, QAreaSeries *series, QLegend *legend); virtual ~QAreaLegendMarkerPrivate(); - virtual QAreaSeries* series(); - virtual QObject* relatedObject(); + QAreaSeries* series() override; + QObject* relatedObject() override; public Q_SLOTS: - virtual void updated(); + void updated() override; private: QAreaLegendMarker *q_ptr; diff --git a/src/charts/legend/qbarlegendmarker.h b/src/charts/legend/qbarlegendmarker.h index 43f1b2d1..df201b56 100644 --- a/src/charts/legend/qbarlegendmarker.h +++ b/src/charts/legend/qbarlegendmarker.h @@ -46,10 +46,10 @@ public: explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = nullptr); virtual ~QBarLegendMarker(); - virtual LegendMarkerType type() { return LegendMarkerTypeBar; } + LegendMarkerType type() override { return LegendMarkerTypeBar; } // Related series and barset - virtual QAbstractBarSeries* series(); + QAbstractBarSeries* series() override; QBarSet* barset(); protected: diff --git a/src/charts/legend/qbarlegendmarker_p.h b/src/charts/legend/qbarlegendmarker_p.h index 5618405e..d9af6cb9 100644 --- a/src/charts/legend/qbarlegendmarker_p.h +++ b/src/charts/legend/qbarlegendmarker_p.h @@ -57,11 +57,11 @@ public: explicit QBarLegendMarkerPrivate(QBarLegendMarker *q, QAbstractBarSeries *series, QBarSet *barset, QLegend *legend); virtual ~QBarLegendMarkerPrivate(); - virtual QAbstractBarSeries* series(); - virtual QObject* relatedObject(); + QAbstractBarSeries* series() override; + QObject* relatedObject() override; public Q_SLOTS: - virtual void updated(); + void updated() override; private: QBarLegendMarker *q_ptr; diff --git a/src/charts/legend/qboxplotlegendmarker.h b/src/charts/legend/qboxplotlegendmarker.h index 826c074a..018c79a9 100644 --- a/src/charts/legend/qboxplotlegendmarker.h +++ b/src/charts/legend/qboxplotlegendmarker.h @@ -46,10 +46,10 @@ public: explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = nullptr); virtual ~QBoxPlotLegendMarker(); - virtual LegendMarkerType type() { return LegendMarkerTypeBoxPlot; } + LegendMarkerType type() override { return LegendMarkerTypeBoxPlot; } // Related series - virtual QBoxPlotSeries* series(); + QBoxPlotSeries* series() override; protected: QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = nullptr); diff --git a/src/charts/legend/qboxplotlegendmarker_p.h b/src/charts/legend/qboxplotlegendmarker_p.h index baf8fadc..7e0467f5 100644 --- a/src/charts/legend/qboxplotlegendmarker_p.h +++ b/src/charts/legend/qboxplotlegendmarker_p.h @@ -56,11 +56,11 @@ public: explicit QBoxPlotLegendMarkerPrivate(QBoxPlotLegendMarker *q, QBoxPlotSeries *series, QLegend *legend); virtual ~QBoxPlotLegendMarkerPrivate(); - virtual QAbstractSeries *series(); - virtual QObject *relatedObject(); + QAbstractSeries *series() override; + QObject *relatedObject() override; public Q_SLOTS: - virtual void updated(); + void updated() override; private: QBoxPlotLegendMarker *q_ptr; diff --git a/src/charts/legend/qcandlesticklegendmarker.h b/src/charts/legend/qcandlesticklegendmarker.h index f3153d06..ce339fb3 100644 --- a/src/charts/legend/qcandlesticklegendmarker.h +++ b/src/charts/legend/qcandlesticklegendmarker.h @@ -46,10 +46,10 @@ public: QObject *parent = nullptr); virtual ~QCandlestickLegendMarker(); - virtual LegendMarkerType type(); + LegendMarkerType type() override; // Related series - virtual QCandlestickSeries* series(); + QCandlestickSeries* series() override; private: Q_DECLARE_PRIVATE(QCandlestickLegendMarker) diff --git a/src/charts/legend/qcandlesticklegendmarker_p.h b/src/charts/legend/qcandlesticklegendmarker_p.h index 8d605ff2..5d928968 100644 --- a/src/charts/legend/qcandlesticklegendmarker_p.h +++ b/src/charts/legend/qcandlesticklegendmarker_p.h @@ -55,11 +55,11 @@ public: QCandlestickSeries *series, QLegend *legend); virtual ~QCandlestickLegendMarkerPrivate(); - virtual QAbstractSeries *series(); - virtual QObject *relatedObject(); + QAbstractSeries *series() override; + QObject *relatedObject() override; public Q_SLOTS: - virtual void updated(); + void updated() override; private: QCandlestickLegendMarker *q_ptr; diff --git a/src/charts/legend/qlegend.h b/src/charts/legend/qlegend.h index fe5641de..6ed674ae 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 = nullptr); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; void setBrush(const QBrush &brush); QBrush brush() const; @@ -111,8 +111,8 @@ public: void setMarkerShape(MarkerShape shape); protected: - void hideEvent(QHideEvent *event); - void showEvent(QShowEvent *event); + void hideEvent(QHideEvent *event) override; + void showEvent(QShowEvent *event) override; Q_SIGNALS: void backgroundVisibleChanged(bool visible); diff --git a/src/charts/legend/qpielegendmarker.h b/src/charts/legend/qpielegendmarker.h index a0c65597..d4fde77f 100644 --- a/src/charts/legend/qpielegendmarker.h +++ b/src/charts/legend/qpielegendmarker.h @@ -47,10 +47,10 @@ public: explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = nullptr); virtual ~QPieLegendMarker(); - virtual LegendMarkerType type() { return LegendMarkerTypePie; } + LegendMarkerType type() override { return LegendMarkerTypePie; } // Related series and slice - virtual QPieSeries* series(); + QPieSeries* series() override; QPieSlice* slice(); protected: diff --git a/src/charts/legend/qpielegendmarker_p.h b/src/charts/legend/qpielegendmarker_p.h index 0649ef30..ee6de228 100644 --- a/src/charts/legend/qpielegendmarker_p.h +++ b/src/charts/legend/qpielegendmarker_p.h @@ -58,11 +58,11 @@ public: virtual ~QPieLegendMarkerPrivate(); // internal - virtual QPieSeries* series(); - virtual QObject* relatedObject(); + QPieSeries* series() override; + QObject* relatedObject() override; public Q_SLOTS: - virtual void updated(); + void updated() override; private: QPieLegendMarker *q_ptr; diff --git a/src/charts/legend/qxylegendmarker.h b/src/charts/legend/qxylegendmarker.h index 25634495..70463472 100644 --- a/src/charts/legend/qxylegendmarker.h +++ b/src/charts/legend/qxylegendmarker.h @@ -45,10 +45,10 @@ public: explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = nullptr); virtual ~QXYLegendMarker(); - virtual LegendMarkerType type() { return LegendMarkerTypeXY; } + LegendMarkerType type() override { return LegendMarkerTypeXY; } // Related series - virtual QXYSeries* series(); + QXYSeries* series() override; protected: QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = nullptr); diff --git a/src/charts/legend/qxylegendmarker_p.h b/src/charts/legend/qxylegendmarker_p.h index 548990fe..10902c1c 100644 --- a/src/charts/legend/qxylegendmarker_p.h +++ b/src/charts/legend/qxylegendmarker_p.h @@ -56,11 +56,11 @@ public: explicit QXYLegendMarkerPrivate(QXYLegendMarker *q, QXYSeries *series, QLegend *legend); virtual ~QXYLegendMarkerPrivate(); - virtual QAbstractSeries* series(); - virtual QObject* relatedObject(); + QAbstractSeries* series() override; + QObject* relatedObject() override; public Q_SLOTS: - virtual void updated(); + void updated() override; private: QXYLegendMarker *q_ptr; diff --git a/src/charts/linechart/linechartitem_p.h b/src/charts/linechart/linechartitem_p.h index ec10c066..69327034 100644 --- a/src/charts/linechart/linechartitem_p.h +++ b/src/charts/linechart/linechartitem_p.h @@ -59,9 +59,9 @@ public: ~LineChartItem() {} //from QGraphicsItem - QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - QPainterPath shape() const; + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + QPainterPath shape() const override; QPainterPath path() const { return m_fullPath; } @@ -69,12 +69,12 @@ public Q_SLOTS: void handleUpdated(); protected: - void updateGeometry(); - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + void updateGeometry() override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; void suppressPoints() { m_pointsVisible = false; } void forceChartType(QChart::ChartType chartType) { m_chartType = chartType; } diff --git a/src/charts/linechart/qlineseries.h b/src/charts/linechart/qlineseries.h index 145f9d46..63c6f974 100644 --- a/src/charts/linechart/qlineseries.h +++ b/src/charts/linechart/qlineseries.h @@ -45,7 +45,7 @@ class Q_CHARTS_EXPORT QLineSeries : public QXYSeries public: explicit QLineSeries(QObject *parent = nullptr); ~QLineSeries(); - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; protected: QLineSeries(QLineSeriesPrivate &d, QObject *parent = nullptr); diff --git a/src/charts/linechart/qlineseries_p.h b/src/charts/linechart/qlineseries_p.h index 26ee1324..9bc2f749 100644 --- a/src/charts/linechart/qlineseries_p.h +++ b/src/charts/linechart/qlineseries_p.h @@ -49,8 +49,8 @@ class Q_CHARTS_PRIVATE_EXPORT QLineSeriesPrivate: public QXYSeriesPrivate { public: QLineSeriesPrivate(QLineSeries *q); - void initializeGraphics(QGraphicsItem* parent); - void initializeTheme(int index, ChartTheme* theme, bool forced = false); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeTheme(int index, ChartTheme* theme, bool forced = false) override; private: Q_DECLARE_PUBLIC(QLineSeries); diff --git a/src/charts/piechart/piechartitem_p.h b/src/charts/piechart/piechartitem_p.h index 55a3c583..72ef1a88 100644 --- a/src/charts/piechart/piechartitem_p.h +++ b/src/charts/piechart/piechartitem_p.h @@ -63,19 +63,19 @@ public: ~PieChartItem(); // from QGraphicsItem - QRectF boundingRect() const { return m_rect; } - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {} + QRectF boundingRect() const override { return m_rect; } + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override {} protected: - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; public Q_SLOTS: // from Chart - virtual void handleDomainUpdated(); + void handleDomainUpdated() override; void updateLayout(); void handleSlicesAdded(QList<QPieSlice *> slices); @@ -85,10 +85,10 @@ public Q_SLOTS: void handleOpacityChanged(); void setAnimation(PieAnimation *animation); - ChartAnimation *animation() const; + ChartAnimation *animation() const override; // From ChartItem - void cleanup(); + void cleanup() override; private: PieSliceData updateSliceGeometry(QPieSlice *slice); diff --git a/src/charts/piechart/piesliceitem_p.h b/src/charts/piechart/piesliceitem_p.h index 3756a1f6..9e86edb1 100644 --- a/src/charts/piechart/piesliceitem_p.h +++ b/src/charts/piechart/piesliceitem_p.h @@ -65,14 +65,14 @@ public: ~PieSliceItem(); // from QGraphicsItem - QRectF boundingRect() const; - QPainterPath shape() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + QRectF boundingRect() const override; + QPainterPath shape() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; void setLayout(const PieSliceData &sliceData); static QPointF sliceCenter(QPointF point, qreal radius, QPieSlice *slice); diff --git a/src/charts/piechart/qpieseries.h b/src/charts/piechart/qpieseries.h index e04c93b6..091d68c4 100644 --- a/src/charts/piechart/qpieseries.h +++ b/src/charts/piechart/qpieseries.h @@ -52,7 +52,7 @@ public: explicit QPieSeries(QObject *parent = nullptr); virtual ~QPieSeries(); - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; bool append(QPieSlice *slice); bool append(QList<QPieSlice *> slices); diff --git a/src/charts/piechart/qpieseries_p.h b/src/charts/piechart/qpieseries_p.h index d2b6dbcf..da460072 100644 --- a/src/charts/piechart/qpieseries_p.h +++ b/src/charts/piechart/qpieseries_p.h @@ -54,17 +54,17 @@ public: QPieSeriesPrivate(QPieSeries *parent); ~QPieSeriesPrivate(); - void initializeDomain(); - void initializeAxes(); - void initializeGraphics(QGraphicsItem* parent); + void initializeDomain() override; + void initializeAxes() override; + void initializeGraphics(QGraphicsItem* parent) override; void initializeAnimations(QtCharts::QChart::AnimationOptions options, int duration, - QEasingCurve &curve); - void initializeTheme(int index, ChartTheme* theme, bool forced = false); + QEasingCurve &curve) override; + void initializeTheme(int index, ChartTheme* theme, bool forced = false) override; - QList<QLegendMarker *> createLegendMarkers(QLegend *legend); + QList<QLegendMarker *> createLegendMarkers(QLegend *legend) override; - QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; - QAbstractAxis* createDefaultAxis(Qt::Orientation orientation) const; + QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const override; + QAbstractAxis* createDefaultAxis(Qt::Orientation orientation) const override; void updateDerivativeData(); void setSizes(qreal innerSize, qreal outerSize); diff --git a/src/charts/scatterchart/qscatterseries.h b/src/charts/scatterchart/qscatterseries.h index d79a2bd1..eb509a22 100644 --- a/src/charts/scatterchart/qscatterseries.h +++ b/src/charts/scatterchart/qscatterseries.h @@ -56,12 +56,12 @@ public: public: explicit QScatterSeries(QObject *parent = nullptr); ~QScatterSeries(); - QAbstractSeries::SeriesType type() const; - void setPen(const QPen &pen); - void setBrush(const QBrush &brush); + QAbstractSeries::SeriesType type() const override; + void setPen(const QPen &pen) override; + void setBrush(const QBrush &brush) override; QBrush brush() const; - void setColor(const QColor &color); - QColor color() const; + void setColor(const QColor &color) override; + QColor color() const override; void setBorderColor(const QColor &color); QColor borderColor() const; MarkerShape markerShape() const; diff --git a/src/charts/scatterchart/qscatterseries_p.h b/src/charts/scatterchart/qscatterseries_p.h index f6253b36..c193d876 100644 --- a/src/charts/scatterchart/qscatterseries_p.h +++ b/src/charts/scatterchart/qscatterseries_p.h @@ -48,10 +48,10 @@ class Q_CHARTS_PRIVATE_EXPORT QScatterSeriesPrivate: public QXYSeriesPrivate { public: QScatterSeriesPrivate(QScatterSeries *q); - void initializeGraphics(QGraphicsItem* parent); - void initializeTheme(int index, ChartTheme* theme, bool forced = false); + void initializeGraphics(QGraphicsItem* parent) override; + void initializeTheme(int index, ChartTheme* theme, bool forced = false) override; void initializeAnimations(QtCharts::QChart::AnimationOptions options, int duration, - QEasingCurve &curve); + QEasingCurve &curve) override; private: QScatterSeries::MarkerShape m_shape; diff --git a/src/charts/scatterchart/scatterchartitem_p.h b/src/charts/scatterchart/scatterchartitem_p.h index 7188992f..25fdb9b3 100644 --- a/src/charts/scatterchart/scatterchartitem_p.h +++ b/src/charts/scatterchart/scatterchartitem_p.h @@ -59,8 +59,8 @@ public: public: //from QGraphicsItem - QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; void setPen(const QPen &pen); void setBrush(const QBrush &brush); @@ -83,7 +83,7 @@ private: void deletePoints(int count); protected: - void updateGeometry(); + void updateGeometry() override; private: QScatterSeries *m_series; @@ -116,23 +116,23 @@ public: } protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event) + void mousePressEvent(QGraphicsSceneMouseEvent *event) override { QGraphicsEllipseItem::mousePressEvent(event); m_parent->markerPressed(this); m_parent->setMousePressed(); } - void hoverEnterEvent(QGraphicsSceneHoverEvent *event) + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override { QGraphicsEllipseItem::hoverEnterEvent(event); m_parent->markerHovered(this, true); } - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override { QGraphicsEllipseItem::hoverLeaveEvent(event); m_parent->markerHovered(this, false); } - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override { QGraphicsEllipseItem::mouseReleaseEvent(event); m_parent->markerReleased(this); @@ -140,7 +140,7 @@ protected: m_parent->markerSelected(this); m_parent->setMousePressed(false); } - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override { QGraphicsEllipseItem::mouseDoubleClickEvent(event); m_parent->markerDoubleClicked(this); @@ -163,23 +163,23 @@ public: } protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event) + void mousePressEvent(QGraphicsSceneMouseEvent *event) override { QGraphicsRectItem::mousePressEvent(event); m_parent->markerPressed(this); m_parent->setMousePressed(); } - void hoverEnterEvent(QGraphicsSceneHoverEvent *event) + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override { QGraphicsRectItem::hoverEnterEvent(event); m_parent->markerHovered(this, true); } - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override { QGraphicsRectItem::hoverLeaveEvent(event); m_parent->markerHovered(this, false); } - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override { QGraphicsRectItem::mouseReleaseEvent(event); m_parent->markerReleased(this); @@ -187,7 +187,7 @@ protected: m_parent->markerSelected(this); m_parent->setMousePressed(false); } - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override { QGraphicsRectItem::mouseDoubleClickEvent(event); m_parent->markerDoubleClicked(this); diff --git a/src/charts/scroller_p.h b/src/charts/scroller_p.h index 1b7a8f69..b84d2fdb 100644 --- a/src/charts/scroller_p.h +++ b/src/charts/scroller_p.h @@ -63,7 +63,7 @@ public: void start(int interval); void stop(); protected: - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; private: QBasicTimer m_timer; diff --git a/src/charts/splinechart/qsplineseries.h b/src/charts/splinechart/qsplineseries.h index 6c05ad89..ba6ffe50 100644 --- a/src/charts/splinechart/qsplineseries.h +++ b/src/charts/splinechart/qsplineseries.h @@ -47,7 +47,7 @@ class Q_CHARTS_EXPORT QSplineSeries : public QLineSeries public: explicit QSplineSeries(QObject *parent = nullptr); ~QSplineSeries(); - QAbstractSeries::SeriesType type() const; + QAbstractSeries::SeriesType type() const override; private: Q_DECLARE_PRIVATE(QSplineSeries) diff --git a/src/charts/splinechart/qsplineseries_p.h b/src/charts/splinechart/qsplineseries_p.h index b7dba7d4..aa0f0fab 100644 --- a/src/charts/splinechart/qsplineseries_p.h +++ b/src/charts/splinechart/qsplineseries_p.h @@ -51,10 +51,10 @@ class Q_CHARTS_PRIVATE_EXPORT QSplineSeriesPrivate: public QLineSeriesPrivate public: QSplineSeriesPrivate(QSplineSeries *q); - void initializeTheme(int index, ChartTheme* theme, bool forced = false); - void initializeGraphics(QGraphicsItem* parent); + void initializeTheme(int index, ChartTheme* theme, bool forced = false) override; + void initializeGraphics(QGraphicsItem* parent) override; void initializeAnimations(QtCharts::QChart::AnimationOptions options, int duration, - QEasingCurve &curve); + QEasingCurve &curve) override; private: Q_DECLARE_PUBLIC(QSplineSeries) diff --git a/src/charts/splinechart/splinechartitem_p.h b/src/charts/splinechart/splinechartitem_p.h index 66aae47a..e8055e0d 100644 --- a/src/charts/splinechart/splinechartitem_p.h +++ b/src/charts/splinechart/splinechartitem_p.h @@ -55,29 +55,29 @@ public: SplineChartItem(QSplineSeries *series, QGraphicsItem *item = 0); //from QGraphicsItem - QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - QPainterPath shape() const; + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + QPainterPath shape() const override; void setControlGeometryPoints(QVector<QPointF>& points); QVector<QPointF> controlGeometryPoints() const; void setAnimation(SplineAnimation *animation); - ChartAnimation *animation() const; + ChartAnimation *animation() const override; public Q_SLOTS: void handleUpdated(); protected: - void updateGeometry(); + void updateGeometry() override; QVector<QPointF> calculateControlPoints(const QVector<QPointF> &points); QVector<qreal> firstControlPoints(const QVector<qreal>& vector); - void updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index); - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + void updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; private: QSplineSeries *m_series; diff --git a/src/charts/xychart/qxyseries_p.h b/src/charts/xychart/qxyseries_p.h index 6d243154..e9ac877e 100644 --- a/src/charts/xychart/qxyseries_p.h +++ b/src/charts/xychart/qxyseries_p.h @@ -54,15 +54,15 @@ class Q_CHARTS_PRIVATE_EXPORT QXYSeriesPrivate: public QAbstractSeriesPrivate public: QXYSeriesPrivate(QXYSeries *q); - void initializeDomain(); - void initializeAxes(); + void initializeDomain() override; + void initializeAxes() override; void initializeAnimations(QtCharts::QChart::AnimationOptions options, int duration, - QEasingCurve &curve); + QEasingCurve &curve) override; - QList<QLegendMarker*> createLegendMarkers(QLegend* legend); + QList<QLegendMarker*> createLegendMarkers(QLegend* legend) override; - QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; - QAbstractAxis* createDefaultAxis(Qt::Orientation orientation) const; + QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const override; + QAbstractAxis* createDefaultAxis(Qt::Orientation orientation) const override; void drawSeriesPointLabels(QPainter *painter, const QVector<QPointF> &points, const int offset = 0); diff --git a/src/charts/xychart/xychart_p.h b/src/charts/xychart/xychart_p.h index 3e1300ce..95c07c3a 100644 --- a/src/charts/xychart/xychart_p.h +++ b/src/charts/xychart/xychart_p.h @@ -62,7 +62,7 @@ public: QVector<QPointF> geometryPoints() const { return m_points; } void setAnimation(XYAnimation *animation); - ChartAnimation *animation() const { return m_animation; } + ChartAnimation *animation() const override { return m_animation; } virtual void updateGeometry() = 0; bool isDirty() const { return m_dirty; } @@ -77,7 +77,7 @@ public Q_SLOTS: void handlePointsRemoved(int index, int count); void handlePointReplaced(int index); void handlePointsReplaced(); - void handleDomainUpdated(); + void handleDomainUpdated() override; Q_SIGNALS: void clicked(const QPointF &point); diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp index 8c5d52c4..32ee69ae 100644 --- a/src/chartsqml2/chartsqml2_plugin.cpp +++ b/src/chartsqml2/chartsqml2_plugin.cpp @@ -149,7 +149,7 @@ class QtChartsQml2Plugin : public QQmlExtensionPlugin public: QtChartsQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } - virtual void registerTypes(const char *uri) + void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCharts")); diff --git a/src/chartsqml2/declarativebarseries_p.h b/src/chartsqml2/declarativebarseries_p.h index d84f4155..e350cad6 100644 --- a/src/chartsqml2/declarativebarseries_p.h +++ b/src/chartsqml2/declarativebarseries_p.h @@ -124,8 +124,8 @@ public: Q_INVOKABLE void clear() { return QBarSeries::clear(); } public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); @@ -171,8 +171,8 @@ public: Q_INVOKABLE void clear() { return QStackedBarSeries::clear(); } public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); @@ -218,8 +218,8 @@ public: Q_INVOKABLE void clear() { return QPercentBarSeries::clear(); } public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); @@ -265,8 +265,8 @@ public: Q_INVOKABLE void clear() { return QHorizontalBarSeries::clear(); } public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); @@ -312,8 +312,8 @@ public: Q_INVOKABLE void clear() { return QHorizontalStackedBarSeries::clear(); } public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); @@ -359,8 +359,8 @@ public: Q_INVOKABLE void clear() { return QHorizontalPercentBarSeries::clear(); } public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: Q_REVISION(1) void axisXChanged(QAbstractAxis *axis); diff --git a/src/chartsqml2/declarativeboxplotseries_p.h b/src/chartsqml2/declarativeboxplotseries_p.h index 8cc5e84a..84126c0e 100644 --- a/src/chartsqml2/declarativeboxplotseries_p.h +++ b/src/chartsqml2/declarativeboxplotseries_p.h @@ -128,8 +128,8 @@ public: Q_INVOKABLE void clear() { return QBoxPlotSeries::clear(); } public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: void axisXChanged(QAbstractAxis *axis); diff --git a/src/chartsqml2/declarativecandlestickseries_p.h b/src/chartsqml2/declarativecandlestickseries_p.h index 80a49edc..2eb354ce 100644 --- a/src/chartsqml2/declarativecandlestickseries_p.h +++ b/src/chartsqml2/declarativecandlestickseries_p.h @@ -107,8 +107,8 @@ public: Q_INVOKABLE void clear(); public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: void axisXChanged(QAbstractAxis *axis); diff --git a/src/chartsqml2/declarativecategoryaxis_p.h b/src/chartsqml2/declarativecategoryaxis_p.h index 1c1ba850..6c269cd1 100644 --- a/src/chartsqml2/declarativecategoryaxis_p.h +++ b/src/chartsqml2/declarativecategoryaxis_p.h @@ -86,8 +86,8 @@ public: public: // from QDeclarativeParserStatus - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; public: AxisLabelsPosition labelsPosition() const; diff --git a/src/chartsqml2/declarativechart_p.h b/src/chartsqml2/declarativechart_p.h index a33bf77e..589b77b0 100644 --- a/src/chartsqml2/declarativechart_p.h +++ b/src/chartsqml2/declarativechart_p.h @@ -126,15 +126,15 @@ public: ~DeclarativeChart(); public: // From parent classes - void childEvent(QChildEvent *event); - void componentComplete(); - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); + void childEvent(QChildEvent *event) override; + void componentComplete() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; protected: - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void hoverMoveEvent(QHoverEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void hoverMoveEvent(QHoverEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; private Q_SLOTS: void handleAntialiasingChanged(bool enable); void sceneChanged(QList<QRectF> region); diff --git a/src/chartsqml2/declarativelineseries_p.h b/src/chartsqml2/declarativelineseries_p.h index c3c164fd..6997806d 100644 --- a/src/chartsqml2/declarativelineseries_p.h +++ b/src/chartsqml2/declarativelineseries_p.h @@ -68,7 +68,7 @@ class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeLineSeries : public QLineSeries, pub public: explicit DeclarativeLineSeries(QObject *parent = 0); - QXYSeries *xySeries() { return this; } + QXYSeries *xySeries() override { return this; } QAbstractAxis *axisX() { return m_axes->axisX(); } void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } @@ -90,8 +90,8 @@ public: QQmlListProperty<QObject> declarativeChildren(); public: // from QDeclarativeParserStatus - void classBegin() { DeclarativeXySeries::classBegin(); } - void componentComplete() { DeclarativeXySeries::componentComplete(); } + void classBegin() override { DeclarativeXySeries::classBegin(); } + void componentComplete() override { DeclarativeXySeries::componentComplete(); } public: Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); } diff --git a/src/chartsqml2/declarativepieseries_p.h b/src/chartsqml2/declarativepieseries_p.h index f0ab75cc..51776aee 100644 --- a/src/chartsqml2/declarativepieseries_p.h +++ b/src/chartsqml2/declarativepieseries_p.h @@ -86,8 +86,8 @@ public: Q_INVOKABLE void clear(); public: - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: void sliceAdded(QPieSlice *slice); diff --git a/src/chartsqml2/declarativescatterseries_p.h b/src/chartsqml2/declarativescatterseries_p.h index c160e360..e5463a9d 100644 --- a/src/chartsqml2/declarativescatterseries_p.h +++ b/src/chartsqml2/declarativescatterseries_p.h @@ -68,7 +68,7 @@ class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeScatterSeries : public QScatterSerie public: explicit DeclarativeScatterSeries(QObject *parent = 0); - QXYSeries *xySeries() { return this; } + QXYSeries *xySeries() override { return this; } QAbstractAxis *axisX() { return m_axes->axisX(); } void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } @@ -86,12 +86,12 @@ public: QQmlListProperty<QObject> declarativeChildren(); QString brushFilename() const; void setBrushFilename(const QString &brushFilename); - void setBrush(const QBrush &brush); + void setBrush(const QBrush &brush) override; QBrush brush() const; public: // from QDeclarativeParserStatus - void classBegin() { DeclarativeXySeries::classBegin(); } - void componentComplete() { DeclarativeXySeries::componentComplete(); } + void classBegin() override { DeclarativeXySeries::classBegin(); } + void componentComplete() override { DeclarativeXySeries::componentComplete(); } public: Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); } diff --git a/src/chartsqml2/declarativesplineseries_p.h b/src/chartsqml2/declarativesplineseries_p.h index d9f29352..41ae31e0 100644 --- a/src/chartsqml2/declarativesplineseries_p.h +++ b/src/chartsqml2/declarativesplineseries_p.h @@ -68,7 +68,7 @@ class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeSplineSeries : public QSplineSeries, public: explicit DeclarativeSplineSeries(QObject *parent = 0); - QXYSeries *xySeries() { return this; } + QXYSeries *xySeries() override { return this; } QAbstractAxis *axisX() { return m_axes->axisX(); } void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } @@ -90,8 +90,8 @@ public: QQmlListProperty<QObject> declarativeChildren(); public: // from QDeclarativeParserStatus - void classBegin() { DeclarativeXySeries::classBegin(); } - void componentComplete() { DeclarativeXySeries::componentComplete(); } + void classBegin() override { DeclarativeXySeries::classBegin(); } + void componentComplete() override { DeclarativeXySeries::componentComplete(); } public: Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); } |