From f6adeed47b8b5b7d1f3fc64d59d56819e4619151 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 15 May 2019 14:05:19 -0400 Subject: [PATCH] Remove some unnecessary #include directives --- src/AudacityApp.cpp | 1 - src/AutoRecovery.cpp | 1 + src/BatchProcessDialog.cpp | 1 - src/BlockFile.cpp | 1 + src/BlockFile.h | 4 +--- src/Envelope.cpp | 2 -- src/LabelTrack.cpp | 1 - src/Mix.cpp | 2 -- src/MixerBoard.cpp | 2 -- src/Registrar.h | 1 + src/Theme.cpp | 1 - src/TimerRecordDialog.cpp | 1 - src/WaveClip.cpp | 1 - src/blockfile/LegacyAliasBlockFile.cpp | 2 ++ src/blockfile/LegacyBlockFile.cpp | 2 ++ src/blockfile/ODDecodeBlockFile.cpp | 1 + src/blockfile/ODDecodeBlockFile.h | 1 - src/blockfile/ODPCMAliasBlockFile.cpp | 1 + src/blockfile/ODPCMAliasBlockFile.h | 1 - src/blockfile/PCMAliasBlockFile.cpp | 5 +---- src/blockfile/PCMAliasBlockFile.h | 3 ++- src/blockfile/SilentBlockFile.cpp | 2 ++ src/blockfile/SilentBlockFile.h | 3 ++- src/blockfile/SimpleBlockFile.cpp | 1 + src/blockfile/SimpleBlockFile.h | 4 ++-- src/commands/AudacityCommand.cpp | 16 ++-------------- src/commands/AudacityCommand.h | 10 +++++----- src/commands/OpenSaveCommands.cpp | 1 - src/commands/SelectCommand.cpp | 1 + src/commands/SetClipCommand.cpp | 4 +--- src/commands/SetEnvelopeCommand.cpp | 4 +--- src/export/ExportMP3.cpp | 1 - src/ondemand/ODComputeSummaryTask.h | 1 + src/ondemand/ODDecodeFlacTask.h | 1 + src/ondemand/ODDecodeTask.h | 1 + src/ondemand/ODTask.h | 1 + src/prefs/BatchPrefs.cpp | 3 --- src/prefs/EffectsPrefs.cpp | 1 - src/prefs/ExtImportPrefs.cpp | 1 + src/prefs/ExtImportPrefs.h | 2 +- src/prefs/MidiIOPrefs.cpp | 4 ++-- src/prefs/TracksPrefs.cpp | 1 - src/toolbars/ScrubbingToolBar.cpp | 1 - src/widgets/ErrorDialog.cpp | 1 - src/widgets/HelpSystem.cpp | 3 +-- src/widgets/LinkingHtmlWindow.cpp | 1 - src/widgets/MultiDialog.cpp | 2 +- 47 files changed, 40 insertions(+), 66 deletions(-) diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index 2169cae1b..ee732c880 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -77,7 +77,6 @@ It handles initialization and termination by subclassing wxApp. #include "DirManager.h" #include "commands/CommandHandler.h" #include "commands/AppCommandEvent.h" -#include "commands/CommandContext.h" #include "effects/Contrast.h" #include "widgets/ASlider.h" #include "FFmpeg.h" diff --git a/src/AutoRecovery.cpp b/src/AutoRecovery.cpp index 3db347b37..2980c8961 100644 --- a/src/AutoRecovery.cpp +++ b/src/AutoRecovery.cpp @@ -20,6 +20,7 @@ text or binary format to a file. #include "Audacity.h" #include "AutoRecovery.h" +#include "DirManager.h" #include "FileNames.h" #include "blockfile/SimpleBlockFile.h" #include "Project.h" diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp index 0fb0e6eea..bf51824d8 100644 --- a/src/BatchProcessDialog.cpp +++ b/src/BatchProcessDialog.cpp @@ -45,7 +45,6 @@ #include "Project.h" #include "Internat.h" #include "commands/CommandManager.h" -#include "commands/CommandContext.h" #include "effects/Effect.h" #include "../images/Arrow.xpm" #include "../images/Empty9x16.xpm" diff --git a/src/BlockFile.cpp b/src/BlockFile.cpp index ee423eff1..a04b0c18d 100644 --- a/src/BlockFile.cpp +++ b/src/BlockFile.cpp @@ -53,6 +53,7 @@ out. #include "Internat.h" #include "MemoryX.h" #include "sndfile.h" +#include "FileException.h" #include "FileFormats.h" #include "AudacityApp.h" diff --git a/src/BlockFile.h b/src/BlockFile.h index 494bbb200..ad5d30b31 100644 --- a/src/BlockFile.h +++ b/src/BlockFile.h @@ -14,15 +14,13 @@ #include "MemoryX.h" -#include "xml/XMLTagHandler.h" -#include "xml/XMLWriter.h" - #include "SampleFormat.h" #include "wxFileNameWrapper.h" // member variable #include "ondemand/ODTaskThread.h" +class XMLWriter; class SummaryInfo { public: diff --git a/src/Envelope.cpp b/src/Envelope.cpp index 5f1aa6cd3..72643c74c 100644 --- a/src/Envelope.cpp +++ b/src/Envelope.cpp @@ -43,7 +43,6 @@ a draggable point type. #include #include "AColor.h" -#include "DirManager.h" #include "TrackArtist.h" static const double VALUE_TOLERANCE = 0.001; @@ -318,7 +317,6 @@ static void DrawPoint(wxDC & dc, const wxRect & r, int x, int y, bool top) } #include "TrackPanelDrawingContext.h" -#include "tracks/ui/EnvelopeHandle.h" /// TODO: This should probably move to track artist. void Envelope::DrawPoints diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp index 84c2c4b9c..9803974c2 100644 --- a/src/LabelTrack.cpp +++ b/src/LabelTrack.cpp @@ -59,7 +59,6 @@ for drawing different aspects of the label and its text box. #include "AudioIO.h" #include "DirManager.h" #include "Internat.h" -#include "Menus.h" #include "Prefs.h" #include "RefreshCode.h" #include "Theme.h" diff --git a/src/Mix.cpp b/src/Mix.cpp index 0519fdce6..89a9aadd0 100644 --- a/src/Mix.cpp +++ b/src/Mix.cpp @@ -32,10 +32,8 @@ #include #include "WaveTrack.h" -#include "DirManager.h" #include "Internat.h" #include "Prefs.h" -#include "Project.h" #include "Resample.h" #include "TimeTrack.h" #include "float_cast.h" diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp index 050af9577..10b9ea10d 100644 --- a/src/MixerBoard.cpp +++ b/src/MixerBoard.cpp @@ -14,8 +14,6 @@ #include "Experimental.h" -#include "Menus.h" - #include #include diff --git a/src/Registrar.h b/src/Registrar.h index ca2694f74..10c354d3e 100644 --- a/src/Registrar.h +++ b/src/Registrar.h @@ -24,6 +24,7 @@ responsible for calling the appropriate callback functions. #include "MemoryX.h" +class AudacityCommand; class LoadableModule; class ComponentInterface; class Effect; diff --git a/src/Theme.cpp b/src/Theme.cpp index 8e3bac422..a16fcb034 100644 --- a/src/Theme.cpp +++ b/src/Theme.cpp @@ -75,7 +75,6 @@ can't be. #include "Project.h" #include "toolbars/ToolBar.h" #include "toolbars/ToolManager.h" -#include "ImageManipulation.h" #include "AllThemeResources.h" // can remove this later, only needed for 'XPMS_RETIRED'. #include "FileNames.h" #include "Prefs.h" diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index 2fe6d89ce..834f13047 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -52,7 +52,6 @@ #include "widgets/HelpSystem.h" #include "widgets/ErrorDialog.h" #include "widgets/ProgressDialog.h" -#include "commands/CommandContext.h" #if wxUSE_ACCESSIBILITY #include "widgets/WindowAccessible.h" diff --git a/src/WaveClip.cpp b/src/WaveClip.cpp index 192423541..de96c02a0 100644 --- a/src/WaveClip.cpp +++ b/src/WaveClip.cpp @@ -34,7 +34,6 @@ #include "Prefs.h" #include "Envelope.h" #include "Resample.h" -#include "Project.h" #include "WaveTrack.h" #include "FFT.h" #include "Profiler.h" diff --git a/src/blockfile/LegacyAliasBlockFile.cpp b/src/blockfile/LegacyAliasBlockFile.cpp index af5cd45dc..dad98a0cb 100644 --- a/src/blockfile/LegacyAliasBlockFile.cpp +++ b/src/blockfile/LegacyAliasBlockFile.cpp @@ -19,6 +19,8 @@ #include "LegacyBlockFile.h" #include "../FileFormats.h" #include "../Internat.h" +#include "../xml/XMLTagHandler.h" +#include "../xml/XMLWriter.h" LegacyAliasBlockFile::LegacyAliasBlockFile(wxFileNameWrapper &&fileName, wxFileNameWrapper &&aliasedFileName, diff --git a/src/blockfile/LegacyBlockFile.cpp b/src/blockfile/LegacyBlockFile.cpp index 73ddb95c5..29f75e6ae 100644 --- a/src/blockfile/LegacyBlockFile.cpp +++ b/src/blockfile/LegacyBlockFile.cpp @@ -33,6 +33,8 @@ #include "../MemoryX.h" #include "../FileFormats.h" #include "../Internat.h" +#include "../xml/XMLTagHandler.h" +#include "../xml/XMLWriter.h" #include "sndfile.h" diff --git a/src/blockfile/ODDecodeBlockFile.cpp b/src/blockfile/ODDecodeBlockFile.cpp index e1d1de75e..7ec481601 100644 --- a/src/blockfile/ODDecodeBlockFile.cpp +++ b/src/blockfile/ODDecodeBlockFile.cpp @@ -27,6 +27,7 @@ The summary is eventually computed and written to a file in a background thread. #include #include +#include "../DirManager.h" #include "../FileException.h" #include "../FileFormats.h" #include "../Internat.h" diff --git a/src/blockfile/ODDecodeBlockFile.h b/src/blockfile/ODDecodeBlockFile.h index fd8840370..c0dbaa985 100644 --- a/src/blockfile/ODDecodeBlockFile.h +++ b/src/blockfile/ODDecodeBlockFile.h @@ -30,7 +30,6 @@ Also, see ODPCMAliasBlockFile for a similar file. #include "SimpleBlockFile.h" #include "../BlockFile.h" #include "../ondemand/ODTaskThread.h" -#include "../DirManager.h" #include "../ondemand/ODDecodeTask.h" #include // member variable diff --git a/src/blockfile/ODPCMAliasBlockFile.cpp b/src/blockfile/ODPCMAliasBlockFile.cpp index 795b3577f..f374710a0 100644 --- a/src/blockfile/ODPCMAliasBlockFile.cpp +++ b/src/blockfile/ODPCMAliasBlockFile.cpp @@ -30,6 +30,7 @@ The summary is eventually computed and written to a file in a background thread. #include "../AudacityApp.h" #include "PCMAliasBlockFile.h" +#include "../DirManager.h" #include "../FileFormats.h" #include "../Internat.h" diff --git a/src/blockfile/ODPCMAliasBlockFile.h b/src/blockfile/ODPCMAliasBlockFile.h index 77c58db39..105866413 100644 --- a/src/blockfile/ODPCMAliasBlockFile.h +++ b/src/blockfile/ODPCMAliasBlockFile.h @@ -39,7 +39,6 @@ Some of these methods have been overridden only because they used the unsafe wxL #include "PCMAliasBlockFile.h" #include "../BlockFile.h" #include "../ondemand/ODTaskThread.h" -#include "../DirManager.h" /// An AliasBlockFile that references uncompressed data in an existing file class ODPCMAliasBlockFile final : public PCMAliasBlockFile diff --git a/src/blockfile/PCMAliasBlockFile.cpp b/src/blockfile/PCMAliasBlockFile.cpp index 3fe0937e9..e9fb7e185 100644 --- a/src/blockfile/PCMAliasBlockFile.cpp +++ b/src/blockfile/PCMAliasBlockFile.cpp @@ -23,10 +23,7 @@ #include "../Internat.h" #include "../MemoryX.h" -#include "../ondemand/ODManager.h" -#include "../AudioIO.h" - -extern AudioIO *gAudioIO; +#include "../DirManager.h" PCMAliasBlockFile::PCMAliasBlockFile( wxFileNameWrapper &&fileName, diff --git a/src/blockfile/PCMAliasBlockFile.h b/src/blockfile/PCMAliasBlockFile.h index 369642919..9aa60f84e 100644 --- a/src/blockfile/PCMAliasBlockFile.h +++ b/src/blockfile/PCMAliasBlockFile.h @@ -12,7 +12,8 @@ #define __AUDACITY_PCMALIASBLOCKFILE__ #include "../BlockFile.h" -#include "../DirManager.h" + +class DirManager; /// An AliasBlockFile that references uncompressed data in an existing file class PCMAliasBlockFile /* not final */ : public AliasBlockFile diff --git a/src/blockfile/SilentBlockFile.cpp b/src/blockfile/SilentBlockFile.cpp index 6a52f27d8..237e930fa 100644 --- a/src/blockfile/SilentBlockFile.cpp +++ b/src/blockfile/SilentBlockFile.cpp @@ -12,6 +12,8 @@ #include "SilentBlockFile.h" #include "../FileFormats.h" +#include "../xml/XMLTagHandler.h" +#include "../xml/XMLWriter.h" SilentBlockFile::SilentBlockFile(size_t sampleLen): BlockFile{ wxFileNameWrapper{}, sampleLen } diff --git a/src/blockfile/SilentBlockFile.h b/src/blockfile/SilentBlockFile.h index 9ef760dd9..4ca5cd275 100644 --- a/src/blockfile/SilentBlockFile.h +++ b/src/blockfile/SilentBlockFile.h @@ -15,7 +15,8 @@ #define __AUDACITY_SILENT_BLOCKFILE__ #include "../BlockFile.h" -#include "../DirManager.h" + +class DirManager; /// A BlockFile containing nothing but silence. Saves disk space. class SilentBlockFile final : public BlockFile { diff --git a/src/blockfile/SimpleBlockFile.cpp b/src/blockfile/SimpleBlockFile.cpp index e7e05348f..10f0fefa6 100644 --- a/src/blockfile/SimpleBlockFile.cpp +++ b/src/blockfile/SimpleBlockFile.cpp @@ -66,6 +66,7 @@ to get its definition, rather than rolling our own. #include #include +#include "../DirManager.h" #include "../FileException.h" #include "../Prefs.h" diff --git a/src/blockfile/SimpleBlockFile.h b/src/blockfile/SimpleBlockFile.h index 2c9df311d..505b9f21e 100644 --- a/src/blockfile/SimpleBlockFile.h +++ b/src/blockfile/SimpleBlockFile.h @@ -12,8 +12,8 @@ #define __AUDACITY_SIMPLE_BLOCKFILE__ #include "../BlockFile.h" -#include "../DirManager.h" -#include "../xml/XMLWriter.h" + +class DirManager; struct SimpleBlockFileCache { bool active; diff --git a/src/commands/AudacityCommand.cpp b/src/commands/AudacityCommand.cpp index f5f06a979..c3f3b2c03 100644 --- a/src/commands/AudacityCommand.cpp +++ b/src/commands/AudacityCommand.cpp @@ -22,6 +22,8 @@ ShuttleGui. #include "../Audacity.h" #include "AudacityCommand.h" +#include "CommandContext.h" + #include #include @@ -35,30 +37,16 @@ ShuttleGui. #include "audacity/ConfigInterface.h" -#include "../AudacityException.h" -#include "../AudioIO.h" -#include "../LabelTrack.h" -#include "../Mix.h" -#include "../Prefs.h" #include "../Project.h" #include "../Shuttle.h" #include "../ShuttleGui.h" -#include "../WaveTrack.h" -#include "../widgets/AButton.h" #include "../widgets/ProgressDialog.h" -#include "../ondemand/ODManager.h" #include "../widgets/HelpSystem.h" -#include "../widgets/LinkingHtmlWindow.h" #include "../widgets/ErrorDialog.h" -#include "../FileNames.h" -#include "../widgets/HelpSystem.h" - -#include "../commands/CommandTargets.h" #include "../commands/ScreenshotCommand.h" #include -#include "../commands/CommandContext.h" AudacityCommand::AudacityCommand() { diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h index 0a7f27dac..0199db908 100644 --- a/src/commands/AudacityCommand.h +++ b/src/commands/AudacityCommand.h @@ -18,25 +18,25 @@ #include "../MemoryX.h" #include +#include // to inherit -class wxWindow; +#include "../widgets/wxPanelWrapper.h" // to inherit -#include "../SampleFormat.h" -#include "../SelectedRegion.h" #include "../Internat.h" #include "../include/audacity/ComponentInterface.h" #include "../include/audacity/EffectAutomationParameters.h" // for command automation -#include "../Track.h" -#include "../effects/Effect.h" #include "../Registrar.h" class ShuttleGui; #define BUILTIN_GENERIC_COMMAND_PREFIX wxT("Built-in AudacityCommand: ") +class AudacityCommand; class AudacityProject; class CommandContext; +class EffectUIHostInterface; +class ProgressDialog; class AUDACITY_DLL_API AudacityCommand /* not final */ : public wxEvtHandler, diff --git a/src/commands/OpenSaveCommands.cpp b/src/commands/OpenSaveCommands.cpp index 01aae9b0c..17c9206d0 100644 --- a/src/commands/OpenSaveCommands.cpp +++ b/src/commands/OpenSaveCommands.cpp @@ -17,7 +17,6 @@ #include "../Audacity.h" #include "OpenSaveCommands.h" -#include "../Menus.h" #include "../Project.h" #include "../export/Export.h" #include "../Shuttle.h" diff --git a/src/commands/SelectCommand.cpp b/src/commands/SelectCommand.cpp index 4ede23295..b0f761ede 100644 --- a/src/commands/SelectCommand.cpp +++ b/src/commands/SelectCommand.cpp @@ -40,6 +40,7 @@ explicitly code all three. #include "../TrackPanel.h" #include "../Shuttle.h" #include "../ShuttleGui.h" +#include "../effects/Effect.h" #include "CommandContext.h" diff --git a/src/commands/SetClipCommand.cpp b/src/commands/SetClipCommand.cpp index 2622b9e37..72333d83e 100644 --- a/src/commands/SetClipCommand.cpp +++ b/src/commands/SetClipCommand.cpp @@ -26,7 +26,6 @@ #include "../WaveTrack.h" #include "../Shuttle.h" #include "../ShuttleGui.h" -#include "CommandContext.h" SetClipCommand::SetClipCommand() { @@ -73,9 +72,8 @@ void SetClipCommand::PopulateOrExchange(ShuttleGui & S) S.EndMultiColumn(); } -bool SetClipCommand::ApplyInner( const CommandContext & context, Track * t ) +bool SetClipCommand::ApplyInner( const CommandContext &, Track * t ) { - static_cast(context); // if no 'At' is specified, then any clip in any selected track will be set. t->TypeSwitch([&](WaveTrack *waveTrack) { WaveClipPointers ptrs( waveTrack->SortedClipArray()); diff --git a/src/commands/SetEnvelopeCommand.cpp b/src/commands/SetEnvelopeCommand.cpp index 928be498b..be2a49ef5 100644 --- a/src/commands/SetEnvelopeCommand.cpp +++ b/src/commands/SetEnvelopeCommand.cpp @@ -27,7 +27,6 @@ #include "../Envelope.h" #include "../Shuttle.h" #include "../ShuttleGui.h" -#include "CommandContext.h" SetEnvelopeCommand::SetEnvelopeCommand() { @@ -54,9 +53,8 @@ void SetEnvelopeCommand::PopulateOrExchange(ShuttleGui & S) S.EndMultiColumn(); } -bool SetEnvelopeCommand::ApplyInner( const CommandContext & context, Track * t ) +bool SetEnvelopeCommand::ApplyInner( const CommandContext &, Track * t ) { - static_cast(context); // if no time is specified, then // - delete deletes any envelope in selected tracks. // - value is not set for any clip diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp index 780e91b48..42d5e1903 100644 --- a/src/export/ExportMP3.cpp +++ b/src/export/ExportMP3.cpp @@ -88,7 +88,6 @@ #include "../Project.h" #include "../ShuttleGui.h" #include "../Tags.h" -#include "../Track.h" #include "../widgets/HelpSystem.h" #include "../widgets/LinkingHtmlWindow.h" #include "../widgets/ErrorDialog.h" diff --git a/src/ondemand/ODComputeSummaryTask.h b/src/ondemand/ODComputeSummaryTask.h index 673e3c4f2..9dca4ae55 100644 --- a/src/ondemand/ODComputeSummaryTask.h +++ b/src/ondemand/ODComputeSummaryTask.h @@ -22,6 +22,7 @@ updating the ODPCMAliasBlockFile and the GUI of the newly available data. #include #include "ODTask.h" #include "ODTaskThread.h" +#include "../Internat.h" class ODPCMAliasBlockFile; class WaveTrack; diff --git a/src/ondemand/ODDecodeFlacTask.h b/src/ondemand/ODDecodeFlacTask.h index 7e8dbe18b..e44a02e8b 100644 --- a/src/ondemand/ODDecodeFlacTask.h +++ b/src/ondemand/ODDecodeFlacTask.h @@ -29,6 +29,7 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o #define __AUDACITY_ODDecodeFLACTask__ #include +#include // data member #include "ODDecodeTask.h" #include "ODTaskThread.h" diff --git a/src/ondemand/ODDecodeTask.h b/src/ondemand/ODDecodeTask.h index 136fbf796..dffcf113e 100644 --- a/src/ondemand/ODDecodeTask.h +++ b/src/ondemand/ODDecodeTask.h @@ -32,6 +32,7 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o #include #include "ODTask.h" #include "ODTaskThread.h" +#include "../Internat.h" class ODDecodeBlockFile; class WaveTrack; class ODFileDecoder; diff --git a/src/ondemand/ODTask.h b/src/ondemand/ODTask.h index f50097c38..23801a5ad 100644 --- a/src/ondemand/ODTask.h +++ b/src/ondemand/ODTask.h @@ -28,6 +28,7 @@ in a background thread. #include "../MemoryX.h" #include +#include // to declare custom event type class AudacityProject; class Track; class WaveTrack; diff --git a/src/prefs/BatchPrefs.cpp b/src/prefs/BatchPrefs.cpp index b35010959..a1f4e1f69 100644 --- a/src/prefs/BatchPrefs.cpp +++ b/src/prefs/BatchPrefs.cpp @@ -23,10 +23,7 @@ setting used in debugging batch (aka macros) processing. #include "../Languages.h" #include "../Prefs.h" -#include "../Project.h" -#include "../BatchCommandDialog.h" #include "../ShuttleGui.h" -#include "../toolbars/ToolManager.h" BEGIN_EVENT_TABLE(BatchPrefs, PrefsPanel) END_EVENT_TABLE() diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp index 3b824195f..a5f7721f5 100644 --- a/src/prefs/EffectsPrefs.cpp +++ b/src/prefs/EffectsPrefs.cpp @@ -26,7 +26,6 @@ #include #include "../Languages.h" -#include "../PluginManager.h" #include "../Prefs.h" #include "../ShuttleGui.h" diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp index 16e0e038b..aab12e37f 100644 --- a/src/prefs/ExtImportPrefs.cpp +++ b/src/prefs/ExtImportPrefs.cpp @@ -23,6 +23,7 @@ #include "../Prefs.h" #include "../ShuttleGui.h" +#include "../import/Import.h" #include "../widgets/ErrorDialog.h" #include "../widgets/Grid.h" diff --git a/src/prefs/ExtImportPrefs.h b/src/prefs/ExtImportPrefs.h index d53449c86..5ded7040f 100644 --- a/src/prefs/ExtImportPrefs.h +++ b/src/prefs/ExtImportPrefs.h @@ -16,7 +16,6 @@ #include "PrefsPanel.h" -#include "../import/Import.h" #include "../import/ImportPlugin.h" class wxButton; @@ -24,6 +23,7 @@ class wxGridEvent; class wxGridRangeSelectEvent; class wxListCtrl; class wxListEvent; +class ExtImportItem; class ExtImportPrefs; class Grid; class ShuttleGui; diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index 15ac51ba0..5e2315a2d 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -37,13 +37,13 @@ other settings. #include "../../lib-src/portmidi/pm_common/portmidi.h" -#include "../AudioIO.h" #include "../Internat.h" #include "../Prefs.h" -#include "../Project.h" #include "../ShuttleGui.h" #include "../widgets/ErrorDialog.h" +#define DEFAULT_SYNTH_LATENCY 5 + enum { HostID = 10000, PlayID, diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index 214ee08df..e5e9f7c59 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -27,7 +27,6 @@ #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../WaveTrack.h" #include "../Internat.h" diff --git a/src/toolbars/ScrubbingToolBar.cpp b/src/toolbars/ScrubbingToolBar.cpp index 02bbdcfb0..2029f43eb 100644 --- a/src/toolbars/ScrubbingToolBar.cpp +++ b/src/toolbars/ScrubbingToolBar.cpp @@ -41,7 +41,6 @@ #include "../UndoManager.h" #include "../widgets/AButton.h" #include "../tracks/ui/Scrubbing.h" -#include "../commands/CommandContext.h" IMPLEMENT_CLASS(ScrubbingToolBar, ToolBar); diff --git a/src/widgets/ErrorDialog.cpp b/src/widgets/ErrorDialog.cpp index ba9acaf14..3b421d4e5 100644 --- a/src/widgets/ErrorDialog.cpp +++ b/src/widgets/ErrorDialog.cpp @@ -34,7 +34,6 @@ #include #include "LinkingHtmlWindow.h" -#include "../Theme.h" #include "../AllThemeResources.h" #include "../ShuttleGui.h" #include "../HelpText.h" diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp index a83f0cdbf..8d479aecf 100644 --- a/src/widgets/HelpSystem.cpp +++ b/src/widgets/HelpSystem.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -37,8 +38,6 @@ #include "../Project.h" #include "../Prefs.h" -#include "ErrorDialog.h" - #ifdef USE_ALPHA_MANUAL const wxString HelpSystem::HelpHostname = wxT("alphamanual.audacityteam.org"); const wxString HelpSystem::HelpServerHomeDir = wxT("/man/"); diff --git a/src/widgets/LinkingHtmlWindow.cpp b/src/widgets/LinkingHtmlWindow.cpp index 6349ec126..3ba971636 100644 --- a/src/widgets/LinkingHtmlWindow.cpp +++ b/src/widgets/LinkingHtmlWindow.cpp @@ -29,7 +29,6 @@ #include "../HelpText.h" #include "../FileNames.h" #include "../Prefs.h" -#include "ErrorDialog.h" #include "HelpSystem.h" BEGIN_EVENT_TABLE(BrowserDialog, wxDialogWrapper) diff --git a/src/widgets/MultiDialog.cpp b/src/widgets/MultiDialog.cpp index 629c902fb..587950ef1 100644 --- a/src/widgets/MultiDialog.cpp +++ b/src/widgets/MultiDialog.cpp @@ -35,7 +35,7 @@ for each problem encountered, since there can be many orphans. #include #include "../Menus.h" -#include "../commands/CommandContext.h" +#include "wxPanelWrapper.h" class MultiDialog final : public wxDialogWrapper {