Mercurial > hg > svgui
comparison 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 |
comparison
equal
deleted
inserted
replaced
1413:0930a27ebea2 | 1414:fa986b91d77f |
---|---|
22 { | 22 { |
23 Q_OBJECT | 23 Q_OBJECT |
24 | 24 |
25 public: | 25 public: |
26 AlignmentView(QWidget *parent = 0); | 26 AlignmentView(QWidget *parent = 0); |
27 virtual QString getPropertyContainerIconName() const { return "alignment"; } | 27 QString getPropertyContainerIconName() const override { return "alignment"; } |
28 | 28 |
29 void setViewAbove(View *view); | 29 void setViewAbove(View *view); |
30 void setViewBelow(View *view); | 30 void setViewBelow(View *view); |
31 | 31 |
32 public slots: | 32 public slots: |
33 virtual void globalCentreFrameChanged(sv_frame_t); | 33 void globalCentreFrameChanged(sv_frame_t) override; |
34 virtual void viewCentreFrameChanged(View *, sv_frame_t); | 34 void viewCentreFrameChanged(View *, sv_frame_t) override; |
35 virtual void viewAboveZoomLevelChanged(ZoomLevel, bool); | 35 virtual void viewAboveZoomLevelChanged(ZoomLevel, bool); |
36 virtual void viewBelowZoomLevelChanged(ZoomLevel, bool); | 36 virtual void viewBelowZoomLevelChanged(ZoomLevel, bool); |
37 virtual void viewManagerPlaybackFrameChanged(sv_frame_t); | 37 void viewManagerPlaybackFrameChanged(sv_frame_t) override; |
38 | 38 |
39 protected: | 39 protected: |
40 virtual void paintEvent(QPaintEvent *e); | 40 void paintEvent(QPaintEvent *e) override; |
41 virtual bool shouldLabelSelections() const { return false; } | 41 bool shouldLabelSelections() const override { return false; } |
42 | 42 |
43 std::vector<sv_frame_t> getKeyFrames(); | 43 std::vector<sv_frame_t> getKeyFrames(); |
44 std::vector<sv_frame_t> getDefaultKeyFrames(); | 44 std::vector<sv_frame_t> getDefaultKeyFrames(); |
45 | 45 |
46 View *m_above; | 46 View *m_above; |