From e70f91c64e52f363a60c45034387d22ced2c75f5 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Thu, 18 Jun 2015 10:24:36 -0400 Subject: [PATCH] Removed ShuttleGui.h from other headers --- src/AboutDialog.h | 2 +- src/AutoRecovery.cpp | 1 + src/BatchProcessDialog.cpp | 3 ++- src/BatchProcessDialog.h | 2 +- src/Benchmark.cpp | 3 ++- src/FreqWindow.cpp | 4 ++-- src/LabelDialog.cpp | 3 ++- src/TimerRecordDialog.cpp | 3 ++- src/TimerRecordDialog.h | 4 +++- src/TrackPanel.cpp | 1 + src/effects/Amplify.cpp | 4 ++-- src/effects/Amplify.h | 4 ++-- src/effects/AutoDuck.cpp | 4 ++-- src/effects/AutoDuck.h | 2 +- src/effects/BassTreble.cpp | 4 ++-- src/effects/BassTreble.h | 4 ++-- src/effects/ChangePitch.cpp | 5 +++-- src/effects/ChangePitch.h | 4 ++-- src/effects/ChangeSpeed.h | 3 ++- src/effects/ChangeTempo.h | 4 ++-- src/effects/ClickRemoval.cpp | 4 ++-- src/effects/ClickRemoval.h | 3 ++- src/effects/Compressor.cpp | 4 ++-- src/effects/Compressor.h | 3 +-- src/effects/Contrast.cpp | 5 +++-- src/effects/Contrast.h | 1 + src/effects/DtmfGen.cpp | 3 ++- src/effects/DtmfGen.h | 3 ++- src/effects/Echo.cpp | 4 ++-- src/effects/Echo.h | 4 ++-- src/effects/Effect.cpp | 3 ++- src/effects/Effect.h | 6 +++++- src/effects/FindClipping.cpp | 4 ++-- src/effects/Leveller.cpp | 4 ++-- src/effects/Leveller.h | 4 ++-- src/effects/Noise.cpp | 4 ++-- src/effects/Noise.h | 3 ++- src/effects/NoiseReduction.cpp | 1 + src/effects/Normalize.h | 3 ++- src/effects/Paulstretch.cpp | 4 ++-- src/effects/Paulstretch.h | 3 ++- src/effects/Phaser.cpp | 3 ++- src/effects/Phaser.h | 4 ++-- src/effects/Repeat.h | 4 ++-- src/effects/Reverb.cpp | 3 ++- src/effects/Reverb.h | 4 ++-- src/effects/ScienFilter.cpp | 3 ++- src/effects/ScienFilter.h | 4 +++- src/effects/Silence.cpp | 3 ++- src/effects/TimeScale.cpp | 4 +++- src/effects/TimeScale.h | 4 ++-- src/effects/ToneGen.cpp | 4 ++-- src/effects/ToneGen.h | 3 ++- src/effects/TruncSilence.cpp | 4 ++-- src/effects/TruncSilence.h | 4 ++-- src/effects/Wahwah.cpp | 4 ++-- src/effects/Wahwah.h | 4 ++-- src/effects/vamp/VampEffect.cpp | 1 + src/export/Export.cpp | 6 ++++-- src/export/ExportCL.cpp | 3 ++- src/export/ExportFLAC.cpp | 3 ++- src/export/ExportMP2.cpp | 3 ++- src/export/ExportMP3.cpp | 6 ++++-- src/export/ExportMultiple.cpp | 3 ++- src/export/ExportOGG.cpp | 3 ++- src/export/ExportPCM.cpp | 6 ++++-- src/prefs/BatchPrefs.h | 4 ++-- src/prefs/DevicePrefs.h | 6 +++--- src/prefs/DirectoriesPrefs.h | 6 +++--- src/prefs/EffectsPrefs.h | 6 +++--- src/prefs/ExtImportPrefs.h | 4 ++-- src/prefs/GUIPrefs.h | 6 +++--- src/prefs/ImportExportPrefs.h | 6 +++--- src/prefs/KeyConfigPrefs.h | 6 +++--- src/prefs/LibraryPrefs.h | 6 +++--- src/prefs/MidiIOPrefs.h | 5 +++-- src/prefs/ModulePrefs.h | 4 ++-- src/prefs/MousePrefs.h | 6 +++--- src/prefs/PlaybackPrefs.h | 6 +++--- src/prefs/PrefsDialog.cpp | 1 + src/prefs/ProjectsPrefs.h | 6 +++--- src/prefs/QualityPrefs.h | 6 +++--- src/prefs/RecordingPrefs.h | 6 +++--- src/prefs/SpectrumPrefs.h | 3 ++- src/prefs/ThemePrefs.h | 6 +++--- src/prefs/TracksPrefs.h | 6 +++--- src/prefs/WarningsPrefs.h | 6 +++--- src/toolbars/DeviceToolBar.cpp | 3 ++- src/widgets/Meter.cpp | 4 ++-- 89 files changed, 198 insertions(+), 150 deletions(-) diff --git a/src/AboutDialog.h b/src/AboutDialog.h index c9ab1169c..87093f14e 100644 --- a/src/AboutDialog.h +++ b/src/AboutDialog.h @@ -16,7 +16,7 @@ #include #include -#include "ShuttleGui.h" +class ShuttleGui; struct AboutDialogCreditItem { wxString description; diff --git a/src/AutoRecovery.cpp b/src/AutoRecovery.cpp index 29f434aa1..6b7976232 100644 --- a/src/AutoRecovery.cpp +++ b/src/AutoRecovery.cpp @@ -19,6 +19,7 @@ recover previous Audacity projects that were closed incorrectly. #include "AudacityApp.h" #include "FileNames.h" #include "blockfile/SimpleBlockFile.h" +#include "ShuttleGui.h" #include #include diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp index 4b7beb32d..5700a9777 100644 --- a/src/BatchProcessDialog.cpp +++ b/src/BatchProcessDialog.cpp @@ -15,6 +15,7 @@ *//*******************************************************************/ #include "Audacity.h" +#include "BatchProcessDialog.h" #include #include @@ -32,9 +33,9 @@ #include #include +#include "ShuttleGui.h" #include "Prefs.h" #include "Project.h" -#include "BatchProcessDialog.h" #include "Internat.h" #include "commands/CommandManager.h" #include "effects/Effect.h" diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h index a5146764c..1b00236eb 100644 --- a/src/BatchProcessDialog.h +++ b/src/BatchProcessDialog.h @@ -25,7 +25,6 @@ #include #include -#include "ShuttleGui.h" #include "BatchCommands.h" class wxWindow; @@ -37,6 +36,7 @@ class wxRadioButton; class wxListCtrl; class wxListEvent; class wxButton; +class ShuttleGui; class BatchProcessDialog:public wxDialog { public: diff --git a/src/Benchmark.cpp b/src/Benchmark.cpp index be4c1c39b..14e5ae4e2 100644 --- a/src/Benchmark.cpp +++ b/src/Benchmark.cpp @@ -16,6 +16,7 @@ of the BlockFile system. #include "Audacity.h" +#include "Benchmark.h" #include #include @@ -33,7 +34,7 @@ of the BlockFile system. #include #include -#include "Benchmark.h" +#include "ShuttleGui.h" #include "Project.h" #include "WaveTrack.h" #include "Sequence.h" diff --git a/src/FreqWindow.cpp b/src/FreqWindow.cpp index 0ad678476..b98cccfaf 100644 --- a/src/FreqWindow.cpp +++ b/src/FreqWindow.cpp @@ -41,6 +41,7 @@ and in the spectrogram spectral selection. #include "Audacity.h" +#include "FreqWindow.h" // For compilers that support precompilation, includes "wx/wx.h". #include @@ -70,8 +71,7 @@ and in the spectrogram spectral selection. #include -#include "FreqWindow.h" - +#include "ShuttleGui.h" #include "AColor.h" #include "FFT.h" #include "Internat.h" diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp index c1979e899..590781693 100644 --- a/src/LabelDialog.cpp +++ b/src/LabelDialog.cpp @@ -14,6 +14,7 @@ *//*******************************************************************/ #include "Audacity.h" +#include "LabelDialog.h" #include #include @@ -29,8 +30,8 @@ #include #include +#include "ShuttleGui.h" #include "Internat.h" -#include "LabelDialog.h" #include "LabelTrack.h" #include "Prefs.h" #include "Project.h" diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index 1671a3b2e..1aa195420 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -19,6 +19,7 @@ *//*******************************************************************/ #include "Audacity.h" +#include "TimerRecordDialog.h" #include #include @@ -29,7 +30,7 @@ #include #include // #include #include +#include -#include "ShuttleGui.h" +class wxTimerEvent; class NumericTextCtrl; +class ShuttleGui; class TimerRecordDialog : public wxDialog { diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 6ef30d837..05d36fa36 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -204,6 +204,7 @@ is time to refresh some aspect of the screen. #include "Prefs.h" #include "Project.h" #include "Snap.h" +#include "ShuttleGui.h" #include "Theme.h" #include "TimeTrack.h" #include "Track.h" diff --git a/src/effects/Amplify.cpp b/src/effects/Amplify.cpp index b807d6a34..ce9dea880 100644 --- a/src/effects/Amplify.cpp +++ b/src/effects/Amplify.cpp @@ -19,6 +19,7 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "Amplify.h" #include #include @@ -32,11 +33,10 @@ #include #include +#include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" -#include "Amplify.h" - enum { diff --git a/src/effects/Amplify.h b/src/effects/Amplify.h index 15b9b8e88..f4ef85d26 100644 --- a/src/effects/Amplify.h +++ b/src/effects/Amplify.h @@ -21,12 +21,12 @@ #include #include -#include "../ShuttleGui.h" - #include "Effect.h" #define AMPLIFY_PLUGIN_SYMBOL XO("Amplify") +class ShuttleGui; + class EffectAmplify : public Effect { public: diff --git a/src/effects/AutoDuck.cpp b/src/effects/AutoDuck.cpp index 7510d7b1e..a582c3800 100644 --- a/src/effects/AutoDuck.cpp +++ b/src/effects/AutoDuck.cpp @@ -14,6 +14,7 @@ *******************************************************************/ #include "../Audacity.h" +#include "AutoDuck.h" #include #include @@ -28,11 +29,10 @@ #include "../AllThemeResources.h" #include "../Internat.h" #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../Theme.h" #include "../widgets/valnum.h" -#include "AutoDuck.h" - // Define keys, defaults, minimums, and maximums for the effect parameters // // Name Type Key Def Min Max Scale diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h index b36f4ee9b..45a8878d1 100644 --- a/src/effects/AutoDuck.h +++ b/src/effects/AutoDuck.h @@ -19,12 +19,12 @@ #include #include -#include "../ShuttleGui.h" #include "../WaveTrack.h" #include "Effect.h" class EffectAutoDuckPanel; +class ShuttleGui; #define AUTO_DUCK_PANEL_NUM_CONTROL_POINTS 5 diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp index 1ff376016..131cc153c 100644 --- a/src/effects/BassTreble.cpp +++ b/src/effects/BassTreble.cpp @@ -19,6 +19,7 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "BassTreble.h" #include @@ -28,11 +29,10 @@ #include #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" -#include "BassTreble.h" - enum { ID_Bass = 10000, diff --git a/src/effects/BassTreble.h b/src/effects/BassTreble.h index fa328d6c7..f5dc9f814 100644 --- a/src/effects/BassTreble.h +++ b/src/effects/BassTreble.h @@ -19,10 +19,10 @@ #include #include -#include "../ShuttleGui.h" - #include "Effect.h" +class ShuttleGui; + #define BASSTREBLE_PLUGIN_SYMBOL XO("Bass and Treble") class EffectBassTreble : public Effect diff --git a/src/effects/ChangePitch.cpp b/src/effects/ChangePitch.cpp index ce3ad7c81..669b4273a 100644 --- a/src/effects/ChangePitch.cpp +++ b/src/effects/ChangePitch.cpp @@ -19,6 +19,8 @@ the pitch without changing the tempo. #if USE_SOUNDTOUCH +#include "ChangePitch.h" + #include #include @@ -26,13 +28,12 @@ the pitch without changing the tempo. #include #include "../PitchName.h" +#include "../ShuttleGui.h" #include "../Spectrum.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" #include "TimeWarper.h" -#include "ChangePitch.h" - enum { ID_PercentChange = 10000, ID_FromPitch, diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h index 5accb4545..236f5e420 100644 --- a/src/effects/ChangePitch.h +++ b/src/effects/ChangePitch.h @@ -27,10 +27,10 @@ the pitch without changing the tempo. #include #include -#include "../ShuttleGui.h" - #include "SoundTouchEffect.h" +class ShuttleGui; + #define CHANGEPITCH_PLUGIN_SYMBOL XO("Change Pitch") class EffectChangePitch : public EffectSoundTouch diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h index 3f449c23b..67a6c912b 100644 --- a/src/effects/ChangeSpeed.h +++ b/src/effects/ChangeSpeed.h @@ -19,13 +19,14 @@ #include #include -#include "../ShuttleGui.h" #include "../Track.h" #include "../WaveTrack.h" #include "../widgets/NumericTextCtrl.h" #include "Effect.h" +class ShuttleGui; + #define CHANGESPEED_PLUGIN_SYMBOL XO("Change Speed") class EffectChangeSpeed : public Effect diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h index 023154e4c..d20b98dfd 100644 --- a/src/effects/ChangeTempo.h +++ b/src/effects/ChangeTempo.h @@ -21,10 +21,10 @@ #include #include -#include "../ShuttleGui.h" - #include "SoundTouchEffect.h" +class ShuttleGui; + #define CHANGETEMPO_PLUGIN_SYMBOL XO("Change Tempo") class EffectChangeTempo : public EffectSoundTouch diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp index 6b164dafa..81e616f65 100644 --- a/src/effects/ClickRemoval.cpp +++ b/src/effects/ClickRemoval.cpp @@ -25,6 +25,7 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "ClickRemoval.h" #include @@ -33,10 +34,9 @@ #include #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../widgets/valnum.h" -#include "ClickRemoval.h" - enum { ID_Thresh = 10000, diff --git a/src/effects/ClickRemoval.h b/src/effects/ClickRemoval.h index 7066a72d4..5723f09d5 100644 --- a/src/effects/ClickRemoval.h +++ b/src/effects/ClickRemoval.h @@ -22,11 +22,12 @@ #include #include "../Envelope.h" -#include "../ShuttleGui.h" #include "../WaveTrack.h" #include "Effect.h" +class ShuttleGui; + #define CLICKREMOVAL_PLUGIN_SYMBOL XO("Click Removal") class EffectClickRemoval : public Effect diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp index bff3e71e4..0d8e8752e 100644 --- a/src/effects/Compressor.cpp +++ b/src/effects/Compressor.cpp @@ -25,6 +25,7 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "Compressor.h" #include @@ -36,11 +37,10 @@ #include "../AColor.h" #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../float_cast.h" #include "../widgets/Ruler.h" -#include "Compressor.h" - enum { ID_Threshold = 10000, diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h index 72944476b..43fa457c5 100644 --- a/src/effects/Compressor.h +++ b/src/effects/Compressor.h @@ -21,11 +21,10 @@ #include #include -#include "../ShuttleGui.h" - #include "TwoPassSimpleMono.h" class EffectCompressorPanel; +class ShuttleGui; #define COMPRESSOR_PLUGIN_SYMBOL XO("Compressor") diff --git a/src/effects/Contrast.cpp b/src/effects/Contrast.cpp index ab55f324e..3d9ffacc3 100644 --- a/src/effects/Contrast.cpp +++ b/src/effects/Contrast.cpp @@ -10,15 +10,16 @@ *//*******************************************************************/ #include "../Audacity.h" -#include "../AudacityApp.h" - #include "Contrast.h" +#include "../AudacityApp.h" + #include "../Envelope.h" #include "../FFT.h" #include "../WaveTrack.h" #include "../Prefs.h" #include "../Project.h" +#include "../ShuttleGui.h" #include "../FileNames.h" #include "../widgets/LinkingHtmlWindow.h" #include "../widgets/HelpSystem.h" diff --git a/src/effects/Contrast.h b/src/effects/Contrast.h index 456e2faa1..9f143d276 100644 --- a/src/effects/Contrast.h +++ b/src/effects/Contrast.h @@ -15,6 +15,7 @@ class wxButton; class wxSizer; class wxString; +class wxTextCtrl; class Envelope; class NumericTextCtrl; diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index 98b9de60f..893126281 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -14,15 +14,16 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "DtmfGen.h" #include #include #include #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../widgets/valnum.h" -#include "DtmfGen.h" enum { diff --git a/src/effects/DtmfGen.h b/src/effects/DtmfGen.h index 0010a973d..a8c259e53 100644 --- a/src/effects/DtmfGen.h +++ b/src/effects/DtmfGen.h @@ -19,11 +19,12 @@ #include #include -#include "../ShuttleGui.h" #include "../widgets/NumericTextCtrl.h" #include "Effect.h" +class ShuttleGui; + #define DTMFTONES_PLUGIN_SYMBOL XO("DTMF Tones") class EffectDtmf : public Effect diff --git a/src/effects/Echo.cpp b/src/effects/Echo.cpp index b956a4252..8a5fd7248 100644 --- a/src/effects/Echo.cpp +++ b/src/effects/Echo.cpp @@ -20,15 +20,15 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "Echo.h" #include #include +#include "../ShuttleGui.h" #include "../widgets/valnum.h" -#include "Echo.h" - // Define keys, defaults, minimums, and maximums for the effect parameters // // Name Type Key Def Min Max Scale diff --git a/src/effects/Echo.h b/src/effects/Echo.h index 40e38ded2..652453ad0 100644 --- a/src/effects/Echo.h +++ b/src/effects/Echo.h @@ -16,10 +16,10 @@ #include #include -#include "../ShuttleGui.h" - #include "Effect.h" +class ShuttleGui; + #define ECHO_PLUGIN_SYMBOL XO("Echo") class EffectEcho : public Effect diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index a1dd1f2b0..73d873e80 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -22,6 +22,7 @@ greater use in future. *//*******************************************************************/ #include "../Audacity.h" +#include "Effect.h" #include #include @@ -36,11 +37,11 @@ greater use in future. #include "audacity/ConfigInterface.h" -#include "Effect.h" #include "../AudioIO.h" #include "../Mix.h" #include "../Prefs.h" #include "../Project.h" +#include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../toolbars/ControlToolBar.h" #include "../widgets/AButton.h" diff --git a/src/effects/Effect.h b/src/effects/Effect.h index 350300ca4..973e3d33e 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -20,7 +20,10 @@ #include #include +class wxCheckBox; +class wxChoice; class wxDialog; +class wxListBox; class wxWindow; #include "audacity/ConfigInterface.h" @@ -30,10 +33,11 @@ class wxWindow; #include "../WaveTrack.h" #include "../SelectedRegion.h" #include "../Shuttle.h" -#include "../ShuttleGui.h" #include "../Internat.h" #include "../widgets/ProgressDialog.h" +class ShuttleGui; + #define BUILTIN_EFFECT_PREFIX wxT("Built-in Effect: ") class SelectedRegion; diff --git a/src/effects/FindClipping.cpp b/src/effects/FindClipping.cpp index f95976619..864e499b8 100644 --- a/src/effects/FindClipping.cpp +++ b/src/effects/FindClipping.cpp @@ -20,16 +20,16 @@ #include "../Audacity.h" +#include "FindClipping.h" #include #include #include "../AudacityApp.h" +#include "../ShuttleGui.h" #include "../widgets/valnum.h" -#include "FindClipping.h" - // Define keys, defaults, minimums, and maximums for the effect parameters // // Name Type Key Def Min Max Scale diff --git a/src/effects/Leveller.cpp b/src/effects/Leveller.cpp index 8b2860f02..65ee5c0ac 100644 --- a/src/effects/Leveller.cpp +++ b/src/effects/Leveller.cpp @@ -14,6 +14,7 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "Leveller.h" #include @@ -22,8 +23,7 @@ #include #include "../Prefs.h" - -#include "Leveller.h" +#include "../ShuttleGui.h" enum kPasses { diff --git a/src/effects/Leveller.h b/src/effects/Leveller.h index 1d4e310be..1019bf563 100644 --- a/src/effects/Leveller.h +++ b/src/effects/Leveller.h @@ -14,10 +14,10 @@ #include #include -#include "../ShuttleGui.h" - #include "Effect.h" +class ShuttleGui; + #define LEVELLER_PLUGIN_SYMBOL XO("Leveller") class EffectLeveller : public Effect diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index 7bf3ebbd2..398358035 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -14,6 +14,7 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "Noise.h" #include @@ -23,10 +24,9 @@ #include #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../widgets/valnum.h" -#include "Noise.h" - enum kTypes { kWhite, diff --git a/src/effects/Noise.h b/src/effects/Noise.h index 879ec948b..636aa6b5a 100644 --- a/src/effects/Noise.h +++ b/src/effects/Noise.h @@ -15,11 +15,12 @@ #include -#include "../ShuttleGui.h" #include "../widgets/NumericTextCtrl.h" #include "Effect.h" +class ShuttleGui; + #define NOISE_PLUGIN_SYMBOL XO("Noise") class EffectNoise : public Effect diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp index 1436f4208..d02985d0b 100644 --- a/src/effects/NoiseReduction.cpp +++ b/src/effects/NoiseReduction.cpp @@ -40,6 +40,7 @@ #include "../Experimental.h" #include "NoiseReduction.h" +#include "../ShuttleGui.h" #include "../Prefs.h" #include diff --git a/src/effects/Normalize.h b/src/effects/Normalize.h index ead3b1675..a5ab075c5 100644 --- a/src/effects/Normalize.h +++ b/src/effects/Normalize.h @@ -18,11 +18,12 @@ #include #include -#include "../ShuttleGui.h" #include "../WaveTrack.h" #include "Effect.h" +class ShuttleGui; + #define NORMALIZE_PLUGIN_SYMBOL XO("Normalize") class EffectNormalize : public Effect diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index e2e7f77cd..5b1c98a40 100644 --- a/src/effects/Paulstretch.cpp +++ b/src/effects/Paulstretch.cpp @@ -15,6 +15,7 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "Paulstretch.h" #include #include @@ -22,11 +23,10 @@ #include #include +#include "../ShuttleGui.h" #include "../FFT.h" #include "../widgets/valnum.h" -#include "Paulstretch.h" - // Define keys, defaults, minimums, and maximums for the effect parameters // // Name Type Key Def Min Max Scale diff --git a/src/effects/Paulstretch.h b/src/effects/Paulstretch.h index 7a195f9fa..44dbd69fd 100644 --- a/src/effects/Paulstretch.h +++ b/src/effects/Paulstretch.h @@ -12,11 +12,12 @@ #include -#include "../ShuttleGui.h" #include "../WaveTrack.h" #include "Effect.h" +class ShuttleGui; + #define PAULSTRETCH_PLUGIN_SYMBOL XO("Paulstretch") class EffectPaulstretch : public Effect diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp index c3bc2425b..260a1dec0 100644 --- a/src/effects/Phaser.cpp +++ b/src/effects/Phaser.cpp @@ -20,14 +20,15 @@ #include "../Audacity.h" +#include "Phaser.h" #include #include +#include "../ShuttleGui.h" #include "../widgets/valnum.h" -#include "Phaser.h" enum { diff --git a/src/effects/Phaser.h b/src/effects/Phaser.h index 4a5773012..8619b36d8 100644 --- a/src/effects/Phaser.h +++ b/src/effects/Phaser.h @@ -21,10 +21,10 @@ #include #include -#include "../ShuttleGui.h" - #include "Effect.h" +class ShuttleGui; + #define NUM_STAGES 24 #define PHASER_PLUGIN_SYMBOL XO("Phaser") diff --git a/src/effects/Repeat.h b/src/effects/Repeat.h index 1f5284d45..766556c3a 100644 --- a/src/effects/Repeat.h +++ b/src/effects/Repeat.h @@ -16,10 +16,10 @@ #include #include -#include "../ShuttleGui.h" - #include "Effect.h" +class ShuttleGui; + #define REPEAT_PLUGIN_SYMBOL XO("Repeat") class EffectRepeat : public Effect diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp index 7ccd3e9e1..f7a9f492d 100644 --- a/src/effects/Reverb.cpp +++ b/src/effects/Reverb.cpp @@ -15,16 +15,17 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "Reverb.h" #include #include #include "../Audacity.h" #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../widgets/valnum.h" #include "Reverb_libSoX.h" -#include "Reverb.h" enum { diff --git a/src/effects/Reverb.h b/src/effects/Reverb.h index be2213d46..d821470c9 100644 --- a/src/effects/Reverb.h +++ b/src/effects/Reverb.h @@ -18,10 +18,10 @@ #include #include -#include "../ShuttleGui.h" - #include "Effect.h" +class ShuttleGui; + #define REVERB_PLUGIN_SYMBOL XO("Reverb") struct Reverb_priv_t; diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index 7f5b8de35..838e8273e 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -33,6 +33,7 @@ a graph for EffectScienFilter. *//*******************************************************************/ #include "../Audacity.h" +#include "ScienFilter.h" #include #include @@ -50,12 +51,12 @@ a graph for EffectScienFilter. #include "../PlatformCompatibility.h" #include "../Prefs.h" #include "../Project.h" +#include "../ShuttleGui.h" #include "../Theme.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" #include "Equalization.h" // For SliderAx -#include "ScienFilter.h" #if !defined(M_PI) #define PI = 3.1415926535897932384626433832795 diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h index 65558a81a..a276b2e3b 100644 --- a/src/effects/ScienFilter.h +++ b/src/effects/ScienFilter.h @@ -23,12 +23,14 @@ Vaughan Johnson (Preview) #include #include -#include "../ShuttleGui.h" #include "../widgets/Ruler.h" #include "Biquad.h" #include "Effect.h" +class wxTextCtrl; +class ShuttleGui; + #define CLASSICFILTERS_PLUGIN_SYMBOL XO("Classic Filters") class EffectScienFilterPanel; diff --git a/src/effects/Silence.cpp b/src/effects/Silence.cpp index bf2707ab6..39b30d0d7 100644 --- a/src/effects/Silence.cpp +++ b/src/effects/Silence.cpp @@ -14,10 +14,11 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "Silence.h" #include -#include "Silence.h" +#include "../ShuttleGui.h" EffectSilence::EffectSilence() { diff --git a/src/effects/TimeScale.cpp b/src/effects/TimeScale.cpp index c14609752..103474cb8 100644 --- a/src/effects/TimeScale.cpp +++ b/src/effects/TimeScale.cpp @@ -17,13 +17,15 @@ #if USE_SBSMS +#include "TimeScale.h" + #include #include +#include "../ShuttleGui.h" #include "../widgets/valnum.h" -#include "TimeScale.h" #include "sbsms.h" enum diff --git a/src/effects/TimeScale.h b/src/effects/TimeScale.h index 262cdf611..f684a50d8 100644 --- a/src/effects/TimeScale.h +++ b/src/effects/TimeScale.h @@ -20,10 +20,10 @@ #include #include -#include "../ShuttleGui.h" - #include "SBSMSEffect.h" +class ShuttleGui; + #define TIMESCALE_PLUGIN_SYMBOL XO("Time Scale") class EffectTimeScale : public EffectSBSMS diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp index ca64e26c9..fef31fafb 100644 --- a/src/effects/ToneGen.cpp +++ b/src/effects/ToneGen.cpp @@ -19,6 +19,7 @@ frequency changes smoothly during the tone. *//*******************************************************************/ #include "../Audacity.h" +#include "ToneGen.h" #include #include @@ -27,11 +28,10 @@ frequency changes smoothly during the tone. #include #include "../Project.h" +#include "../ShuttleGui.h" #include "../widgets/NumericTextCtrl.h" #include "../widgets/valnum.h" -#include "ToneGen.h" - enum kInterpolations { kLinear, diff --git a/src/effects/ToneGen.h b/src/effects/ToneGen.h index 9d2ef61a3..337e01e25 100644 --- a/src/effects/ToneGen.h +++ b/src/effects/ToneGen.h @@ -16,11 +16,12 @@ #include #include -#include "../ShuttleGui.h" #include "../widgets/NumericTextCtrl.h" #include "Effect.h" +class ShuttleGui; + #define CHIRP_PLUGIN_SYMBOL XO("Chirp") #define TONE_PLUGIN_SYMBOL XO("Tone") diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index b29d20c3e..3f8f27f48 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -16,6 +16,7 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "TruncSilence.h" #include #include @@ -23,11 +24,10 @@ #include #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" -#include "TruncSilence.h" - enum kActions { kTruncate, diff --git a/src/effects/TruncSilence.h b/src/effects/TruncSilence.h index c086318a4..2c2c0d7fc 100644 --- a/src/effects/TruncSilence.h +++ b/src/effects/TruncSilence.h @@ -24,10 +24,10 @@ #include #include -#include "../ShuttleGui.h" - #include "Effect.h" +class ShuttleGui; + #define TRUNCATESILENCE_PLUGIN_SYMBOL XO("Truncate Silence") // Declaration of RegionList diff --git a/src/effects/Wahwah.cpp b/src/effects/Wahwah.cpp index 3d81e487c..a14213c32 100644 --- a/src/effects/Wahwah.cpp +++ b/src/effects/Wahwah.cpp @@ -19,15 +19,15 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "Wahwah.h" #include #include +#include "../ShuttleGui.h" #include "../widgets/valnum.h" -#include "Wahwah.h" - enum { ID_Freq = 10000, diff --git a/src/effects/Wahwah.h b/src/effects/Wahwah.h index c0fe56a73..0e39cd501 100644 --- a/src/effects/Wahwah.h +++ b/src/effects/Wahwah.h @@ -21,10 +21,10 @@ #include #include -#include "../ShuttleGui.h" - #include "Effect.h" +class ShuttleGui; + #define WAHWAH_PLUGIN_SYMBOL XO("Wahwah") class EffectWahwah : public Effect diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp index b003c75ad..058b1afca 100644 --- a/src/effects/vamp/VampEffect.cpp +++ b/src/effects/vamp/VampEffect.cpp @@ -37,6 +37,7 @@ #include +#include "../../ShuttleGui.h" #include "../../widgets/valnum.h" enum diff --git a/src/export/Export.cpp b/src/export/Export.cpp index b76c49979..206d007c8 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -28,6 +28,9 @@ *//********************************************************************/ +#include "../Audacity.h" +#include "Export.h" + // For compilers that support precompilation, includes "wx/wx.h". #include @@ -48,7 +51,6 @@ #include #include -#include "Export.h" #include "ExportPCM.h" #include "ExportMP3.h" #include "ExportOGG.h" @@ -61,7 +63,6 @@ #include "FileDialog.h" -#include "../Audacity.h" #include "../DirManager.h" #include "../FileFormats.h" #include "../Internat.h" @@ -69,6 +70,7 @@ #include "../Mix.h" #include "../Prefs.h" #include "../Project.h" +#include "../ShuttleGui.h" #include "../Track.h" #include "../WaveTrack.h" #include "../widgets/Warning.h" diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp index f831784e0..34e77f9a6 100644 --- a/src/export/ExportCL.cpp +++ b/src/export/ExportCL.cpp @@ -12,6 +12,7 @@ **********************************************************************/ #include "../Audacity.h" +#include "ExportCL.h" #include "../Project.h" #include @@ -22,10 +23,10 @@ #include #include #include "Export.h" -#include "ExportCL.h" #include "../Mix.h" #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../Internat.h" #include "../float_cast.h" #include "../widgets/FileHistory.h" diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp index 715ad5317..159779bb3 100644 --- a/src/export/ExportFLAC.cpp +++ b/src/export/ExportFLAC.cpp @@ -22,8 +22,8 @@ and libvorbis examples, Monty #ifdef USE_LIBFLAC -#include "Export.h" #include "ExportFLAC.h" +#include "Export.h" #include #include @@ -36,6 +36,7 @@ and libvorbis examples, Monty #include "../Project.h" #include "../Mix.h" #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../Internat.h" #include "../Tags.h" diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp index cfc6d9aa6..352bb5f9f 100644 --- a/src/export/ExportMP2.cpp +++ b/src/export/ExportMP2.cpp @@ -33,6 +33,7 @@ */ #include "../Audacity.h" +#include "ExportMP2.h" #ifdef USE_LIBTWOLAME @@ -47,12 +48,12 @@ #include #include "Export.h" -#include "ExportMP2.h" #include "../FileIO.h" #include "../Internat.h" #include "../Mix.h" #include "../Prefs.h" #include "../Project.h" +#include "../ShuttleGui.h" #include "../Tags.h" #include "../WaveTrack.h" diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp index f93d1693a..ff9a2b886 100644 --- a/src/export/ExportMP3.cpp +++ b/src/export/ExportMP3.cpp @@ -59,6 +59,9 @@ *//********************************************************************/ +#include "../Audacity.h" +#include "ExportMP3.h" + #include #include @@ -75,13 +78,13 @@ #include #include -#include "../Audacity.h" #include "../FileNames.h" #include "../float_cast.h" #include "../Internat.h" #include "../Mix.h" #include "../Prefs.h" #include "../Project.h" +#include "../ShuttleGui.h" #include "../Tags.h" #include "../WaveTrack.h" #include "../widgets/LinkingHtmlWindow.h" @@ -89,7 +92,6 @@ #include "FileDialog.h" #include "Export.h" -#include "ExportMP3.h" #include diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index 3302c9985..deeb7f30c 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -16,6 +16,7 @@ *//********************************************************************/ #include "../Audacity.h" +#include "ExportMultiple.h" #include #include @@ -38,7 +39,6 @@ #include #include "Export.h" -#include "ExportMultiple.h" #include "../Internat.h" #include "../FileFormats.h" @@ -46,6 +46,7 @@ #include "../LabelTrack.h" #include "../Project.h" #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../Tags.h" #include "../widgets/HelpSystem.h" diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp index 091ac85ca..eafd27c1a 100644 --- a/src/export/ExportOGG.cpp +++ b/src/export/ExportOGG.cpp @@ -19,8 +19,8 @@ #ifdef USE_LIBVORBIS -#include "Export.h" #include "ExportOGG.h" +#include "Export.h" #include #include @@ -31,6 +31,7 @@ #include "../Project.h" #include "../Mix.h" #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../Internat.h" #include "../Tags.h" diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp index 4789b679f..51a2f79ab 100644 --- a/src/export/ExportPCM.cpp +++ b/src/export/ExportPCM.cpp @@ -8,6 +8,9 @@ **********************************************************************/ +#include "../Audacity.h" +#include "ExportPCM.h" + #include #include @@ -23,20 +26,19 @@ #include "sndfile.h" -#include "../Audacity.h" #include "../FileFormats.h" #include "../Internat.h" #include "../LabelTrack.h" #include "../Mix.h" #include "../Prefs.h" #include "../Project.h" +#include "../ShuttleGui.h" #include "../Tags.h" #include "../Track.h" #include "../WaveTrack.h" #include "../ondemand/ODManager.h" #include "Export.h" -#include "ExportPCM.h" #ifdef USE_LIBID3TAG #include diff --git a/src/prefs/BatchPrefs.h b/src/prefs/BatchPrefs.h index 3b2936f04..427e7233c 100644 --- a/src/prefs/BatchPrefs.h +++ b/src/prefs/BatchPrefs.h @@ -16,10 +16,10 @@ #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" +class ShuttleGui; + class BatchPrefs : public PrefsPanel { public: diff --git a/src/prefs/DevicePrefs.h b/src/prefs/DevicePrefs.h index 06f3143f6..67d3bef24 100644 --- a/src/prefs/DevicePrefs.h +++ b/src/prefs/DevicePrefs.h @@ -19,11 +19,11 @@ #include #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class DevicePrefs:public PrefsPanel +class ShuttleGui; + +class DevicePrefs :public PrefsPanel { public: DevicePrefs(wxWindow * parent); diff --git a/src/prefs/DirectoriesPrefs.h b/src/prefs/DirectoriesPrefs.h index 4793420ed..404071857 100644 --- a/src/prefs/DirectoriesPrefs.h +++ b/src/prefs/DirectoriesPrefs.h @@ -14,11 +14,11 @@ #include #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class DirectoriesPrefs:public PrefsPanel +class ShuttleGui; + +class DirectoriesPrefs :public PrefsPanel { public: DirectoriesPrefs(wxWindow * parent); diff --git a/src/prefs/EffectsPrefs.h b/src/prefs/EffectsPrefs.h index 845e101cb..0d096c042 100644 --- a/src/prefs/EffectsPrefs.h +++ b/src/prefs/EffectsPrefs.h @@ -18,11 +18,11 @@ #include #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class EffectsPrefs:public PrefsPanel +class ShuttleGui; + +class EffectsPrefs :public PrefsPanel { public: EffectsPrefs(wxWindow * parent); diff --git a/src/prefs/ExtImportPrefs.h b/src/prefs/ExtImportPrefs.h index f859cc3c0..d97f29b69 100644 --- a/src/prefs/ExtImportPrefs.h +++ b/src/prefs/ExtImportPrefs.h @@ -16,15 +16,15 @@ #include #include "../widgets/Grid.h" -#include "../ShuttleGui.h" - #include "PrefsPanel.h" #include "../import/Import.h" #include "../import/ImportPlugin.h" +class wxButton; class wxListEvent; class ExtImportPrefs; +class ShuttleGui; class ExtImportPrefsDropTarget: public wxDropTarget { diff --git a/src/prefs/GUIPrefs.h b/src/prefs/GUIPrefs.h index 0fe055f67..e3af2b7f3 100644 --- a/src/prefs/GUIPrefs.h +++ b/src/prefs/GUIPrefs.h @@ -18,11 +18,11 @@ #include #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class GUIPrefs:public PrefsPanel +class ShuttleGui; + +class GUIPrefs :public PrefsPanel { public: GUIPrefs(wxWindow * parent); diff --git a/src/prefs/ImportExportPrefs.h b/src/prefs/ImportExportPrefs.h index 9c67ff1b2..9ba891ea7 100644 --- a/src/prefs/ImportExportPrefs.h +++ b/src/prefs/ImportExportPrefs.h @@ -17,11 +17,11 @@ #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class ImportExportPrefs:public PrefsPanel +class ShuttleGui; + +class ImportExportPrefs :public PrefsPanel { public: ImportExportPrefs(wxWindow * parent); diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h index bacb99d35..36f869ec4 100644 --- a/src/prefs/KeyConfigPrefs.h +++ b/src/prefs/KeyConfigPrefs.h @@ -12,6 +12,8 @@ #ifndef __AUDACITY_KEY_CONFIG_PREFS__ #define __AUDACITY_KEY_CONFIG_PREFS__ +class ShuttleGui; + #if defined(EXPERIMENTAL_KEY_VIEW) #include @@ -23,13 +25,12 @@ #include #include -#include "../ShuttleGui.h" #include "../commands/CommandManager.h" #include "../widgets/KeyView.h" #include "PrefsPanel.h" -class KeyConfigPrefs:public PrefsPanel +class KeyConfigPrefs :public PrefsPanel { public: KeyConfigPrefs(wxWindow * parent); @@ -93,7 +94,6 @@ private: #include #include -#include "../ShuttleGui.h" #include "../commands/CommandManager.h" #include "PrefsPanel.h" diff --git a/src/prefs/LibraryPrefs.h b/src/prefs/LibraryPrefs.h index 1ff51adde..15e54a98f 100644 --- a/src/prefs/LibraryPrefs.h +++ b/src/prefs/LibraryPrefs.h @@ -18,11 +18,11 @@ #include #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class LibraryPrefs:public PrefsPanel +class ShuttleGui; + +class LibraryPrefs :public PrefsPanel { public: LibraryPrefs(wxWindow * parent); diff --git a/src/prefs/MidiIOPrefs.h b/src/prefs/MidiIOPrefs.h index 97b5e60c4..81da992c3 100644 --- a/src/prefs/MidiIOPrefs.h +++ b/src/prefs/MidiIOPrefs.h @@ -10,6 +10,9 @@ **********************************************************************/ #include "../Experimental.h" + +class ShuttleGui; + #ifdef EXPERIMENTAL_MIDI_OUT #ifndef __AUDACITY_MIDI_IO_PREFS__ @@ -21,8 +24,6 @@ #include #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" class MidiIOPrefs:public PrefsPanel diff --git a/src/prefs/ModulePrefs.h b/src/prefs/ModulePrefs.h index 107a87fe5..9014e96a5 100644 --- a/src/prefs/ModulePrefs.h +++ b/src/prefs/ModulePrefs.h @@ -17,11 +17,11 @@ #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" +class ShuttleGui; + enum { kModuleDisabled = 0, kModuleEnabled = 1, diff --git a/src/prefs/MousePrefs.h b/src/prefs/MousePrefs.h index e4efb35ed..33f5254ea 100644 --- a/src/prefs/MousePrefs.h +++ b/src/prefs/MousePrefs.h @@ -15,11 +15,11 @@ #include #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class MousePrefs:public PrefsPanel +class ShuttleGui; + +class MousePrefs :public PrefsPanel { public: MousePrefs(wxWindow * parent); diff --git a/src/prefs/PlaybackPrefs.h b/src/prefs/PlaybackPrefs.h index ecb966617..8384fb584 100644 --- a/src/prefs/PlaybackPrefs.h +++ b/src/prefs/PlaybackPrefs.h @@ -16,11 +16,11 @@ #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class PlaybackPrefs:public PrefsPanel +class ShuttleGui; + +class PlaybackPrefs :public PrefsPanel { public: PlaybackPrefs(wxWindow * parent); diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp index c842eda5d..91f18bc65 100644 --- a/src/prefs/PrefsDialog.cpp +++ b/src/prefs/PrefsDialog.cpp @@ -39,6 +39,7 @@ #include "../Experimental.h" #include "../Project.h" #include "../Prefs.h" +#include "../ShuttleGui.h" #include "PrefsDialog.h" #include "PrefsPanel.h" diff --git a/src/prefs/ProjectsPrefs.h b/src/prefs/ProjectsPrefs.h index 065dab57c..3f1a00791 100644 --- a/src/prefs/ProjectsPrefs.h +++ b/src/prefs/ProjectsPrefs.h @@ -17,11 +17,11 @@ #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class ProjectsPrefs:public PrefsPanel +class ShuttleGui; + +class ProjectsPrefs :public PrefsPanel { public: ProjectsPrefs(wxWindow * parent); diff --git a/src/prefs/QualityPrefs.h b/src/prefs/QualityPrefs.h index 4cfd924c1..726da2490 100644 --- a/src/prefs/QualityPrefs.h +++ b/src/prefs/QualityPrefs.h @@ -19,11 +19,11 @@ #include #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class QualityPrefs:public PrefsPanel +class ShuttleGui; + +class QualityPrefs :public PrefsPanel { public: QualityPrefs(wxWindow * parent); diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h index dc2533c8b..d4f1dd122 100644 --- a/src/prefs/RecordingPrefs.h +++ b/src/prefs/RecordingPrefs.h @@ -16,11 +16,11 @@ #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class RecordingPrefs:public PrefsPanel +class ShuttleGui; + +class RecordingPrefs :public PrefsPanel { public: RecordingPrefs(wxWindow * parent); diff --git a/src/prefs/SpectrumPrefs.h b/src/prefs/SpectrumPrefs.h index 2fb9c8fa8..20a1e7385 100644 --- a/src/prefs/SpectrumPrefs.h +++ b/src/prefs/SpectrumPrefs.h @@ -26,11 +26,12 @@ #include #include "../Experimental.h" -#include "../ShuttleGui.h" #include "PrefsPanel.h" +class wxTextCtrl; struct FFTParam; +class ShuttleGui; class SpectrumPrefs:public PrefsPanel { diff --git a/src/prefs/ThemePrefs.h b/src/prefs/ThemePrefs.h index 168ce9d0b..40d080c8c 100644 --- a/src/prefs/ThemePrefs.h +++ b/src/prefs/ThemePrefs.h @@ -17,11 +17,11 @@ #include #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class ThemePrefs:public PrefsPanel +class ShuttleGui; + +class ThemePrefs :public PrefsPanel { public: ThemePrefs(wxWindow * parent); diff --git a/src/prefs/TracksPrefs.h b/src/prefs/TracksPrefs.h index 649537767..aa0f54272 100644 --- a/src/prefs/TracksPrefs.h +++ b/src/prefs/TracksPrefs.h @@ -18,11 +18,11 @@ #include #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class TracksPrefs:public PrefsPanel +class ShuttleGui; + +class TracksPrefs :public PrefsPanel { public: TracksPrefs(wxWindow * parent); diff --git a/src/prefs/WarningsPrefs.h b/src/prefs/WarningsPrefs.h index f8d198838..8f789e163 100644 --- a/src/prefs/WarningsPrefs.h +++ b/src/prefs/WarningsPrefs.h @@ -17,11 +17,11 @@ #include -#include "../ShuttleGui.h" - #include "PrefsPanel.h" -class WarningsPrefs:public PrefsPanel +class ShuttleGui; + +class WarningsPrefs :public PrefsPanel { public: WarningsPrefs(wxWindow * parent); diff --git a/src/toolbars/DeviceToolBar.cpp b/src/toolbars/DeviceToolBar.cpp index f7a48b35e..ab5862f84 100644 --- a/src/toolbars/DeviceToolBar.cpp +++ b/src/toolbars/DeviceToolBar.cpp @@ -15,6 +15,7 @@ #include "../Audacity.h" +#include "DeviceToolBar.h" // For compilers that support precompilation, includes "wx/wx.h". #include @@ -31,7 +32,6 @@ #include "../AudacityApp.h" -#include "DeviceToolBar.h" #include "ToolDock.h" #include "../TrackPanel.h" @@ -41,6 +41,7 @@ #include "../ImageManipulation.h" #include "../Prefs.h" #include "../Project.h" +#include "../ShuttleGui.h" #include "../Theme.h" #include "../widgets/Grabber.h" #include "../DeviceManager.h" diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index eb43dd175..fabc0cba8 100644 --- a/src/widgets/Meter.cpp +++ b/src/widgets/Meter.cpp @@ -39,6 +39,7 @@ *//******************************************************************/ #include "../Audacity.h" +#include "Meter.h" #include "../AudacityApp.h" #include @@ -57,8 +58,6 @@ #include -#include "Meter.h" - #include "../AudioIO.h" #include "../AColor.h" #include "../ImageManipulation.h" @@ -66,6 +65,7 @@ #include "../toolbars/MeterToolBar.h" #include "../toolbars/ControlToolBar.h" #include "../Prefs.h" +#include "../ShuttleGui.h" #include "../Theme.h" #include "../AllThemeResources.h"