diff options
Diffstat (limited to 'src/datavisualization/data')
9 files changed, 23 insertions, 23 deletions
diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h index 20126bcc..4b3acdd5 100644 --- a/src/datavisualization/data/baritemmodelhandler_p.h +++ b/src/datavisualization/data/baritemmodelhandler_p.h @@ -53,11 +53,11 @@ public: virtual ~BarItemModelHandler(); public Q_SLOTS: - virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QList<int> &roles = QList<int>()); + void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles = QList<int>()) override; protected: - void virtual resolveModel(); + void resolveModel() override; QItemModelBarDataProxy *m_proxy; // Not owned QBarDataArray *m_proxyArray; // Not owned diff --git a/src/datavisualization/data/qbar3dseries_p.h b/src/datavisualization/data/qbar3dseries_p.h index ba11a739..0c8f5eb9 100644 --- a/src/datavisualization/data/qbar3dseries_p.h +++ b/src/datavisualization/data/qbar3dseries_p.h @@ -52,9 +52,9 @@ public: QBar3DSeriesPrivate(QBar3DSeries *q); virtual ~QBar3DSeriesPrivate(); - virtual void setDataProxy(QAbstractDataProxy *proxy); - virtual void connectControllerAndProxy(Abstract3DController *newController); - virtual void createItemLabel(); + void setDataProxy(QAbstractDataProxy *proxy) override; + void connectControllerAndProxy(Abstract3DController *newController) override; + void createItemLabel() override; void handleMeshRotationChanged(const QQuaternion &rotation); diff --git a/src/datavisualization/data/qbardataproxy_p.h b/src/datavisualization/data/qbardataproxy_p.h index 04d9dc1d..f3ed2098 100644 --- a/src/datavisualization/data/qbardataproxy_p.h +++ b/src/datavisualization/data/qbardataproxy_p.h @@ -66,7 +66,7 @@ public: QPair<GLfloat, GLfloat> limitValues(int startRow, int startColumn, int rowCount, int columnCount) const; - virtual void setSeries(QAbstract3DSeries *series); + void setSeries(QAbstract3DSeries *series) override; private: QBarDataProxy *qptr(); diff --git a/src/datavisualization/data/qscatter3dseries_p.h b/src/datavisualization/data/qscatter3dseries_p.h index c173857e..fc2f3b39 100644 --- a/src/datavisualization/data/qscatter3dseries_p.h +++ b/src/datavisualization/data/qscatter3dseries_p.h @@ -52,9 +52,9 @@ public: QScatter3DSeriesPrivate(QScatter3DSeries *q); virtual ~QScatter3DSeriesPrivate(); - virtual void setDataProxy(QAbstractDataProxy *proxy); - virtual void connectControllerAndProxy(Abstract3DController *newController); - virtual void createItemLabel(); + void setDataProxy(QAbstractDataProxy *proxy) override; + void connectControllerAndProxy(Abstract3DController *newController) override; + void createItemLabel() override; void setSelectedItem(int index); void setItemSize(float size); diff --git a/src/datavisualization/data/qscatterdataproxy_p.h b/src/datavisualization/data/qscatterdataproxy_p.h index 157152b0..38a3959a 100644 --- a/src/datavisualization/data/qscatterdataproxy_p.h +++ b/src/datavisualization/data/qscatterdataproxy_p.h @@ -67,7 +67,7 @@ public: QAbstract3DAxis *axisY, QAbstract3DAxis *axisZ) const; bool isValidValue(float axisValue, float value, QAbstract3DAxis *axis) const; - virtual void setSeries(QAbstract3DSeries *series); + void setSeries(QAbstract3DSeries *series) override; private: QScatterDataProxy *qptr(); QScatterDataArray *m_dataArray; diff --git a/src/datavisualization/data/qsurface3dseries_p.h b/src/datavisualization/data/qsurface3dseries_p.h index f3519a5a..33afdce5 100644 --- a/src/datavisualization/data/qsurface3dseries_p.h +++ b/src/datavisualization/data/qsurface3dseries_p.h @@ -52,9 +52,9 @@ public: QSurface3DSeriesPrivate(QSurface3DSeries *q); virtual ~QSurface3DSeriesPrivate(); - virtual void setDataProxy(QAbstractDataProxy *proxy); - virtual void connectControllerAndProxy(Abstract3DController *newController); - virtual void createItemLabel(); + void setDataProxy(QAbstractDataProxy *proxy) override; + void connectControllerAndProxy(Abstract3DController *newController) override; + void createItemLabel() override; void setSelectedPoint(const QPoint &position); void setFlatShadingEnabled(bool enabled); diff --git a/src/datavisualization/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h index 80443aec..bd92c15c 100644 --- a/src/datavisualization/data/qsurfacedataproxy_p.h +++ b/src/datavisualization/data/qsurfacedataproxy_p.h @@ -67,7 +67,7 @@ public: QAbstract3DAxis *axisY, QAbstract3DAxis *axisZ) const; bool isValidValue(float value, QAbstract3DAxis *axis) const; - virtual void setSeries(QAbstract3DSeries *series); + void setSeries(QAbstract3DSeries *series) override; protected: QSurfaceDataArray *m_dataArray; diff --git a/src/datavisualization/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h index 8573f675..c74b2e51 100644 --- a/src/datavisualization/data/scatteritemmodelhandler_p.h +++ b/src/datavisualization/data/scatteritemmodelhandler_p.h @@ -53,13 +53,13 @@ public: virtual ~ScatterItemModelHandler(); public Q_SLOTS: - virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QList<int> &roles = QList<int>()); - virtual void handleRowsInserted(const QModelIndex &parent, int start, int end); - virtual void handleRowsRemoved(const QModelIndex &parent, int start, int end); + void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles = QList<int>()) override; + void handleRowsInserted(const QModelIndex &parent, int start, int end) override; + void handleRowsRemoved(const QModelIndex &parent, int start, int end) override; protected: - void virtual resolveModel(); + void resolveModel() override; private: void modelPosToScatterItem(int modelRow, int modelColumn, QScatterDataItem &item); diff --git a/src/datavisualization/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h index 6304c822..b5d83096 100644 --- a/src/datavisualization/data/surfaceitemmodelhandler_p.h +++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h @@ -53,11 +53,11 @@ public: virtual ~SurfaceItemModelHandler(); public Q_SLOTS: - virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QList<int> &roles = QList<int>()); + void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles = QList<int>()) override; protected: - void virtual resolveModel(); + void resolveModel() override; QItemModelSurfaceDataProxy *m_proxy; // Not owned QSurfaceDataArray *m_proxyArray; // Not owned |