Pass non-const AudacityProject to HitTest::Preview...

... because that will be needed for elimination of some GetActiveProject() calls. Because some overrides need to find the focused track, but that may mutate the project by setting the focused track when it wasn't yet defined.
2025-06-15 15:49:36 +02:00 · 2020-01-04 09:40:33 -05:00 · 2020-01-04 09:40:33 -05:00 · f64bc5a829
commit f64bc5a829
parent f1ee1689c6
38 changed files with 42 additions and 42 deletions
--- a/src/AdornedRulerPanel.cpp
+++ b/src/AdornedRulerPanel.cpp
@ -529,7 +529,7 @@ private:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
   override;

   Result Release
@ -619,7 +619,7 @@ protected:
   }

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override
   {
      (void)pProject;// Compiler food
@ -771,7 +771,7 @@ private:
   }

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
   override;

   Result Release
@ -1494,7 +1494,7 @@ void AdornedRulerPanel::HandleQPDrag(wxMouseEvent &/*event*/, wxCoord mousePosX)
 }

 auto AdornedRulerPanel::ScrubbingHandle::Preview
-(const TrackPanelMouseState &state, const AudacityProject *pProject)
+(const TrackPanelMouseState &state, AudacityProject *pProject)
 -> HitTestPreview
 {
   (void)state;// Compiler food
@ -1510,7 +1510,7 @@ auto AdornedRulerPanel::ScrubbingHandle::Preview
 }

 auto AdornedRulerPanel::QPHandle::Preview
-(const TrackPanelMouseState &state, const AudacityProject *pProject)
+(const TrackPanelMouseState &state, AudacityProject *pProject)
 -> HitTestPreview
 {
   TranslatableString tooltip;
--- a/src/TrackPanelResizeHandle.cpp
+++ b/src/TrackPanelResizeHandle.cpp
@ -237,7 +237,7 @@ UIHandle::Result TrackPanelResizeHandle::Drag
 }

 HitTestPreview TrackPanelResizeHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *)
+(const TrackPanelMouseState &, AudacityProject *)
 {
   return HitPreview(mMode == IsResizingBetweenLinkedTracks);
 }
--- a/src/TrackPanelResizeHandle.h
+++ b/src/TrackPanelResizeHandle.h
@ -37,7 +37,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state,  const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/UIHandle.h
+++ b/src/UIHandle.h
@ -85,7 +85,7 @@ public:
   // or called after Drag().
   // Specifies cursor and status bar message.
   virtual HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject) = 0;
+      (const TrackPanelMouseState &state, AudacityProject *pProject) = 0;

   // Assume previously Clicked and not yet Released or Cancelled.
   // event.pCell may be other than for Click; may be NULL, and rect empty.
--- a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp
+++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp
@ -363,7 +363,7 @@ UIHandle::Result LabelGlyphHandle::Drag
 }

 HitTestPreview LabelGlyphHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *)
+(const TrackPanelMouseState &, AudacityProject *)
 {
   return HitPreview( (mpHit->mEdge & 4 )!=0);
 }
--- a/src/tracks/labeltrack/ui/LabelGlyphHandle.h
+++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.h
@ -72,7 +72,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/labeltrack/ui/LabelTextHandle.cpp
+++ b/src/tracks/labeltrack/ui/LabelTextHandle.cpp
@ -288,7 +288,7 @@ UIHandle::Result LabelTextHandle::Drag
 }

 HitTestPreview LabelTextHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *)
+(const TrackPanelMouseState &, AudacityProject *)
 {
   return HitPreview();
 }
--- a/src/tracks/labeltrack/ui/LabelTextHandle.h
+++ b/src/tracks/labeltrack/ui/LabelTextHandle.h
@ -47,7 +47,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp
@ -81,7 +81,7 @@ UIHandle::Result NoteTrackButtonHandle::Drag
 }

 HitTestPreview NoteTrackButtonHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *)
+(const TrackPanelMouseState &, AudacityProject *)
 {
   // auto pTrack = pProject->GetTracks()->Lock(mpTrack);
   auto pTrack = mpTrack.lock();
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h
@ -55,7 +55,7 @@ protected:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
@ -135,7 +135,7 @@ UIHandle::Result NoteTrackVZoomHandle::Drag
 }

 HitTestPreview NoteTrackVZoomHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *)
+(const TrackPanelMouseState &st, AudacityProject *)
 {
   return HitPreview(st.state);
 }
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h
@ -45,7 +45,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp
@ -206,7 +206,7 @@ UIHandle::Result StretchHandle::Drag
 }

 HitTestPreview StretchHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *pProject)
+(const TrackPanelMouseState &, AudacityProject *pProject)
 {
   const bool unsafe = ProjectAudioIO::Get( *pProject ).IsAudioActive();
   return HitPreview( mStretchState.mMode, unsafe );
--- a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h
+++ b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h
@ -75,7 +75,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp
@ -206,7 +206,7 @@ UIHandle::Result CutlineHandle::Drag
 }

 HitTestPreview CutlineHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *pProject)
+(const TrackPanelMouseState &, AudacityProject *pProject)
 {
   const bool unsafe = ProjectAudioIO::Get( *pProject ).IsAudioActive();
   auto bCutline = (mLocation.typ == WaveTrackLocation::locationCutLine);
--- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h
@ -52,7 +52,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp
@ -401,7 +401,7 @@ UIHandle::Result SampleHandle::Drag
 }

 HitTestPreview SampleHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *pProject)
+(const TrackPanelMouseState &st, AudacityProject *pProject)
 {
   const bool unsafe = ProjectAudioIO::Get( *pProject ).IsAudioActive();
   return HitPreview(st.state, pProject, unsafe);
--- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h
@ -53,7 +53,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp
@ -56,7 +56,7 @@ UIHandle::Result SpectrumVZoomHandle::Drag
 }

 HitTestPreview SpectrumVZoomHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *)
+(const TrackPanelMouseState &st, AudacityProject *)
 {
   return WaveTrackVZoomHandle::HitPreview(st.state);
 }
--- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h
@ -45,7 +45,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp
@ -371,7 +371,7 @@ public:
   }

   HitTestPreview Preview(
-      const TrackPanelMouseState &state, const AudacityProject * ) override
+      const TrackPanelMouseState &state, AudacityProject * ) override
   {
      static auto resizeCursor =
         ::MakeCursor(wxCURSOR_ARROW, SubViewsCursorXpm, 16, 16);
--- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp
@ -55,7 +55,7 @@ UIHandle::Result WaveformVZoomHandle::Drag
 }

 HitTestPreview WaveformVZoomHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *)
+(const TrackPanelMouseState &st, AudacityProject *)
 {
   return WaveTrackVZoomHandle::HitPreview(st.state);
 }
--- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h
@ -45,7 +45,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/ui/BackgroundCell.cpp
+++ b/src/tracks/ui/BackgroundCell.cpp
@ -70,7 +70,7 @@ public:
   { return RefreshCode::RefreshNone; }

   HitTestPreview Preview
-      (const TrackPanelMouseState &, const AudacityProject *) override
+      (const TrackPanelMouseState &, AudacityProject *) override
   { return HitPreview(); }

   Result Release
--- a/src/tracks/ui/ButtonHandle.cpp
+++ b/src/tracks/ui/ButtonHandle.cpp
@ -71,7 +71,7 @@ UIHandle::Result ButtonHandle::Drag
 }

 HitTestPreview ButtonHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *)
+(const TrackPanelMouseState &st, AudacityProject *)
 {
   // No special cursor
   auto message = Tip(st.state);
--- a/src/tracks/ui/ButtonHandle.h
+++ b/src/tracks/ui/ButtonHandle.h
@ -59,7 +59,7 @@ protected:
      final override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      final override;

   Result Release
--- a/src/tracks/ui/EnvelopeHandle.cpp
+++ b/src/tracks/ui/EnvelopeHandle.cpp
@ -248,7 +248,7 @@ UIHandle::Result EnvelopeHandle::Drag
 }

 HitTestPreview EnvelopeHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *pProject)
+(const TrackPanelMouseState &, AudacityProject *pProject)
 {
   const bool unsafe = ProjectAudioIO::Get( *pProject ).IsAudioActive();
   static auto disabledCursor =
--- a/src/tracks/ui/EnvelopeHandle.h
+++ b/src/tracks/ui/EnvelopeHandle.h
@ -64,7 +64,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/ui/SelectHandle.cpp
+++ b/src/tracks/ui/SelectHandle.cpp
@ -895,7 +895,7 @@ UIHandle::Result SelectHandle::Drag
 }

 HitTestPreview SelectHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *pProject)
+(const TrackPanelMouseState &st, AudacityProject *pProject)
 {
   if (!HasSnap() && !mUseSnap)
      // Moved out of snapping; revert to un-escaped state
--- a/src/tracks/ui/SelectHandle.h
+++ b/src/tracks/ui/SelectHandle.h
@ -65,7 +65,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/ui/SliderHandle.cpp
+++ b/src/tracks/ui/SliderHandle.cpp
@ -74,7 +74,7 @@ UIHandle::Result SliderHandle::Drag
 }

 HitTestPreview SliderHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *)
+(const TrackPanelMouseState &, AudacityProject *)
 {
   // No special message or cursor
   return {};
--- a/src/tracks/ui/SliderHandle.h
+++ b/src/tracks/ui/SliderHandle.h
@ -56,7 +56,7 @@ protected:
      final override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      final override;

   Result Release
--- a/src/tracks/ui/TimeShiftHandle.cpp
+++ b/src/tracks/ui/TimeShiftHandle.cpp
@ -775,7 +775,7 @@ UIHandle::Result TimeShiftHandle::Drag
 }

 HitTestPreview TimeShiftHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *pProject)
+(const TrackPanelMouseState &, AudacityProject *pProject)
 {
   // After all that, it still may be unsafe to drag.
   // Even if so, make an informative cursor change from default to "banned."
--- a/src/tracks/ui/TimeShiftHandle.h
+++ b/src/tracks/ui/TimeShiftHandle.h
@ -93,7 +93,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/ui/TrackSelectHandle.cpp
+++ b/src/tracks/ui/TrackSelectHandle.cpp
@ -142,7 +142,7 @@ UIHandle::Result TrackSelectHandle::Drag
 }

 HitTestPreview TrackSelectHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *project)
+(const TrackPanelMouseState &, AudacityProject *project)
 {
   const auto trackCount = TrackList::Get( *project ).Leaders().size();
   auto message = Message(trackCount);
--- a/src/tracks/ui/TrackSelectHandle.h
+++ b/src/tracks/ui/TrackSelectHandle.h
@ -38,7 +38,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release
--- a/src/tracks/ui/ZoomHandle.cpp
+++ b/src/tracks/ui/ZoomHandle.cpp
@ -118,7 +118,7 @@ UIHandle::Result ZoomHandle::Drag
 }

 HitTestPreview ZoomHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *pProject)
+(const TrackPanelMouseState &st, AudacityProject *pProject)
 {
   return HitPreview(st.state, pProject);
 }
--- a/src/tracks/ui/ZoomHandle.h
+++ b/src/tracks/ui/ZoomHandle.h
@ -41,7 +41,7 @@ public:
      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;

   HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
      override;

   Result Release