From 3ff61f3e10b66f580f5ddfb986540ce4c1e50387 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 6 Feb 2019 13:44:52 -0500 Subject: [PATCH] Remove Shuttle.h from other headers --- src/commands/AudacityCommand.cpp | 1 + src/commands/AudacityCommand.h | 1 - src/commands/CompareAudioCommand.cpp | 1 + src/commands/Demo.cpp | 1 + src/commands/DragCommand.cpp | 1 + src/commands/GetInfoCommand.cpp | 1 + src/commands/GetTrackInfoCommand.cpp | 1 + src/commands/HelpCommand.cpp | 1 + src/commands/ImportExportCommands.cpp | 1 + src/commands/MessageCommand.cpp | 1 + src/commands/OpenSaveCommands.cpp | 1 + src/commands/PreferenceCommands.cpp | 1 + src/commands/ScreenshotCommand.cpp | 1 + src/commands/SelectCommand.cpp | 1 + src/commands/SetClipCommand.cpp | 1 + src/commands/SetEnvelopeCommand.cpp | 1 + src/commands/SetLabelCommand.cpp | 1 + src/commands/SetProjectCommand.cpp | 1 + src/commands/SetTrackInfoCommand.cpp | 1 + src/effects/Amplify.cpp | 1 + src/effects/AutoDuck.cpp | 1 + src/effects/BassTreble.cpp | 1 + src/effects/ChangePitch.cpp | 1 + src/effects/ChangeSpeed.cpp | 1 + src/effects/ChangeTempo.cpp | 1 + src/effects/ClickRemoval.cpp | 1 + src/effects/Compressor.cpp | 1 + src/effects/Distortion.cpp | 1 + src/effects/DtmfGen.cpp | 1 + src/effects/Effect.h | 1 - src/effects/EffectManager.cpp | 1 + src/effects/Equalization.cpp | 1 + src/effects/FindClipping.cpp | 1 + src/effects/Noise.cpp | 1 + src/effects/Normalize.cpp | 1 + src/effects/Paulstretch.cpp | 1 + src/effects/Phaser.cpp | 1 + src/effects/Repeat.cpp | 1 + src/effects/Reverb.cpp | 1 + src/effects/ScienFilter.cpp | 1 + src/effects/TimeScale.cpp | 1 + src/effects/ToneGen.cpp | 1 + src/effects/TruncSilence.cpp | 1 + src/effects/Wahwah.cpp | 1 + src/effects/nyquist/Nyquist.cpp | 1 + 45 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/commands/AudacityCommand.cpp b/src/commands/AudacityCommand.cpp index 9470050dd..34c28614b 100644 --- a/src/commands/AudacityCommand.cpp +++ b/src/commands/AudacityCommand.cpp @@ -42,6 +42,7 @@ ShuttleGui. #include "../Mix.h" #include "../Prefs.h" #include "../Project.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../toolbars/ControlToolBar.h" diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h index 431598bfb..b114d88a6 100644 --- a/src/commands/AudacityCommand.h +++ b/src/commands/AudacityCommand.h @@ -32,7 +32,6 @@ class wxWindow; #include "../Experimental.h" #include "../SampleFormat.h" #include "../SelectedRegion.h" -#include "../Shuttle.h" #include "../Internat.h" #include "../widgets/ProgressDialog.h" #include "../include/audacity/ComponentInterface.h" diff --git a/src/commands/CompareAudioCommand.cpp b/src/commands/CompareAudioCommand.cpp index 067bf555e..213835648 100644 --- a/src/commands/CompareAudioCommand.cpp +++ b/src/commands/CompareAudioCommand.cpp @@ -29,6 +29,7 @@ threshold of difference in two selected tracks #include #include +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/ErrorDialog.h" #include "../widgets/valnum.h" diff --git a/src/commands/Demo.cpp b/src/commands/Demo.cpp index 24c5d74d9..bc05041de 100644 --- a/src/commands/Demo.cpp +++ b/src/commands/Demo.cpp @@ -26,6 +26,7 @@ parameters. It is for development purposes. #include +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/ErrorDialog.h" #include "../widgets/valnum.h" diff --git a/src/commands/DragCommand.cpp b/src/commands/DragCommand.cpp index e2298c48d..e3f15198b 100644 --- a/src/commands/DragCommand.cpp +++ b/src/commands/DragCommand.cpp @@ -22,6 +22,7 @@ #include "../Track.h" #include "../TrackPanel.h" #include "../WaveTrack.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp index a900cb53e..458ff053e 100644 --- a/src/commands/GetInfoCommand.cpp +++ b/src/commands/GetInfoCommand.cpp @@ -40,6 +40,7 @@ This class now lists #include "CommandContext.h" #include "../prefs/PrefsDialog.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" enum { diff --git a/src/commands/GetTrackInfoCommand.cpp b/src/commands/GetTrackInfoCommand.cpp index 9da7df48b..532b82eac 100644 --- a/src/commands/GetTrackInfoCommand.cpp +++ b/src/commands/GetTrackInfoCommand.cpp @@ -23,6 +23,7 @@ #include "../TrackPanel.h" #include "../NoteTrack.h" #include "../WaveTrack.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" diff --git a/src/commands/HelpCommand.cpp b/src/commands/HelpCommand.cpp index 030f22eab..9757a0afd 100644 --- a/src/commands/HelpCommand.cpp +++ b/src/commands/HelpCommand.cpp @@ -16,6 +16,7 @@ #include "../Audacity.h" #include "HelpCommand.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" #include "../effects/EffectManager.h" diff --git a/src/commands/ImportExportCommands.cpp b/src/commands/ImportExportCommands.cpp index a4ea67010..f3bac50e9 100644 --- a/src/commands/ImportExportCommands.cpp +++ b/src/commands/ImportExportCommands.cpp @@ -19,6 +19,7 @@ #include "../Project.h" #include "../Track.h" #include "../export/Export.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" diff --git a/src/commands/MessageCommand.cpp b/src/commands/MessageCommand.cpp index b40833c9e..d09ad2b1c 100644 --- a/src/commands/MessageCommand.cpp +++ b/src/commands/MessageCommand.cpp @@ -17,6 +17,7 @@ #include "MessageCommand.h" #include "CommandType.h" #include "CommandContext.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" bool MessageCommand::DefineParams( ShuttleParams & S ){ diff --git a/src/commands/OpenSaveCommands.cpp b/src/commands/OpenSaveCommands.cpp index c903b5fa2..9bd8bdf4d 100644 --- a/src/commands/OpenSaveCommands.cpp +++ b/src/commands/OpenSaveCommands.cpp @@ -19,6 +19,7 @@ #include "../Menus.h" #include "../Project.h" #include "../export/Export.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" diff --git a/src/commands/PreferenceCommands.cpp b/src/commands/PreferenceCommands.cpp index b913c3c65..aa83318ce 100644 --- a/src/commands/PreferenceCommands.cpp +++ b/src/commands/PreferenceCommands.cpp @@ -19,6 +19,7 @@ SetPreferenceCommand classes #include "PreferenceCommands.h" #include "../Menus.h" #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../commands/CommandContext.h" diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp index 8d30764f3..cbb5578ab 100644 --- a/src/commands/ScreenshotCommand.cpp +++ b/src/commands/ScreenshotCommand.cpp @@ -42,6 +42,7 @@ small calculations of rectangles. #include "../toolbars/ToolsToolBar.h" #include "../toolbars/TranscriptionToolBar.h" #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" #include "CommandManager.h" diff --git a/src/commands/SelectCommand.cpp b/src/commands/SelectCommand.cpp index 39fc65ae8..70db38e76 100644 --- a/src/commands/SelectCommand.cpp +++ b/src/commands/SelectCommand.cpp @@ -37,6 +37,7 @@ explicitly code all three. #include "../Project.h" #include "../Track.h" #include "../TrackPanel.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" diff --git a/src/commands/SetClipCommand.cpp b/src/commands/SetClipCommand.cpp index 9e56f5585..60d0667f9 100644 --- a/src/commands/SetClipCommand.cpp +++ b/src/commands/SetClipCommand.cpp @@ -22,6 +22,7 @@ #include "../Track.h" #include "../TrackPanel.h" #include "../WaveTrack.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" diff --git a/src/commands/SetEnvelopeCommand.cpp b/src/commands/SetEnvelopeCommand.cpp index a31618b36..9dba3c01f 100644 --- a/src/commands/SetEnvelopeCommand.cpp +++ b/src/commands/SetEnvelopeCommand.cpp @@ -23,6 +23,7 @@ #include "../TrackPanel.h" #include "../WaveTrack.h" #include "../Envelope.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" diff --git a/src/commands/SetLabelCommand.cpp b/src/commands/SetLabelCommand.cpp index 594847494..c68a4c977 100644 --- a/src/commands/SetLabelCommand.cpp +++ b/src/commands/SetLabelCommand.cpp @@ -23,6 +23,7 @@ #include "../TrackPanel.h" #include "../WaveTrack.h" #include "../LabelTrack.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" diff --git a/src/commands/SetProjectCommand.cpp b/src/commands/SetProjectCommand.cpp index 33b506fd4..6aeea7099 100644 --- a/src/commands/SetProjectCommand.cpp +++ b/src/commands/SetProjectCommand.cpp @@ -23,6 +23,7 @@ #include "../Track.h" #include "../TrackPanel.h" #include "../WaveTrack.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" #include "../toolbars/SelectionBar.h" diff --git a/src/commands/SetTrackInfoCommand.cpp b/src/commands/SetTrackInfoCommand.cpp index e5295e893..ba7ec4b39 100644 --- a/src/commands/SetTrackInfoCommand.cpp +++ b/src/commands/SetTrackInfoCommand.cpp @@ -41,6 +41,7 @@ SetTrackAudioCommand and SetTrackVisualsCommand. #include "../WaveTrack.h" #include "../prefs/WaveformSettings.h" #include "../prefs/SpectrogramSettings.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" diff --git a/src/effects/Amplify.cpp b/src/effects/Amplify.cpp index 33682cc8a..4b40eeab9 100644 --- a/src/effects/Amplify.cpp +++ b/src/effects/Amplify.cpp @@ -33,6 +33,7 @@ #include #include +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" diff --git a/src/effects/AutoDuck.cpp b/src/effects/AutoDuck.cpp index c7313d3f6..818af1292 100644 --- a/src/effects/AutoDuck.cpp +++ b/src/effects/AutoDuck.cpp @@ -30,6 +30,7 @@ #include "../AllThemeResources.h" #include "../Internat.h" #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../Theme.h" #include "../widgets/valnum.h" diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp index 1384f1462..654dada15 100644 --- a/src/effects/BassTreble.cpp +++ b/src/effects/BassTreble.cpp @@ -26,6 +26,7 @@ #include #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" diff --git a/src/effects/ChangePitch.cpp b/src/effects/ChangePitch.cpp index e7c826e6c..51917f322 100644 --- a/src/effects/ChangePitch.cpp +++ b/src/effects/ChangePitch.cpp @@ -31,6 +31,7 @@ the pitch without changing the tempo. #include #include "../PitchName.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../Spectrum.h" #include "../WaveTrack.h" diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index 4018d31ac..2274fa47d 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -24,6 +24,7 @@ #include "../Prefs.h" #include "../Project.h" #include "../Resample.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" diff --git a/src/effects/ChangeTempo.cpp b/src/effects/ChangeTempo.cpp index 444d74dbd..bacab6bca 100644 --- a/src/effects/ChangeTempo.cpp +++ b/src/effects/ChangeTempo.cpp @@ -28,6 +28,7 @@ #include +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" #include "TimeWarper.h" diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp index 2b8d8df58..adf567cab 100644 --- a/src/effects/ClickRemoval.cpp +++ b/src/effects/ClickRemoval.cpp @@ -33,6 +33,7 @@ #include #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/ErrorDialog.h" #include "../widgets/valnum.h" diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp index d4555b4e5..32e5bb7cb 100644 --- a/src/effects/Compressor.cpp +++ b/src/effects/Compressor.cpp @@ -36,6 +36,7 @@ #include "../AColor.h" #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../float_cast.h" #include "../widgets/Ruler.h" diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp index 224512ee2..9d8c38bcb 100644 --- a/src/effects/Distortion.cpp +++ b/src/effects/Distortion.cpp @@ -37,6 +37,7 @@ #include #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" #include "../TranslatableStringArray.h" diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index 28133f6ee..161d50329 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -22,6 +22,7 @@ #include #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" diff --git a/src/effects/Effect.h b/src/effects/Effect.h index 38b69ea65..c8b4f23ad 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -35,7 +35,6 @@ class wxWindow; #include "../Experimental.h" #include "../SampleFormat.h" #include "../SelectedRegion.h" -#include "../Shuttle.h" #include "../Internat.h" #include "../widgets/ProgressDialog.h" diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp index 72171dfc8..26b8a722a 100644 --- a/src/effects/EffectManager.cpp +++ b/src/effects/EffectManager.cpp @@ -32,6 +32,7 @@ effects. #endif #include "EffectManager.h" +#include "../Shuttle.h" #include "../commands/Command.h" #include "../commands/CommandContext.h" diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index a992b1810..3abb32bf8 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -81,6 +81,7 @@ #include "../Experimental.h" #include "../AColor.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../PlatformCompatibility.h" #include "../FileNames.h" diff --git a/src/effects/FindClipping.cpp b/src/effects/FindClipping.cpp index 65a7e6da8..78636699e 100644 --- a/src/effects/FindClipping.cpp +++ b/src/effects/FindClipping.cpp @@ -26,6 +26,7 @@ #include +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" #include "../widgets/ErrorDialog.h" diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index 41f003809..61c031f2d 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -24,6 +24,7 @@ #include #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp index f01538e4e..e27e2617a 100644 --- a/src/effects/Normalize.cpp +++ b/src/effects/Normalize.cpp @@ -26,6 +26,7 @@ #include "../Internat.h" #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index 6e5de4858..6493d126e 100644 --- a/src/effects/Paulstretch.cpp +++ b/src/effects/Paulstretch.cpp @@ -25,6 +25,7 @@ #include #include +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../FFT.h" #include "../widgets/valnum.h" diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp index dfcc6c66e..54cf06142 100644 --- a/src/effects/Phaser.cpp +++ b/src/effects/Phaser.cpp @@ -26,6 +26,7 @@ #include +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" diff --git a/src/effects/Repeat.cpp b/src/effects/Repeat.cpp index ea74543f9..f1880a97f 100644 --- a/src/effects/Repeat.cpp +++ b/src/effects/Repeat.cpp @@ -28,6 +28,7 @@ #include #include "../LabelTrack.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../widgets/NumericTextCtrl.h" diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp index 3041658ee..e72445888 100644 --- a/src/effects/Reverb.cpp +++ b/src/effects/Reverb.cpp @@ -22,6 +22,7 @@ #include "../Audacity.h" #include "../Prefs.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index 2808b5a1a..3576586d2 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -50,6 +50,7 @@ a graph for EffectScienFilter. #include "../PlatformCompatibility.h" #include "../Prefs.h" #include "../Project.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../Theme.h" #include "../WaveTrack.h" diff --git a/src/effects/TimeScale.cpp b/src/effects/TimeScale.cpp index 74665193f..a76820337 100644 --- a/src/effects/TimeScale.cpp +++ b/src/effects/TimeScale.cpp @@ -23,6 +23,7 @@ #include +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp index 04f687555..b3f6e7291 100644 --- a/src/effects/ToneGen.cpp +++ b/src/effects/ToneGen.cpp @@ -29,6 +29,7 @@ frequency changes smoothly during the tone. #include #include "../Project.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/NumericTextCtrl.h" #include "../widgets/valnum.h" diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index 91e76bb0c..5d4010083 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -29,6 +29,7 @@ #include "../Prefs.h" #include "../Project.h" +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" diff --git a/src/effects/Wahwah.cpp b/src/effects/Wahwah.cpp index 85a26912b..d3fe991f9 100644 --- a/src/effects/Wahwah.cpp +++ b/src/effects/Wahwah.cpp @@ -25,6 +25,7 @@ #include +#include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index a8437b607..5ab44ad3b 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -55,6 +55,7 @@ effects from this one class. #include "../../TimeTrack.h" #include "../../prefs/SpectrogramSettings.h" #include "../../Project.h" +#include "../../Shuttle.h" #include "../../ShuttleGui.h" #include "../../WaveClip.h" #include "../../WaveTrack.h"