From b83ed90cfb744eafcf8b655626f7554f99383d8b Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sat, 30 Mar 2019 16:07:00 -0400
Subject: [PATCH] Remove or comment Ruler.h, Overlay.h, OverlayPanel.h in other
 headers

---
 src/AdornedRulerPanel.h              | 2 +-
 src/CellularPanel.h                  | 2 +-
 src/effects/Equalization.h           | 2 +-
 src/tracks/ui/EditCursorOverlay.h    | 2 +-
 src/tracks/ui/PlayIndicatorOverlay.h | 2 +-
 src/tracks/ui/Scrubbing.h            | 2 +-
 src/widgets/Meter.h                  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/AdornedRulerPanel.h b/src/AdornedRulerPanel.h
index 7a04eff1e..0af6c913a 100644
--- a/src/AdornedRulerPanel.h
+++ b/src/AdornedRulerPanel.h
@@ -12,7 +12,7 @@
 #define __AUDACITY_ADORNED_RULER_PANEL__
 
 #include "CellularPanel.h"
-#include "widgets/Ruler.h"
+#include "widgets/Ruler.h" // member variable
 
 #include "MemoryX.h"
 
diff --git a/src/CellularPanel.h b/src/CellularPanel.h
index 325ee1d0b..5b02e035d 100644
--- a/src/CellularPanel.h
+++ b/src/CellularPanel.h
@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_CELLULAR_PANEL__
 #define __AUDACITY_CELLULAR_PANEL__
 
-#include "widgets/OverlayPanel.h"
+#include "widgets/OverlayPanel.h" // to inherit
 
 class ViewInfo;
 class AudacityProject;
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index 9b6788b8c..d6f6589b8 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -26,7 +26,6 @@
 #include "Effect.h"
 #include "../xml/XMLTagHandler.h"
 #include "../widgets/Grid.h"
-#include "../widgets/Ruler.h"
 #include "../RealFFTf.h"
 #include "../SampleFormat.h"
 
@@ -58,6 +57,7 @@ class wxStaticText;
 class Envelope;
 class EnvelopeEditor;
 class EqualizationPanel;
+class RulerPanel;
 
 //
 // One point in a curve
diff --git a/src/tracks/ui/EditCursorOverlay.h b/src/tracks/ui/EditCursorOverlay.h
index 8ad634cd9..2a7115562 100644
--- a/src/tracks/ui/EditCursorOverlay.h
+++ b/src/tracks/ui/EditCursorOverlay.h
@@ -12,7 +12,7 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_EDIT_CURSOR_OVERLAY__
 
 #include <memory>
-#include "../../widgets/Overlay.h"
+#include "../../widgets/Overlay.h" // to inherit
 
 class AudacityProject;
 
diff --git a/src/tracks/ui/PlayIndicatorOverlay.h b/src/tracks/ui/PlayIndicatorOverlay.h
index 4eb4ac7ab..729b9e662 100644
--- a/src/tracks/ui/PlayIndicatorOverlay.h
+++ b/src/tracks/ui/PlayIndicatorOverlay.h
@@ -13,7 +13,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include <wx/event.h> // to inherit
 #include "../../MemoryX.h"
-#include "../../widgets/Overlay.h"
+#include "../../widgets/Overlay.h" // to inherit
 
 class AudacityProject;
 
diff --git a/src/tracks/ui/Scrubbing.h b/src/tracks/ui/Scrubbing.h
index 89f856f59..28235c603 100644
--- a/src/tracks/ui/Scrubbing.h
+++ b/src/tracks/ui/Scrubbing.h
@@ -17,7 +17,7 @@ Paul Licameli split from TrackPanel.cpp
 #include <vector>
 #include <wx/longlong.h>
 
-#include "../../widgets/Overlay.h"
+#include "../../widgets/Overlay.h" // to inherit
 #include "../../commands/CommandFunctors.h"
 #include "../../commands/CommandContext.h"
 #include "../../commands/CommandManager.h" // for MenuTable
diff --git a/src/widgets/Meter.h b/src/widgets/Meter.h
index c55093436..8a2b8d5e9 100644
--- a/src/widgets/Meter.h
+++ b/src/widgets/Meter.h
@@ -22,7 +22,7 @@
 #include <wx/timer.h> // member variable
 
 #include "../SampleFormat.h"
-#include "Ruler.h"
+#include "Ruler.h" // member variable
 
 class AudacityProject;