From d373e278408ef09aac7f1ac69f038dc24c350715 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 23 May 2020 05:32:01 -0400 Subject: [PATCH] Remove some unused forward declarations and #include directives --- src/TimerRecordDialog.h | 2 -- src/commands/CommandManager.h | 1 - src/import/ImportPlugin.h | 1 - src/prefs/DevicePrefs.h | 1 - src/prefs/GUIPrefs.h | 1 - src/prefs/MidiIOPrefs.h | 2 -- src/prefs/QualityPrefs.h | 2 -- src/prefs/SpectrumPrefs.h | 1 - src/prefs/TracksBehaviorsPrefs.h | 1 - src/prefs/WaveformPrefs.h | 2 -- src/toolbars/SelectionBar.cpp | 1 - src/toolbars/ToolDock.cpp | 1 - src/widgets/ASlider.cpp | 2 -- src/widgets/ASlider.h | 1 - src/widgets/KeyView.h | 2 -- src/widgets/Ruler.h | 1 - 16 files changed, 22 deletions(-) diff --git a/src/TimerRecordDialog.h b/src/TimerRecordDialog.h index 5355afb46..89a849f6c 100644 --- a/src/TimerRecordDialog.h +++ b/src/TimerRecordDialog.h @@ -30,8 +30,6 @@ class NumericTextCtrl; class ShuttleGui; class TimerRecordPathCtrl; -class wxArrayStringEx; - enum TimerRecordCompletedActions { TR_ACTION_NOTHING = 0x00000000, TR_ACTION_SAVED = 0x00000001, diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h index 6395ecf16..4b1980e10 100644 --- a/src/commands/CommandManager.h +++ b/src/commands/CommandManager.h @@ -31,7 +31,6 @@ class wxMenu; class wxMenuBar; -class wxArrayString; class wxMenu; class wxMenuBar; using CommandParameter = CommandID; diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h index 482427f8f..5f3469b89 100644 --- a/src/import/ImportPlugin.h +++ b/src/import/ImportPlugin.h @@ -53,7 +53,6 @@ but little else. #include "ImportRaw.h" // defines TrackHolders class AudacityProject; -class wxArrayString; class ProgressDialog; enum class ProgressResult : unsigned; class TrackFactory; diff --git a/src/prefs/DevicePrefs.h b/src/prefs/DevicePrefs.h index c8bdc22b4..9a25d71bc 100644 --- a/src/prefs/DevicePrefs.h +++ b/src/prefs/DevicePrefs.h @@ -18,7 +18,6 @@ class wxChoice; class ShuttleGui; -class wxArrayStringEx; #define DEVICE_PREFS_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Device") } diff --git a/src/prefs/GUIPrefs.h b/src/prefs/GUIPrefs.h index f9be82a07..bbb96053e 100644 --- a/src/prefs/GUIPrefs.h +++ b/src/prefs/GUIPrefs.h @@ -19,7 +19,6 @@ class ChoiceSetting; class ShuttleGui; -class wxArrayStringEx; #define GUI_PREFS_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("GUI") } diff --git a/src/prefs/MidiIOPrefs.h b/src/prefs/MidiIOPrefs.h index b22fb73ad..b717a926a 100644 --- a/src/prefs/MidiIOPrefs.h +++ b/src/prefs/MidiIOPrefs.h @@ -24,8 +24,6 @@ class ShuttleGui; #include "PrefsPanel.h" -class wxArrayStringEx; - #define MIDI_IO_PREFS_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Midi IO") } class MidiIOPrefs final : public PrefsPanel diff --git a/src/prefs/QualityPrefs.h b/src/prefs/QualityPrefs.h index 395e9c8af..04476e89c 100644 --- a/src/prefs/QualityPrefs.h +++ b/src/prefs/QualityPrefs.h @@ -23,8 +23,6 @@ class ShuttleGui; enum sampleFormat : unsigned; enum DitherType : unsigned; -class wxArrayStringEx; - #define QUALITY_PREFS_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Quality") } class QualityPrefs final : public PrefsPanel diff --git a/src/prefs/SpectrumPrefs.h b/src/prefs/SpectrumPrefs.h index b210f6d73..b8f901dc3 100644 --- a/src/prefs/SpectrumPrefs.h +++ b/src/prefs/SpectrumPrefs.h @@ -31,7 +31,6 @@ #include "PrefsPanel.h" #include "SpectrogramSettings.h" -class wxArrayStringEx; class wxChoice; class wxCheckBox; class wxTextCtrl; diff --git a/src/prefs/TracksBehaviorsPrefs.h b/src/prefs/TracksBehaviorsPrefs.h index 1a7ba226b..44a48f933 100644 --- a/src/prefs/TracksBehaviorsPrefs.h +++ b/src/prefs/TracksBehaviorsPrefs.h @@ -18,7 +18,6 @@ class ChoiceSetting; class ShuttleGui; -class wxArrayStringEx; #define TRACKS_BEHAVIORS_PREFS_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Tracks Behaviors") } diff --git a/src/prefs/WaveformPrefs.h b/src/prefs/WaveformPrefs.h index 302700d13..93a5207f9 100644 --- a/src/prefs/WaveformPrefs.h +++ b/src/prefs/WaveformPrefs.h @@ -20,8 +20,6 @@ class WaveTrack; class wxCheckBox; class wxChoice; -class wxArrayStringEx; - #define WAVEFORM_PREFS_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Waveform") } class WaveformPrefs final : public PrefsPanel diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp index c78ef1824..90e1f1fd9 100644 --- a/src/toolbars/SelectionBar.cpp +++ b/src/toolbars/SelectionBar.cpp @@ -51,7 +51,6 @@ with changes in the SelectionBar. #include -#include "../widgets/AButton.h" #include "../AudioIOBase.h" #include "../AColor.h" #include "../KeyboardCapture.h" diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp index 701271a6c..6ae1df4dd 100644 --- a/src/toolbars/ToolDock.cpp +++ b/src/toolbars/ToolDock.cpp @@ -46,7 +46,6 @@ #include "../AllThemeResources.h" #include "../ImageManipulation.h" #include "../Prefs.h" -#include "../widgets/AButton.h" #include "../widgets/Grabber.h" const ToolBarConfiguration::Position diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp index edfdd11f3..d2ee8111d 100644 --- a/src/widgets/ASlider.cpp +++ b/src/widgets/ASlider.cpp @@ -148,8 +148,6 @@ const int sliderFontSize = 12; #define OPTIONAL_SLIDER_TICKS #endif -class wxArrayString; - // // TipWindow // diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h index ad6aee641..1b8aad960 100644 --- a/src/widgets/ASlider.h +++ b/src/widgets/ASlider.h @@ -18,7 +18,6 @@ #include // member variable #include "wxPanelWrapper.h" // to inherit -class wxArrayString; class wxBitmap; class wxSize; class wxPoint; diff --git a/src/widgets/KeyView.h b/src/widgets/KeyView.h index c8f34d082..2ac14ba7d 100644 --- a/src/widgets/KeyView.h +++ b/src/widgets/KeyView.h @@ -19,8 +19,6 @@ #include "../commands/Keyboard.h" -class wxArrayString; - // Class holding all information about a node. Rather than a real tree // we store these in an array and simulate a tree. class KeyNode diff --git a/src/widgets/Ruler.h b/src/widgets/Ruler.h index 30bc5c78a..fd6ff7043 100644 --- a/src/widgets/Ruler.h +++ b/src/widgets/Ruler.h @@ -17,7 +17,6 @@ #include // member variable #include // member variable -class wxArrayString; class wxDC; class wxFont;