From a5c50a112a3b336d93c899bc9a3b8a5c4fe7b0cb Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Thu, 13 Sep 2018 13:07:44 -0400 Subject: [PATCH] more const in drawing functions --- src/Project.cpp | 2 +- src/TrackArtist.cpp | 6 +++--- src/TrackArtist.h | 2 +- src/TrackPanel.cpp | 12 ++++++------ src/TrackPanel.h | 8 ++++---- src/TrackPanelAx.cpp | 2 +- src/TrackPanelAx.h | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Project.cpp b/src/Project.cpp index 462b19cde..279e339db 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -1956,7 +1956,7 @@ void AudacityProject::FixScrollbars() auto LastTime = -std::numeric_limits::max(); auto &tracks = *GetTracks(); - for (auto track : tracks) { + for (const Track *track : tracks) { // Iterate over pending changed tracks if present. { auto other = diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index cf132b766..c96d39018 100644 --- a/src/TrackArtist.cpp +++ b/src/TrackArtist.cpp @@ -340,7 +340,7 @@ void TrackArtist::SetMargins(int left, int top, int right, int bottom) } void TrackArtist::DrawTracks(TrackPanelDrawingContext &context, - TrackList * tracks, + const TrackList * tracks, Track * start, const wxRegion & reg, const wxRect & rect, @@ -353,8 +353,8 @@ void TrackArtist::DrawTracks(TrackPanelDrawingContext &context, { wxRect trackRect = rect; wxRect stereoTrackRect; - TrackListIterator iter(tracks); - Track *t; + TrackListConstIterator iter(tracks); + const Track *t; bool hasSolo = false; for (t = iter.First(); t; t = iter.Next()) { diff --git a/src/TrackArtist.h b/src/TrackArtist.h index 04c509a23..f3c5ab543 100644 --- a/src/TrackArtist.h +++ b/src/TrackArtist.h @@ -55,7 +55,7 @@ class AUDACITY_DLL_API TrackArtist { void SetColours(int iColorIndex); void DrawTracks(TrackPanelDrawingContext &context, - TrackList *tracks, Track *start, + const TrackList *tracks, Track *start, const wxRegion & reg, const wxRect & rect, const wxRect & clip, const SelectedRegion &selectedRegion, const ZoomInfo &zoomInfo, diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index ea80ed0fc..02201faad 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -1192,7 +1192,7 @@ void TrackPanel::DrawEverythingElse(TrackPanelDrawingContext &context, trackRect.height = 0; // for drawing background in no tracks case. VisibleTrackIterator iter(GetProject()); - for (Track *t = iter.First(); t; t = iter.Next()) { + for (const Track *t = iter.First(); t; t = iter.Next()) { auto other = GetTracks()->FindPendingChangedTrack(t->GetId()); if (other) t = other.get(); @@ -1215,7 +1215,7 @@ void TrackPanel::DrawEverythingElse(TrackPanelDrawingContext &context, // If the previous track is linked to this one but isn't on the screen // (and thus would have been skipped by VisibleTrackIterator) we need to // draw that track's border instead. - Track *borderTrack = t; + const Track *borderTrack = t; wxRect borderRect = rect; if (l && !t->GetLinked() && trackRect.y < 0) @@ -1718,7 +1718,7 @@ void TrackInfo::Status2DrawFunction void TrackPanel::DrawOutside (TrackPanelDrawingContext &context, - Track * t, const wxRect & rec) + const Track * t, const wxRect & rec) { auto dc = &context.dc; bool bIsWave = (t->GetKind() == Track::Wave); @@ -1769,7 +1769,7 @@ void TrackPanel::DrawOutside // If linked to a following channel, also paint the separator area, which // overlaps the next track rectangle's top void TrackPanel::DrawOutsideOfTrack -(TrackPanelDrawingContext &context, Track * t, const wxRect & rect) +(TrackPanelDrawingContext &context, const Track * t, const wxRect & rect) { auto dc = &context.dc; @@ -2032,7 +2032,7 @@ void TrackPanel::VerticalScroll( float fracPosition){ // Given rectangle excludes the insets left, right, and top // Draw a rectangular border and also a vertical separator of track controls // from the rest (ruler and proper track area) -void TrackPanel::DrawBordersAroundTrack(Track * t, wxDC * dc, +void TrackPanel::DrawBordersAroundTrack(const Track * t, wxDC * dc, const wxRect & rect, const int labelw, const int vrul) { @@ -2064,7 +2064,7 @@ void TrackPanel::DrawBordersAroundTrack(Track * t, wxDC * dc, // Given rectangle has insets subtracted left, right, and top // Stroke lines along bottom and right, which are slightly short at // bottom-left and top-right -void TrackPanel::DrawShadow(Track * /* t */ , wxDC * dc, const wxRect & rect) +void TrackPanel::DrawShadow(const Track * /* t */ , wxDC * dc, const wxRect & rect) { int right = rect.x + rect.width - 1; int bottom = rect.y + rect.height - 1; diff --git a/src/TrackPanel.h b/src/TrackPanel.h index c990ce7b7..25630b6eb 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -375,14 +375,14 @@ protected: const wxRect & clip); void DrawOutside (TrackPanelDrawingContext &context, - Track *t, const wxRect & rec); + const Track *t, const wxRect & rec); void HighlightFocusedTrack (wxDC* dc, const wxRect &rect); - void DrawShadow (Track *t, wxDC* dc, const wxRect & rect); - void DrawBordersAroundTrack(Track *t, wxDC* dc, const wxRect & rect, const int labelw, const int vrul); + void DrawShadow (const Track *t, wxDC* dc, const wxRect & rect); + void DrawBordersAroundTrack(const Track *t, wxDC* dc, const wxRect & rect, const int labelw, const int vrul); void DrawOutsideOfTrack (TrackPanelDrawingContext &context, - Track *t, const wxRect & rect); + const Track *t, const wxRect & rect); public: // Set the object that performs catch-all event handling when the pointer diff --git a/src/TrackPanelAx.cpp b/src/TrackPanelAx.cpp index 3b1651f1d..d1c568b2c 100644 --- a/src/TrackPanelAx.cpp +++ b/src/TrackPanelAx.cpp @@ -137,7 +137,7 @@ std::shared_ptr TrackPanelAx::SetFocus( std::shared_ptr track ) } // Returns TRUE if passed track has the focus -bool TrackPanelAx::IsFocused( Track *track ) +bool TrackPanelAx::IsFocused( const Track *track ) { auto focusedTrack = mFocusedTrack.lock(); if( !focusedTrack ) diff --git a/src/TrackPanelAx.h b/src/TrackPanelAx.h index a932e7893..f90b636fc 100644 --- a/src/TrackPanelAx.h +++ b/src/TrackPanelAx.h @@ -40,7 +40,7 @@ public: std::shared_ptr SetFocus( std::shared_ptr track = {} ); // Returns TRUE if passed track has the focus - bool IsFocused( Track *track ); + bool IsFocused( const Track *track ); // Called to signal changes to a track void Updated();