summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2
diff options
context:
space:
mode:
authorAlexander Volkov <avolkov@astralinux.ru>2020-06-26 17:47:24 +0300
committerAlexander Volkov <avolkov@astralinux.ru>2020-06-29 10:49:34 +0300
commit14684346ef899583008ab30c0950bd727e552c25 (patch)
treea88854c7d18551c27050869b5091bab8469b3c3e /src/datavisualizationqml2
parent09e937788d0bb32a133fbf668b834fa13e7669c3 (diff)
Add missing override
Change-Id: I20cec71db97cbf896255d4f6d7e947072a86e2bb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r--src/datavisualizationqml2/abstractdeclarative_p.h18
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2_plugin.h2
-rw-r--r--src/datavisualizationqml2/declarativebars_p.h6
-rw-r--r--src/datavisualizationqml2/declarativerendernode_p.h2
-rw-r--r--src/datavisualizationqml2/declarativescatter_p.h6
-rw-r--r--src/datavisualizationqml2/declarativesurface_p.h6
-rw-r--r--src/datavisualizationqml2/declarativetheme_p.h4
7 files changed, 22 insertions, 22 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 18cca6e2..5bfc41c9 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -181,7 +181,7 @@ public:
static QCustom3DItem *atCustomItemFunc(QQmlListProperty<QCustom3DItem> *list, int index);
static void clearCustomItemFunc(QQmlListProperty<QCustom3DItem> *list);
- virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+ void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
void setSharedController(Abstract3DController *controller);
// Used to synch up data model from controller to renderer while main thread is locked
@@ -239,22 +239,22 @@ public Q_SLOTS:
void destroyContext();
protected:
- virtual void mouseDoubleClickEvent(QMouseEvent *event);
- virtual void touchEvent(QTouchEvent *event);
- virtual void mousePressEvent(QMouseEvent *event);
- virtual void mouseReleaseEvent(QMouseEvent *event);
- virtual void mouseMoveEvent(QMouseEvent *event);
+ void mouseDoubleClickEvent(QMouseEvent *event) override;
+ void touchEvent(QTouchEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
#if QT_CONFIG(wheelevent)
- virtual void wheelEvent(QWheelEvent *event);
+ void wheelEvent(QWheelEvent *event) override;
#endif
virtual void handleWindowChanged(QQuickWindow *win);
- virtual void itemChange(ItemChange change, const ItemChangeData &value);
+ void itemChange(ItemChange change, const ItemChangeData &value) override;
virtual void updateWindowParameters();
virtual void handleSelectionModeChange(QAbstract3DGraph::SelectionFlags mode);
virtual void handleShadowQualityChange(QAbstract3DGraph::ShadowQuality quality);
virtual void handleSelectedElementChange(QAbstract3DGraph::ElementType type);
virtual void handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints);
- virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);
+ QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
Q_SIGNALS:
void selectionModeChanged(AbstractDeclarative::SelectionFlags mode);
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
index 5bc19b4d..d997f8c1 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
@@ -126,7 +126,7 @@ class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin
public:
QtDataVisualizationQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
- void registerTypes(const char *uri);
+ void registerTypes(const char *uri) override;
};
QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index 2fe6a602..1f48b73e 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -101,9 +101,9 @@ public:
float floorLevel() const;
public Q_SLOTS:
- void handleAxisXChanged(QAbstract3DAxis *axis);
- void handleAxisYChanged(QAbstract3DAxis *axis);
- void handleAxisZChanged(QAbstract3DAxis *axis);
+ void handleAxisXChanged(QAbstract3DAxis *axis) override;
+ void handleAxisYChanged(QAbstract3DAxis *axis) override;
+ void handleAxisZChanged(QAbstract3DAxis *axis) override;
Q_SIGNALS:
void rowAxisChanged(QCategory3DAxis *axis);
diff --git a/src/datavisualizationqml2/declarativerendernode_p.h b/src/datavisualizationqml2/declarativerendernode_p.h
index 08da5163..99ae2aac 100644
--- a/src/datavisualizationqml2/declarativerendernode_p.h
+++ b/src/datavisualizationqml2/declarativerendernode_p.h
@@ -72,7 +72,7 @@ public:
void setQuickWindow(QQuickWindow *window);
void setSamples(int samples);
- void preprocess();
+ void preprocess() override;
public Q_SLOTS:
void handleControllerDestroyed();
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index f164a482..6323c9ca 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -79,9 +79,9 @@ public:
QScatter3DSeries *selectedSeries() const;
public Q_SLOTS:
- void handleAxisXChanged(QAbstract3DAxis *axis);
- void handleAxisYChanged(QAbstract3DAxis *axis);
- void handleAxisZChanged(QAbstract3DAxis *axis);
+ void handleAxisXChanged(QAbstract3DAxis *axis) override;
+ void handleAxisYChanged(QAbstract3DAxis *axis) override;
+ void handleAxisZChanged(QAbstract3DAxis *axis) override;
Q_SIGNALS:
void axisXChanged(QValue3DAxis *axis);
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h
index d78f20c0..a23fe389 100644
--- a/src/datavisualizationqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml2/declarativesurface_p.h
@@ -82,9 +82,9 @@ public:
bool flipHorizontalGrid() const;
public Q_SLOTS:
- void handleAxisXChanged(QAbstract3DAxis *axis);
- void handleAxisYChanged(QAbstract3DAxis *axis);
- void handleAxisZChanged(QAbstract3DAxis *axis);
+ void handleAxisXChanged(QAbstract3DAxis *axis) override;
+ void handleAxisYChanged(QAbstract3DAxis *axis) override;
+ void handleAxisZChanged(QAbstract3DAxis *axis) override;
Q_SIGNALS:
void axisXChanged(QValue3DAxis *axis);
diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h
index 6934cbd6..c0f44404 100644
--- a/src/datavisualizationqml2/declarativetheme_p.h
+++ b/src/datavisualizationqml2/declarativetheme_p.h
@@ -88,8 +88,8 @@ public:
ColorGradient *multiHighlightGradient() const;
// From QQmlParserStatus
- virtual void classBegin();
- virtual void componentComplete();
+ void classBegin() override;
+ void componentComplete() override;
Q_SIGNALS:
void singleHighlightGradientChanged(ColorGradient *gradient);