Mercurial > hg > svgui
diff view/AlignmentView.h @ 1414:fa986b91d77f
Merge from branch fix-static-analysis
author | Chris Cannam |
---|---|
date | Wed, 09 Jan 2019 15:24:51 +0000 |
parents | a18e78b9c78b |
children | c5589d94b731 |
line wrap: on
line diff
--- a/view/AlignmentView.h Wed Jan 09 14:41:52 2019 +0000 +++ b/view/AlignmentView.h Wed Jan 09 15:24:51 2019 +0000 @@ -24,21 +24,21 @@ public: AlignmentView(QWidget *parent = 0); - virtual QString getPropertyContainerIconName() const { return "alignment"; } + QString getPropertyContainerIconName() const override { return "alignment"; } void setViewAbove(View *view); void setViewBelow(View *view); public slots: - virtual void globalCentreFrameChanged(sv_frame_t); - virtual void viewCentreFrameChanged(View *, sv_frame_t); + void globalCentreFrameChanged(sv_frame_t) override; + void viewCentreFrameChanged(View *, sv_frame_t) override; virtual void viewAboveZoomLevelChanged(ZoomLevel, bool); virtual void viewBelowZoomLevelChanged(ZoomLevel, bool); - virtual void viewManagerPlaybackFrameChanged(sv_frame_t); + void viewManagerPlaybackFrameChanged(sv_frame_t) override; protected: - virtual void paintEvent(QPaintEvent *e); - virtual bool shouldLabelSelections() const { return false; } + void paintEvent(QPaintEvent *e) override; + bool shouldLabelSelections() const override { return false; } std::vector<sv_frame_t> getKeyFrames(); std::vector<sv_frame_t> getDefaultKeyFrames();