Mercurial > hg > svcore
diff data/model/DenseThreeDimensionalModel.h @ 1580:c01cbe41aeb5 fix-static-analysis
Use override throughout
author | Chris Cannam |
---|---|
date | Mon, 26 Nov 2018 13:48:45 +0000 |
parents | 51d6551d5244 |
children | ad5f892c0c4d |
line wrap: on
line diff
--- a/data/model/DenseThreeDimensionalModel.h Thu Nov 22 14:55:18 2018 +0000 +++ b/data/model/DenseThreeDimensionalModel.h Mon Nov 26 13:48:45 2018 +0000 @@ -118,7 +118,7 @@ return getValueAt(x, y) > threshold; } - QString getTypeName() const { return tr("Dense 3-D"); } + QString getTypeName() const override { return tr("Dense 3-D"); } virtual int getCompletion() const = 0; @@ -129,10 +129,10 @@ "on its side"). */ - virtual int getRowCount() const { return getWidth(); } - virtual int getColumnCount() const { return getHeight() + 2; } + int getRowCount() const override { return getWidth(); } + int getColumnCount() const override { return getHeight() + 2; } - virtual QString getHeading(int column) const + QString getHeading(int column) const override { switch (column) { case 0: return tr("Time"); @@ -146,8 +146,8 @@ } } - virtual QVariant getData(int row, int column, int) const - { + QVariant getData(int row, int column, int) const + override { switch (column) { case 0: { RealTime rt = RealTime::frame2RealTime @@ -161,17 +161,17 @@ } } - virtual bool isColumnTimeValue(int col) const { + bool isColumnTimeValue(int col) const override { return col < 2; } - virtual SortType getSortType(int) const { + SortType getSortType(int) const override { return SortNumeric; } - virtual sv_frame_t getFrameForRow(int row) const { + sv_frame_t getFrameForRow(int row) const override { return sv_frame_t(row) * getResolution() + getStartFrame(); } - virtual int getRowForFrame(sv_frame_t frame) const { + int getRowForFrame(sv_frame_t frame) const override { return int((frame - getStartFrame()) / getResolution()); }