feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use C++11’s override and remove virtual where applicable

Browse Source 
Fixes warning: prefer using 'override' or (rarely) 'final' instead of
'virtual' [modernize-use-override]

Change-Id: I4b8b8ecce028dfd051fe14984b40115e92057a40
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2018-06-22 15:08:09 +02:00
parent cd45ce5f39
commit caff9f9aac
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/tracing/timelineitemsrenderpass.cpp
View File

@@ -342,7 +342,7 @@ void TimelineItemsGeometry::updateCurrentNode(float itemRight, float itemTop)
class TimelineExpandedRowNode : public QSGNode {
public:
TimelineItemsMaterial material;
virtual ~TimelineExpandedRowNode() {}
~TimelineExpandedRowNode() override {}
};
static qint64 startTime(const TimelineModel *model, const TimelineRenderState *parentState, int i)
@@ -436,12 +436,12 @@ class TimelineItemsMaterialShader : public QSGMaterialShader
public:
TimelineItemsMaterialShader();
virtual void updateState(const RenderState &state, QSGMaterial *newEffect,
QSGMaterial *oldEffect);
virtual char const *const *attributeNames() const;
void updateState(const RenderState &state, QSGMaterial *newEffect,
QSGMaterial *oldEffect) override;
char const *const *attributeNames() const override;
private:
virtual void initialize();
void initialize() override;
int m_matrix_id;
int m_scale_id;