From e30939fe4df788c2b95101f28512eee4668f6fa5 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 7 May 2018 15:13:25 +0200 Subject: [PATCH] Tracing: Use override consistently clang-tidy fixes from modernize-use-override check. Change-Id: I6ddeef87244c2242945dd91e29ef0cd8bb9fe636 Reviewed-by: Ulf Hermann --- src/libs/tracing/timelineabstractrenderer.h | 4 ++-- src/libs/tracing/timelineitemsrenderpass.h | 6 +++--- src/libs/tracing/timelinemodel.h | 2 +- src/libs/tracing/timelinemodelaggregator.h | 2 +- src/libs/tracing/timelinenotesmodel.h | 2 +- src/libs/tracing/timelinenotesrenderpass.h | 2 +- src/libs/tracing/timelineoverviewrenderer.h | 2 +- src/libs/tracing/timelinerenderer.h | 12 ++++++------ src/libs/tracing/timelineselectionrenderpass.h | 2 +- src/libs/tracing/timelinetracemanager.h | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/libs/tracing/timelineabstractrenderer.h b/src/libs/tracing/timelineabstractrenderer.h index 11b2b75fc81..879f9b478e8 100644 --- a/src/libs/tracing/timelineabstractrenderer.h +++ b/src/libs/tracing/timelineabstractrenderer.h @@ -47,7 +47,7 @@ class TRACING_EXPORT TimelineAbstractRenderer : public QQuickItem public: TimelineAbstractRenderer(QQuickItem *parent = 0); - ~TimelineAbstractRenderer(); + ~TimelineAbstractRenderer() override; bool selectionLocked() const; int selectedItem() const; @@ -81,7 +81,7 @@ public: void setRowHeightsDirty(); protected: - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData); + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) override; class TimelineAbstractRendererPrivate; TimelineAbstractRenderer(TimelineAbstractRendererPrivate &dd, QQuickItem *parent = 0); diff --git a/src/libs/tracing/timelineitemsrenderpass.h b/src/libs/tracing/timelineitemsrenderpass.h index 597b1fa98d4..f08c1952b9b 100644 --- a/src/libs/tracing/timelineitemsrenderpass.h +++ b/src/libs/tracing/timelineitemsrenderpass.h @@ -44,8 +44,8 @@ public: QColor selectionColor() const; void setSelectionColor(QColor selectionColor); - QSGMaterialType *type() const; - QSGMaterialShader *createShader() const; + QSGMaterialType *type() const override; + QSGMaterialShader *createShader() const override; private: QVector2D m_scale; @@ -95,7 +95,7 @@ public: static const TimelineItemsRenderPass *instance(); State *update(const TimelineAbstractRenderer *renderer, const TimelineRenderState *parentState, State *state, int firstIndex, int lastIndex, bool stateChanged, - float spacing) const; + float spacing) const override; protected: TimelineItemsRenderPass(); }; diff --git a/src/libs/tracing/timelinemodel.h b/src/libs/tracing/timelinemodel.h index 9bf3f062695..abf0953bacd 100644 --- a/src/libs/tracing/timelinemodel.h +++ b/src/libs/tracing/timelinemodel.h @@ -53,7 +53,7 @@ public: class TimelineModelPrivate; TimelineModel(TimelineModelAggregator *parent); - ~TimelineModel(); + ~TimelineModel() override; // Methods implemented by the abstract model itself bool isEmpty() const; diff --git a/src/libs/tracing/timelinemodelaggregator.h b/src/libs/tracing/timelinemodelaggregator.h index ddcf4e96a14..af8250467c9 100644 --- a/src/libs/tracing/timelinemodelaggregator.h +++ b/src/libs/tracing/timelinemodelaggregator.h @@ -38,7 +38,7 @@ class TRACING_EXPORT TimelineModelAggregator : public QObject Q_PROPERTY(Timeline::TimelineNotesModel *notes READ notes CONSTANT) public: TimelineModelAggregator(TimelineNotesModel *notes = nullptr, QObject *parent = nullptr); - ~TimelineModelAggregator(); + ~TimelineModelAggregator() override; int height() const; int generateModelId(); diff --git a/src/libs/tracing/timelinenotesmodel.h b/src/libs/tracing/timelinenotesmodel.h index 6583c5bb8d1..4c79ed7ff04 100644 --- a/src/libs/tracing/timelinenotesmodel.h +++ b/src/libs/tracing/timelinenotesmodel.h @@ -35,7 +35,7 @@ class TRACING_EXPORT TimelineNotesModel : public QObject Q_PROPERTY(int count READ count NOTIFY changed) public: TimelineNotesModel(QObject *parent = 0); - ~TimelineNotesModel(); + ~TimelineNotesModel() override; int count() const; void addTimelineModel(const TimelineModel *timelineModel); diff --git a/src/libs/tracing/timelinenotesrenderpass.h b/src/libs/tracing/timelinenotesrenderpass.h index 57e1548771e..c3aed591e46 100644 --- a/src/libs/tracing/timelinenotesrenderpass.h +++ b/src/libs/tracing/timelinenotesrenderpass.h @@ -37,7 +37,7 @@ public: State *update(const TimelineAbstractRenderer *renderer, const TimelineRenderState *parentState, State *oldState, int firstIndex, int lastIndex, bool stateChanged, - float spacing) const; + float spacing) const override; private: TimelineNotesRenderPass(); diff --git a/src/libs/tracing/timelineoverviewrenderer.h b/src/libs/tracing/timelineoverviewrenderer.h index a1a684c5b92..94686b61014 100644 --- a/src/libs/tracing/timelineoverviewrenderer.h +++ b/src/libs/tracing/timelineoverviewrenderer.h @@ -35,7 +35,7 @@ public: TimelineOverviewRenderer(QQuickItem *parent = 0); protected: - virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData); + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) override; class TimelineOverviewRendererPrivate; Q_DECLARE_PRIVATE(TimelineOverviewRenderer) diff --git a/src/libs/tracing/timelinerenderer.h b/src/libs/tracing/timelinerenderer.h index 7b7f035a469..da5656ad582 100644 --- a/src/libs/tracing/timelinerenderer.h +++ b/src/libs/tracing/timelinerenderer.h @@ -48,12 +48,12 @@ public: Q_INVOKABLE void clearData(); protected: - virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData); - virtual void mousePressEvent(QMouseEvent *event); - virtual void mouseReleaseEvent(QMouseEvent *event); - virtual void mouseMoveEvent(QMouseEvent *event); - virtual void hoverMoveEvent(QHoverEvent *event); - virtual void wheelEvent(QWheelEvent *event); + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void hoverMoveEvent(QHoverEvent *event) override; + void wheelEvent(QWheelEvent *event) override; private: class TimelineRendererPrivate; diff --git a/src/libs/tracing/timelineselectionrenderpass.h b/src/libs/tracing/timelineselectionrenderpass.h index 1a65ab3e451..fed7eccb1a2 100644 --- a/src/libs/tracing/timelineselectionrenderpass.h +++ b/src/libs/tracing/timelineselectionrenderpass.h @@ -38,7 +38,7 @@ public: State *update(const TimelineAbstractRenderer *renderer, const TimelineRenderState *parentState, State *state, int firstIndex, int lastIndex, bool stateChanged, - float spacing) const; + float spacing) const override; protected: TimelineSelectionRenderPass(); diff --git a/src/libs/tracing/timelinetracemanager.h b/src/libs/tracing/timelinetracemanager.h index ddba03f6f74..a6fd4f66058 100644 --- a/src/libs/tracing/timelinetracemanager.h +++ b/src/libs/tracing/timelinetracemanager.h @@ -49,7 +49,7 @@ public: typedef std::function ErrorHandler; explicit TimelineTraceManager(QObject *parent = nullptr); - ~TimelineTraceManager(); + ~TimelineTraceManager() override; qint64 traceStart() const; qint64 traceEnd() const;