From 6c57948d8f848e7fadc53f5f39f6ae802546545a Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Thu, 16 May 2019 17:17:55 -0400 Subject: [PATCH] Remove unnecessary #include-s from .cpp files... ... Unnecessary because transitively included. But each .cpp file still includes its own .h file near the top to ensure that it compiles indenendently, even if it is reincluded transitively later. --- src/AColor.cpp | 1 - src/AboutDialog.cpp | 2 -- src/AudacityApp.cpp | 4 ---- src/AudacityLogger.cpp | 1 - src/AudioIO.cpp | 1 - src/BatchCommandDialog.cpp | 2 -- src/BatchCommands.cpp | 4 ---- src/BatchProcessDialog.cpp | 5 ----- src/BlockFile.cpp | 2 -- src/CellularPanel.cpp | 1 - src/CrossFade.cpp | 3 --- src/Dependencies.cpp | 1 - src/DirManager.cpp | 10 ---------- src/FFT.cpp | 1 - src/FFmpeg.cpp | 1 - src/FileException.cpp | 1 - src/FileFormats.cpp | 3 --- src/FreqWindow.cpp | 2 -- src/HelpText.cpp | 1 - src/HistoryWindow.cpp | 1 - src/ImageManipulation.cpp | 1 - src/InconsistencyException.cpp | 2 -- src/InterpolateAudio.cpp | 1 - src/LabelDialog.cpp | 3 --- src/LabelTrack.cpp | 2 -- src/LangChoice.cpp | 2 -- src/Legacy.cpp | 1 - src/Lyrics.cpp | 1 - src/Menus.cpp | 1 - src/Mix.cpp | 1 - src/MixerBoard.cpp | 1 - src/ModuleManager.cpp | 1 - src/NoteTrack.cpp | 2 -- src/Prefs.cpp | 1 - src/Printing.cpp | 1 - src/Project.cpp | 13 ------------- src/SampleFormat.cpp | 1 - src/Screenshot.cpp | 1 - src/SelectedRegion.cpp | 2 -- src/Sequence.cpp | 4 ---- src/ShuttleGui.cpp | 7 +------ src/ShuttlePrefs.cpp | 1 - src/SoundActivatedRecord.cpp | 1 - src/Spectrum.cpp | 2 -- src/SplashDialog.cpp | 2 -- src/Tags.cpp | 1 - src/Theme.cpp | 1 - src/TimeDialog.cpp | 1 - src/TimeTrack.cpp | 2 -- src/TimerRecordDialog.cpp | 1 - src/TrackArtist.cpp | 2 -- src/TrackPanelAx.cpp | 1 - src/TrackPanelResizeHandle.cpp | 3 --- src/UndoManager.cpp | 1 - src/ViewInfo.cpp | 2 -- src/VoiceKey.cpp | 1 - src/WaveClip.cpp | 2 -- src/WaveTrack.cpp | 2 -- src/blockfile/LegacyAliasBlockFile.cpp | 2 -- src/blockfile/LegacyBlockFile.cpp | 3 --- src/blockfile/NotYetAvailableException.cpp | 2 -- src/blockfile/ODDecodeBlockFile.cpp | 2 -- src/blockfile/ODPCMAliasBlockFile.cpp | 2 -- src/blockfile/PCMAliasBlockFile.cpp | 2 -- src/blockfile/SilentBlockFile.cpp | 1 - src/blockfile/SimpleBlockFile.cpp | 3 --- src/commands/Command.cpp | 4 ---- src/commands/CommandBuilder.cpp | 2 -- src/commands/CommandContext.cpp | 5 ----- src/commands/CommandDirectory.cpp | 2 -- src/commands/CommandHandler.cpp | 1 - src/commands/CommandManager.cpp | 5 ----- src/commands/CommandSignature.cpp | 3 --- src/commands/CommandType.cpp | 2 -- src/commands/CompareAudioCommand.cpp | 3 --- src/commands/Demo.cpp | 2 -- src/commands/DragCommand.cpp | 1 - src/commands/GetInfoCommand.cpp | 2 -- src/commands/GetTrackInfoCommand.cpp | 1 - src/commands/ImportExportCommands.cpp | 1 - src/commands/LoadCommands.cpp | 3 --- src/commands/MessageCommand.cpp | 1 - src/commands/ScreenshotCommand.cpp | 3 --- src/commands/ScriptCommandRelay.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/AutoDuck.cpp | 2 -- src/effects/Compressor.cpp | 1 - src/effects/Echo.cpp | 1 - src/effects/Effect.cpp | 2 -- src/effects/EffectManager.cpp | 1 - src/effects/EffectRack.cpp | 2 -- src/effects/Equalization.cpp | 1 - src/effects/Equalization48x.cpp | 2 -- src/effects/FindClipping.cpp | 1 - src/effects/Generator.cpp | 1 - src/effects/LoadEffects.cpp | 2 -- src/effects/Normalize.cpp | 1 - src/effects/SBSMSEffect.cpp | 1 - src/effects/ScienFilter.cpp | 1 - src/effects/SoundTouchEffect.cpp | 1 - src/effects/ToneGen.cpp | 1 - src/effects/VST/VSTEffect.cpp | 5 ----- src/effects/audiounits/AudioUnitEffect.cpp | 2 -- src/effects/ladspa/LadspaEffect.cpp | 3 --- src/effects/lv2/LV2Effect.cpp | 3 --- src/effects/lv2/LoadLV2.cpp | 1 - src/effects/nyquist/Nyquist.cpp | 2 -- src/export/Export.cpp | 1 - src/export/ExportCL.cpp | 3 --- src/export/ExportFFmpeg.cpp | 3 --- src/export/ExportFFmpegDialogs.cpp | 2 -- src/export/ExportFLAC.cpp | 2 -- src/export/ExportMP2.cpp | 2 -- src/export/ExportMP3.cpp | 1 - src/export/ExportMultiple.cpp | 3 --- src/export/ExportOGG.cpp | 2 -- src/export/ExportPCM.cpp | 3 --- src/import/FormatClassifier.cpp | 1 - src/import/Import.cpp | 2 -- src/import/ImportFFmpeg.cpp | 2 -- src/import/ImportFLAC.cpp | 3 --- src/import/ImportGStreamer.cpp | 6 ------ src/import/ImportLOF.cpp | 1 - src/import/ImportMIDI.cpp | 1 - src/import/ImportMP3.cpp | 2 -- src/import/ImportOGG.cpp | 1 - src/import/ImportPCM.cpp | 1 - src/import/ImportQT.cpp | 1 - src/import/ImportRaw.cpp | 3 --- src/import/RawAudioGuess.cpp | 3 --- src/menus/FileMenus.cpp | 1 - src/menus/TransportMenus.cpp | 3 --- src/ondemand/ODComputeSummaryTask.cpp | 1 - src/ondemand/ODManager.cpp | 1 - src/prefs/DevicePrefs.cpp | 1 - src/prefs/DirectoriesPrefs.cpp | 1 - src/prefs/EffectsPrefs.cpp | 2 -- src/prefs/GUIPrefs.cpp | 1 - src/prefs/ImportExportPrefs.cpp | 2 -- src/prefs/KeyConfigPrefs.cpp | 2 -- src/prefs/LibraryPrefs.cpp | 1 - src/prefs/MidiIOPrefs.cpp | 1 - src/prefs/ModulePrefs.cpp | 1 - src/prefs/MousePrefs.cpp | 1 - src/prefs/PlaybackPrefs.cpp | 1 - src/prefs/PrefsDialog.cpp | 2 -- src/prefs/ProjectsPrefs.cpp | 2 -- src/prefs/QualityPrefs.cpp | 2 -- src/prefs/RecordingPrefs.cpp | 2 -- src/prefs/SpectrogramSettings.cpp | 2 -- src/prefs/SpectrumPrefs.cpp | 1 - src/prefs/TracksBehaviorsPrefs.cpp | 1 - src/prefs/TracksPrefs.cpp | 2 -- src/prefs/WarningsPrefs.cpp | 2 -- src/prefs/WaveformSettings.cpp | 1 - src/toolbars/ControlToolBar.cpp | 2 -- src/toolbars/DeviceToolBar.cpp | 1 - src/toolbars/EditToolBar.cpp | 3 --- src/toolbars/MixerToolBar.cpp | 1 - src/toolbars/ScrubbingToolBar.cpp | 3 --- src/toolbars/SelectionBar.cpp | 2 -- src/toolbars/SpectralSelectionBar.cpp | 4 ---- src/toolbars/ToolBar.cpp | 2 -- src/toolbars/ToolDock.cpp | 1 - src/toolbars/ToolManager.cpp | 1 - src/toolbars/ToolsToolBar.cpp | 1 - .../labeltrack/ui/LabelDefaultClickHandle.cpp | 1 - src/tracks/labeltrack/ui/LabelGlyphHandle.cpp | 3 --- src/tracks/labeltrack/ui/LabelTextHandle.cpp | 1 - src/tracks/labeltrack/ui/LabelTrackControls.cpp | 1 - src/tracks/labeltrack/ui/LabelTrackUI.cpp | 1 - .../notetrack/ui/NoteTrackButtonHandle.cpp | 1 - .../notetrack/ui/NoteTrackSliderHandles.cpp | 1 - .../playabletrack/ui/PlayableTrackButtonHandles.cpp | 2 -- .../playabletrack/wavetrack/ui/CutlineHandle.cpp | 3 --- .../playabletrack/wavetrack/ui/SampleHandle.cpp | 2 -- .../wavetrack/ui/WaveTrackControls.cpp | 2 -- .../wavetrack/ui/WaveTrackSliderHandles.cpp | 1 - src/tracks/ui/BackgroundCell.cpp | 1 - src/tracks/ui/ButtonHandle.cpp | 3 --- src/tracks/ui/CommonTrackPanelCell.cpp | 2 -- src/tracks/ui/EditCursorOverlay.cpp | 2 -- src/tracks/ui/EnvelopeHandle.cpp | 3 --- src/tracks/ui/Scrubbing.cpp | 5 ----- src/tracks/ui/SelectHandle.cpp | 5 ----- src/tracks/ui/SliderHandle.cpp | 1 - src/tracks/ui/TrackButtonHandles.cpp | 2 -- src/tracks/ui/TrackControls.cpp | 3 --- src/tracks/ui/TrackSelectHandle.cpp | 2 -- src/tracks/ui/TrackVRulerControls.cpp | 2 -- src/tracks/ui/ZoomHandle.cpp | 2 -- src/widgets/ASlider.cpp | 1 - src/widgets/ErrorDialog.cpp | 1 - src/widgets/ExpandingToolBar.cpp | 2 -- src/widgets/Grid.cpp | 2 -- src/widgets/HelpSystem.cpp | 1 - src/widgets/KeyView.cpp | 2 -- src/widgets/Meter.cpp | 1 - src/widgets/NumericTextCtrl.cpp | 1 - src/widgets/ProgressDialog.cpp | 2 -- src/widgets/Ruler.cpp | 1 - src/widgets/Warning.cpp | 1 - src/widgets/valnum.cpp | 1 - src/xml/XMLFileReader.cpp | 2 -- src/xml/XMLTagHandler.cpp | 4 ---- src/xml/XMLWriter.cpp | 2 -- 211 files changed, 1 insertion(+), 406 deletions(-) diff --git a/src/AColor.cpp b/src/AColor.cpp index a58ced9d9..b84fe66b4 100644 --- a/src/AColor.cpp +++ b/src/AColor.cpp @@ -30,7 +30,6 @@ It is also a place to document colour usage policy in Audacity #include #include -#include "Theme.h" #include "AllThemeResources.h" void DCUnchanger::operator () (wxDC *pDC) const diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 05290036c..16507e4d9 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -39,11 +39,9 @@ hold information about one contributor to Audacity. #include #include "FileNames.h" -#include "Internat.h" #include "ShuttleGui.h" #include "widgets/LinkingHtmlWindow.h" -#include "Theme.h" #include "AllThemeResources.h" // DA: Logo for About box. diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index 313f5731e..2199f55d1 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -68,7 +68,6 @@ It handles initialization and termination by subclassing wxApp. #include // for wxRegKey #endif -#include "AudacityException.h" #include "AudacityLogger.h" #include "AboutDialog.h" #include "AColor.h" @@ -80,12 +79,10 @@ It handles initialization and termination by subclassing wxApp. #include "effects/Contrast.h" #include "widgets/ASlider.h" #include "FFmpeg.h" -#include "Internat.h" #include "LangChoice.h" #include "Languages.h" #include "Menus.h" #include "PluginManager.h" -#include "Prefs.h" #include "Project.h" #include "Screenshot.h" #include "Sequence.h" @@ -99,7 +96,6 @@ It handles initialization and termination by subclassing wxApp. #include "FFT.h" #include "BlockFile.h" #include "ondemand/ODManager.h" -#include "commands/Keyboard.h" #include "widgets/ErrorDialog.h" #include "prefs/DirectoriesPrefs.h" #include "tracks/ui/Scrubbing.h" diff --git a/src/AudacityLogger.cpp b/src/AudacityLogger.cpp index 40bb51157..d872a0c39 100644 --- a/src/AudacityLogger.cpp +++ b/src/AudacityLogger.cpp @@ -30,7 +30,6 @@ Provides thread-safe logging based on the wxWidgets log facility. #include "../images/AudacityLogoAlpha.xpm" #include "widgets/ErrorDialog.h" -#include "Internat.h" // // AudacityLogger class diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp index 234a83758..c14358052 100644 --- a/src/AudioIO.cpp +++ b/src/AudioIO.cpp @@ -448,7 +448,6 @@ TimeTrack and AudioIOListener and whether the playback is looped. #include #include "AudacityApp.h" -#include "AudacityException.h" #include "Mix.h" #include "Resample.h" #include "RingBuffer.h" diff --git a/src/BatchCommandDialog.cpp b/src/BatchCommandDialog.cpp index 5756c0ec8..071985e08 100644 --- a/src/BatchCommandDialog.cpp +++ b/src/BatchCommandDialog.cpp @@ -42,9 +42,7 @@ selected command. #include "Project.h" -#include "commands/CommandManager.h" #include "effects/EffectManager.h" -#include "BatchCommands.h" #include "ShuttleGui.h" #include "widgets/HelpSystem.h" diff --git a/src/BatchCommands.cpp b/src/BatchCommands.cpp index 433c73414..8733d79e0 100644 --- a/src/BatchCommands.cpp +++ b/src/BatchCommands.cpp @@ -28,7 +28,6 @@ processing. See also MacrosWindow and ApplyMacroDialog. #include "commands/CommandManager.h" #include "effects/EffectManager.h" #include "FileNames.h" -#include "Internat.h" #include "Menus.h" #include "PluginManager.h" #include "Prefs.h" @@ -38,13 +37,10 @@ processing. See also MacrosWindow and ApplyMacroDialog. #include "export/ExportOGG.h" #include "export/ExportPCM.h" -#include "Theme.h" #include "AllThemeResources.h" -#include "Track.h" #include "widgets/ErrorDialog.h" -#include "commands/CommandFunctors.h" #include "commands/CommandContext.h" // KLUDGE: All commands should be on the same footing diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp index bb32987e6..1442137d2 100644 --- a/src/BatchProcessDialog.cpp +++ b/src/BatchProcessDialog.cpp @@ -38,21 +38,16 @@ #include #include -#include "AudacityException.h" #include "ShuttleGui.h" #include "Menus.h" #include "Prefs.h" #include "Project.h" -#include "Internat.h" #include "commands/CommandManager.h" #include "effects/Effect.h" #include "../images/Arrow.xpm" #include "../images/Empty9x16.xpm" -#include "BatchCommands.h" -#include "Track.h" #include "UndoManager.h" -#include "Theme.h" #include "AllThemeResources.h" #include "FileDialog.h" diff --git a/src/BlockFile.cpp b/src/BlockFile.cpp index a04b0c18d..8c1a65974 100644 --- a/src/BlockFile.cpp +++ b/src/BlockFile.cpp @@ -50,8 +50,6 @@ out. #include #include -#include "Internat.h" -#include "MemoryX.h" #include "sndfile.h" #include "FileException.h" #include "FileFormats.h" diff --git a/src/CellularPanel.cpp b/src/CellularPanel.cpp index 5282b4ea7..e023223a7 100644 --- a/src/CellularPanel.cpp +++ b/src/CellularPanel.cpp @@ -33,7 +33,6 @@ #include // for wxUSE_* macros #include "Project.h" #include "UIHandle.h" -#include "TrackPanelCell.h" #include "TrackPanelMouseEvent.h" #include "HitTestResult.h" #include "RefreshCode.h" diff --git a/src/CrossFade.cpp b/src/CrossFade.cpp index dbddd4cf3..d4b5ea14e 100644 --- a/src/CrossFade.cpp +++ b/src/CrossFade.cpp @@ -16,9 +16,6 @@ been abandoned. #include "CrossFade.h" -#include "SampleFormat.h" -#include "WaveClip.h" - #include #include diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp index f05177555..b4952980b 100644 --- a/src/Dependencies.cpp +++ b/src/Dependencies.cpp @@ -51,7 +51,6 @@ AliasedFile s. #include "BlockFile.h" #include "DirManager.h" -#include "Internat.h" #include "Prefs.h" #include "Project.h" #include "Sequence.h" diff --git a/src/DirManager.cpp b/src/DirManager.cpp index 55c883cdb..3eef496a8 100644 --- a/src/DirManager.cpp +++ b/src/DirManager.cpp @@ -64,8 +64,6 @@ #include "Audacity.h" // for __UNIX__ #include "DirManager.h" -#include "MemoryX.h" - #include // to use time() for srand() #include @@ -89,19 +87,13 @@ #endif #include "AudacityApp.h" -#include "AudacityException.h" -#include "BlockFile.h" -#include "FileException.h" #include "FileNames.h" #include "blockfile/LegacyBlockFile.h" #include "blockfile/LegacyAliasBlockFile.h" -#include "blockfile/SimpleBlockFile.h" #include "blockfile/SilentBlockFile.h" -#include "blockfile/PCMAliasBlockFile.h" #include "blockfile/ODPCMAliasBlockFile.h" #include "blockfile/ODDecodeBlockFile.h" #include "InconsistencyException.h" -#include "Internat.h" #include "Project.h" #include "Prefs.h" #include "Sequence.h" @@ -112,8 +104,6 @@ #include "ondemand/ODManager.h" -#include "Track.h" - #if defined(__WXMAC__) #include #include diff --git a/src/FFT.cpp b/src/FFT.cpp index ddd19c89b..6441e31c4 100644 --- a/src/FFT.cpp +++ b/src/FFT.cpp @@ -44,7 +44,6 @@ #include "Internat.h" -#include "MemoryX.h" #include "SampleFormat.h" #include diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index 2af057827..370747cfb 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -21,7 +21,6 @@ License: GPL v2. See License.txt. #include "FFmpeg.h" #include "FileNames.h" -#include "Internat.h" #include "widgets/HelpSystem.h" #include "widgets/ErrorDialog.h" diff --git a/src/FileException.cpp b/src/FileException.cpp index 29545eb9e..05564b77c 100644 --- a/src/FileException.cpp +++ b/src/FileException.cpp @@ -9,7 +9,6 @@ #include "Audacity.h" #include "FileException.h" -#include "Internat.h" #include "Prefs.h" FileException::~FileException() diff --git a/src/FileFormats.cpp b/src/FileFormats.cpp index 94b30ed9f..be5ee4fdc 100644 --- a/src/FileFormats.cpp +++ b/src/FileFormats.cpp @@ -18,7 +18,6 @@ information. #include "Audacity.h" #include "FileFormats.h" -#include "MemoryX.h" #include #include #include "sndfile.h" @@ -28,8 +27,6 @@ information. #error Requires libsndfile 1.0 or higher #endif -#include "Internat.h" - // // enumerating headers // diff --git a/src/FreqWindow.cpp b/src/FreqWindow.cpp index 5e46d0d45..a896ee437 100644 --- a/src/FreqWindow.cpp +++ b/src/FreqWindow.cpp @@ -72,13 +72,11 @@ and in the spectrogram spectral selection. #include "ShuttleGui.h" #include "AColor.h" #include "FFT.h" -#include "Internat.h" #include "PitchName.h" #include "prefs/GUISettings.h" #include "Prefs.h" #include "Project.h" #include "WaveClip.h" -#include "Theme.h" #include "AllThemeResources.h" #include "FileNames.h" diff --git a/src/HelpText.cpp b/src/HelpText.cpp index 1fb8ce34a..684846680 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -23,7 +23,6 @@ #include "FileNames.h" #include "AboutDialog.h" #include "AllThemeResources.h" -#include "Internat.h" wxString HtmlColourOfIndex( int i ){ diff --git a/src/HistoryWindow.cpp b/src/HistoryWindow.cpp index 803c50133..d6c402d6c 100644 --- a/src/HistoryWindow.cpp +++ b/src/HistoryWindow.cpp @@ -39,7 +39,6 @@ undo memory so as to free up space. #include "UndoManager.h" #include "Project.h" #include "ShuttleGui.h" -#include "Track.h" enum { ID_AVAIL = 1000, diff --git a/src/ImageManipulation.cpp b/src/ImageManipulation.cpp index de16896d9..1ec76fbb3 100644 --- a/src/ImageManipulation.cpp +++ b/src/ImageManipulation.cpp @@ -28,7 +28,6 @@ channel. This collection of functions fills that gap. #include #include "AllThemeResources.h" -#include "Theme.h" /// This looks at the first pixel in the image, and shifts /// the entire image by the vector difference between that diff --git a/src/InconsistencyException.cpp b/src/InconsistencyException.cpp index 1a5a3ad0c..856a02c58 100644 --- a/src/InconsistencyException.cpp +++ b/src/InconsistencyException.cpp @@ -9,8 +9,6 @@ #include "Audacity.h" #include "InconsistencyException.h" -#include "Internat.h" - InconsistencyException::~InconsistencyException() { } diff --git a/src/InterpolateAudio.cpp b/src/InterpolateAudio.cpp index 5745c6c98..1c4730bef 100644 --- a/src/InterpolateAudio.cpp +++ b/src/InterpolateAudio.cpp @@ -16,7 +16,6 @@ #include #include "Matrix.h" -#include "SampleFormat.h" static inline int imin(int x, int y) { diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp index 0454affc4..6501c2528 100644 --- a/src/LabelDialog.cpp +++ b/src/LabelDialog.cpp @@ -31,12 +31,9 @@ #include #include "ShuttleGui.h" -#include "Internat.h" #include "LabelTrack.h" #include "Prefs.h" #include "Project.h" -#include "ViewInfo.h" -#include "widgets/NumericTextCtrl.h" #include "widgets/ErrorDialog.h" #include "widgets/Grid.h" #include "widgets/HelpSystem.h" diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp index 9803974c2..f17b93f3d 100644 --- a/src/LabelTrack.cpp +++ b/src/LabelTrack.cpp @@ -58,10 +58,8 @@ for drawing different aspects of the label and its text box. #include "AudioIO.h" #include "DirManager.h" -#include "Internat.h" #include "Prefs.h" #include "RefreshCode.h" -#include "Theme.h" #include "AllThemeResources.h" #include "AColor.h" #include "Project.h" diff --git a/src/LangChoice.cpp b/src/LangChoice.cpp index f388345e8..0330d55b3 100644 --- a/src/LangChoice.cpp +++ b/src/LangChoice.cpp @@ -27,9 +27,7 @@ of languages for Audacity. #include "Languages.h" #include "ShuttleGui.h" -#include "widgets/wxPanelWrapper.h" #include "widgets/ErrorDialog.h" -#include "Internat.h" class LangChoiceDialog final : public wxDialogWrapper { public: diff --git a/src/Legacy.cpp b/src/Legacy.cpp index e0ad9fde0..ddf52c244 100644 --- a/src/Legacy.cpp +++ b/src/Legacy.cpp @@ -40,7 +40,6 @@ On failure the old version is put back in place. #include #include -#include "Internat.h" #include "widgets/ErrorDialog.h" #include "xml/XMLWriter.h" diff --git a/src/Lyrics.cpp b/src/Lyrics.cpp index 7c3a5ebd3..4434e9c36 100644 --- a/src/Lyrics.cpp +++ b/src/Lyrics.cpp @@ -19,7 +19,6 @@ #include #include "AudioIO.h" -#include "Internat.h" #include "Project.h" // for GetActiveProject #include "LabelTrack.h" #include "commands/CommandManager.h" diff --git a/src/Menus.cpp b/src/Menus.cpp index 3cf56c53c..c8b648b31 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -42,7 +42,6 @@ #include "Project.h" #include "TrackPanel.h" #include "UndoManager.h" -#include "WaveTrack.h" #include "commands/CommandManager.h" #include "effects/EffectManager.h" #include "prefs/TracksPrefs.h" diff --git a/src/Mix.cpp b/src/Mix.cpp index 89a9aadd0..c1ce42b2f 100644 --- a/src/Mix.cpp +++ b/src/Mix.cpp @@ -32,7 +32,6 @@ #include #include "WaveTrack.h" -#include "Internat.h" #include "Prefs.h" #include "Resample.h" #include "TimeTrack.h" diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp index 10b9ea10d..947539c6c 100644 --- a/src/MixerBoard.cpp +++ b/src/MixerBoard.cpp @@ -25,7 +25,6 @@ #include #include // for wxSystemSettings::GetColour and wxSystemSettings::GetMetric -#include "Theme.h" #include "AColor.h" #include "AllThemeResources.h" #include "AudioIO.h" diff --git a/src/ModuleManager.cpp b/src/ModuleManager.cpp index e0bbeda29..e21a03caf 100755 --- a/src/ModuleManager.cpp +++ b/src/ModuleManager.cpp @@ -30,7 +30,6 @@ i.e. an alternative to the usual interface, for Audacity. #include "AudacityApp.h" #include "FileNames.h" -#include "Internat.h" #include "PluginManager.h" #include "commands/ScriptCommandRelay.h" diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index a9be052d8..440c1606c 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -32,9 +32,7 @@ #include "AColor.h" #include "DirManager.h" -#include "Internat.h" #include "Prefs.h" -#include "effects/TimeWarper.h" #include "InconsistencyException.h" diff --git a/src/Prefs.cpp b/src/Prefs.cpp index 625c236ca..0b4bad839 100755 --- a/src/Prefs.cpp +++ b/src/Prefs.cpp @@ -65,7 +65,6 @@ #include "Languages.h" #include "widgets/ErrorDialog.h" -#include "Internat.h" std::unique_ptr ugPrefs {}; diff --git a/src/Printing.cpp b/src/Printing.cpp index 5255fdc69..235f3c435 100644 --- a/src/Printing.cpp +++ b/src/Printing.cpp @@ -31,7 +31,6 @@ #include "widgets/ErrorDialog.h" #include "TrackPanelDrawingContext.h" -#include "Internat.h" // Globals, so that we remember settings from session to session wxPrintData &gPrintData() diff --git a/src/Project.cpp b/src/Project.cpp index 0caa4fba7..7469ca484 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -94,7 +94,6 @@ scroll information. It also has some status flags. #endif #include "AdornedRulerPanel.h" -#include "AudacityException.h" #include "FreqWindow.h" #include "effects/Contrast.h" #include "AutoRecovery.h" @@ -107,7 +106,6 @@ scroll information. It also has some status flags. #include "HistoryWindow.h" #include "InconsistencyException.h" #include "MixerBoard.h" -#include "Internat.h" #include "import/Import.h" #include "LabelTrack.h" #include "Legacy.h" @@ -122,30 +120,22 @@ scroll information. It also has some status flags. #include "TimeTrack.h" #include "TrackPanel.h" #include "WaveClip.h" -#include "WaveTrack.h" #include "DirManager.h" -#include "commands/CommandManager.h" -#include "effects/Effect.h" #include "prefs/PrefsDialog.h" #include "widgets/LinkingHtmlWindow.h" -#include "widgets/ASlider.h" #include "widgets/ErrorDialog.h" #include "widgets/Warning.h" #include "xml/XMLFileReader.h" #include "PlatformCompatibility.h" #include "effects/EffectManager.h" -#include "export/Export.h" #include "FileNames.h" -#include "BlockFile.h" #include "ondemand/ODManager.h" -#include "ondemand/ODTask.h" #include "ondemand/ODComputeSummaryTask.h" #ifdef EXPERIMENTAL_OD_FLAC #include "ondemand/ODDecodeFlacTask.h" #endif #include "ModuleManager.h" -#include "Theme.h" #include "AllThemeResources.h" #include "FileDialog.h" @@ -169,9 +159,7 @@ scroll information. It also has some status flags. #include "commands/ScriptCommandRelay.h" #include "commands/CommandTargets.h" -#include "commands/Command.h" #include "commands/CommandType.h" -#include "commands/CommandContext.h" #include "prefs/QualityPrefs.h" #include "prefs/TracksPrefs.h" @@ -207,7 +195,6 @@ const int sbarSpaceWidth = 15; const int sbarControlWidth = 15; const int sbarExtraLen = 0; const int sbarHjump = 30; //STM: This is how far the thumb jumps when the l/r buttons are pressed, or auto-scrolling occurs -- in pixels -#include "Theme.h" #include "AllThemeResources.h" #endif diff --git a/src/SampleFormat.cpp b/src/SampleFormat.cpp index c7b2620c0..3d623147b 100644 --- a/src/SampleFormat.cpp +++ b/src/SampleFormat.cpp @@ -44,7 +44,6 @@ #include "Prefs.h" #include "Dither.h" -#include "Internat.h" #include "prefs/QualityPrefs.h" static DitherType gLowQualityDither = DitherType::none; diff --git a/src/Screenshot.cpp b/src/Screenshot.cpp index a23bdc123..3af7c82da 100644 --- a/src/Screenshot.cpp +++ b/src/Screenshot.cpp @@ -17,7 +17,6 @@ It forwards the actual work of doing the commands to the ScreenshotCommand. ***********************************************************************/ #include "Screenshot.h" -#include "MemoryX.h" #include "commands/ScreenshotCommand.h" #include "commands/CommandTargets.h" #include "commands/CommandContext.h" diff --git a/src/SelectedRegion.cpp b/src/SelectedRegion.cpp index fb3a92c95..464b8dcaf 100644 --- a/src/SelectedRegion.cpp +++ b/src/SelectedRegion.cpp @@ -12,8 +12,6 @@ Paul Licameli #include "Experimental.h" -#include "Internat.h" - #include "xml/XMLWriter.h" const wxChar *SelectedRegion::sDefaultT0Name = wxT("selStart"); diff --git a/src/Sequence.cpp b/src/Sequence.cpp index 9f51c65bd..c5936bee7 100644 --- a/src/Sequence.cpp +++ b/src/Sequence.cpp @@ -40,13 +40,9 @@ #include #include -#include "AudacityException.h" - -#include "BlockFile.h" #include "blockfile/ODDecodeBlockFile.h" #include "DirManager.h" -#include "blockfile/SimpleBlockFile.h" #include "blockfile/SilentBlockFile.h" #include "InconsistencyException.h" diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp index b002f0112..5c1f2edd6 100644 --- a/src/ShuttleGui.cpp +++ b/src/ShuttleGui.cpp @@ -99,9 +99,8 @@ for registering for changes. #include "Experimental.h" #include "Prefs.h" -#include "Shuttle.h" +#include "ShuttlePrefs.h" -#include "MemoryX.h" #include // for wxUSE_* macros #include #include @@ -113,8 +112,6 @@ for registering for changes. #include #include #include "../include/audacity/ComponentInterface.h" -#include "Internat.h" -#include "WrappedType.h" #include "widgets/wxPanelWrapper.h" #include "AllThemeResources.h" @@ -2127,9 +2124,7 @@ void SetIfCreated( wxStaticText *&Var, wxStaticText * Val ) // two files at some later date. #include "../extnpanel-src/GuiWaveTrack.h" #endif -#include "./widgets/Ruler.h" #include "./widgets/AttachableScrollBar.h" -#include "ShuttlePrefs.h" ShuttleGui::ShuttleGui(wxWindow * pParent, teShuttleMode ShuttleMode) : ShuttleGuiBase( pParent, ShuttleMode ) diff --git a/src/ShuttlePrefs.cpp b/src/ShuttlePrefs.cpp index 6360c33cf..fb621b4a0 100644 --- a/src/ShuttlePrefs.cpp +++ b/src/ShuttlePrefs.cpp @@ -30,7 +30,6 @@ #include #include "Project.h" -#include "Shuttle.h" #include "WrappedType.h" #include "Prefs.h" diff --git a/src/SoundActivatedRecord.cpp b/src/SoundActivatedRecord.cpp index fdb7c80e6..5b3a88054 100644 --- a/src/SoundActivatedRecord.cpp +++ b/src/SoundActivatedRecord.cpp @@ -24,7 +24,6 @@ #include "ShuttleGui.h" #include "Prefs.h" #include "prefs/GUISettings.h" -#include "Internat.h" BEGIN_EVENT_TABLE(SoundActivatedRecord, wxDialogWrapper) EVT_BUTTON(wxID_OK, SoundActivatedRecord::OnOK) diff --git a/src/Spectrum.cpp b/src/Spectrum.cpp index b2bed7b09..6013fa7f2 100644 --- a/src/Spectrum.cpp +++ b/src/Spectrum.cpp @@ -17,8 +17,6 @@ #include -#include "FFT.h" - #include "SampleFormat.h" bool ComputeSpectrum(const float * data, size_t width, diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp index 1c3babd3d..857245371 100644 --- a/src/SplashDialog.cpp +++ b/src/SplashDialog.cpp @@ -35,12 +35,10 @@ most commonly asked questions about Audacity. #include #include "FileNames.h" -#include "Internat.h" #include "ShuttleGui.h" #include "widgets/ErrorDialog.h" #include "widgets/LinkingHtmlWindow.h" -#include "Theme.h" #include "AllThemeResources.h" #include "Prefs.h" #include "HelpText.h" diff --git a/src/Tags.cpp b/src/Tags.cpp index c27dedbb0..5eba75489 100644 --- a/src/Tags.cpp +++ b/src/Tags.cpp @@ -44,7 +44,6 @@ #endif #include "FileNames.h" -#include "Internat.h" #include "Prefs.h" #include "ShuttleGui.h" #include "TranslatableStringArray.h" diff --git a/src/Theme.cpp b/src/Theme.cpp index a16fcb034..22b407247 100644 --- a/src/Theme.cpp +++ b/src/Theme.cpp @@ -73,7 +73,6 @@ can't be. #include #include "Project.h" -#include "toolbars/ToolBar.h" #include "toolbars/ToolManager.h" #include "AllThemeResources.h" // can remove this later, only needed for 'XPMS_RETIRED'. #include "FileNames.h" diff --git a/src/TimeDialog.cpp b/src/TimeDialog.cpp index ef857a0c0..10d393cf7 100644 --- a/src/TimeDialog.cpp +++ b/src/TimeDialog.cpp @@ -21,7 +21,6 @@ #include #include -#include "widgets/NumericTextCtrl.h" #include "ShuttleGui.h" BEGIN_EVENT_TABLE(TimeDialog, wxDialogWrapper) diff --git a/src/TimeTrack.cpp b/src/TimeTrack.cpp index 5016ea5f5..b7c8e59c3 100644 --- a/src/TimeTrack.cpp +++ b/src/TimeTrack.cpp @@ -28,8 +28,6 @@ #include "Prefs.h" #include "Project.h" #include "TrackArtist.h" -#include "Internat.h" -#include "ViewInfo.h" #include "AllThemeResources.h" //TODO-MB: are these sensible values? diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index 834f13047..a5bf1425d 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -46,7 +46,6 @@ #include "ShuttleGui.h" #include "Menus.h" #include "Project.h" -#include "Internat.h" #include "Prefs.h" #include "widgets/NumericTextCtrl.h" #include "widgets/HelpSystem.h" diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index 4072c36e5..dc83a769b 100644 --- a/src/TrackArtist.cpp +++ b/src/TrackArtist.cpp @@ -74,7 +74,6 @@ audio tracks. #include "Envelope.h" #include "NumberScale.h" #include "WaveClip.h" -#include "WaveTrack.h" #include "LabelTrack.h" #include "TimeTrack.h" #include "Prefs.h" @@ -86,7 +85,6 @@ audio tracks. #include "TrackPanel.h" #include "ViewInfo.h" #include "widgets/Ruler.h" -#include "Theme.h" #include "AllThemeResources.h" #include "TrackPanelDrawingContext.h" diff --git a/src/TrackPanelAx.cpp b/src/TrackPanelAx.cpp index 3f13efb1f..a27d4cb9d 100644 --- a/src/TrackPanelAx.cpp +++ b/src/TrackPanelAx.cpp @@ -32,7 +32,6 @@ #include "Track.h" #include "TrackPanel.h" -#include "Internat.h" TrackPanelAx::TrackPanelAx( wxWindow *window ) #if wxUSE_ACCESSIBILITY diff --git a/src/TrackPanelResizeHandle.cpp b/src/TrackPanelResizeHandle.cpp index 81bd000ce..f9b1e5fbd 100644 --- a/src/TrackPanelResizeHandle.cpp +++ b/src/TrackPanelResizeHandle.cpp @@ -11,15 +11,12 @@ Paul Licameli split from TrackPanel.cpp #include "Audacity.h" #include "TrackPanelResizeHandle.h" -#include "MemoryX.h" - #include #include #include "HitTestResult.h" #include "Project.h" #include "RefreshCode.h" -#include "Track.h" #include "TrackPanelMouseEvent.h" #include "tracks/ui/TrackControls.h" diff --git a/src/UndoManager.cpp b/src/UndoManager.cpp index 379ee8aaa..91d9d39e1 100644 --- a/src/UndoManager.cpp +++ b/src/UndoManager.cpp @@ -27,7 +27,6 @@ UndoManager #include "BlockFile.h" #include "Diags.h" -#include "Internat.h" #include "Project.h" #include "Sequence.h" #include "WaveClip.h" diff --git a/src/ViewInfo.cpp b/src/ViewInfo.cpp index a941b16f6..63aef1439 100644 --- a/src/ViewInfo.cpp +++ b/src/ViewInfo.cpp @@ -15,11 +15,9 @@ Paul Licameli #include #include "AudioIO.h" -#include "Internat.h" #include "Project.h" #include "prefs/GUISettings.h" #include "Prefs.h" -#include "xml/XMLWriter.h" #include "prefs/TracksBehaviorsPrefs.h" namespace { diff --git a/src/VoiceKey.cpp b/src/VoiceKey.cpp index 41703c5b1..39f03f4d3 100644 --- a/src/VoiceKey.cpp +++ b/src/VoiceKey.cpp @@ -32,7 +32,6 @@ or "OFF" point #include "WaveTrack.h" #include "widgets/ErrorDialog.h" -#include "Internat.h" using std::cout; using std::endl; diff --git a/src/WaveClip.cpp b/src/WaveClip.cpp index 7a1665218..ea27a62f3 100644 --- a/src/WaveClip.cpp +++ b/src/WaveClip.cpp @@ -24,7 +24,6 @@ #include "Experimental.h" #include -#include "MemoryX.h" #include #include #include @@ -35,7 +34,6 @@ #include "Envelope.h" #include "Resample.h" #include "WaveTrack.h" -#include "FFT.h" #include "Profiler.h" #include "InconsistencyException.h" #include "UserException.h" diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index 4933ca885..739013647 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -40,7 +40,6 @@ Track classes. #include #include #include -#include "MemoryX.h" #include "float_cast.h" @@ -49,7 +48,6 @@ Track classes. #include "Spectrum.h" #include "Project.h" -#include "Internat.h" #include "AudioIO.h" #include "Prefs.h" diff --git a/src/blockfile/LegacyAliasBlockFile.cpp b/src/blockfile/LegacyAliasBlockFile.cpp index dad98a0cb..b08534895 100644 --- a/src/blockfile/LegacyAliasBlockFile.cpp +++ b/src/blockfile/LegacyAliasBlockFile.cpp @@ -18,9 +18,7 @@ #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 29f75e6ae..489b50d51 100644 --- a/src/blockfile/LegacyBlockFile.cpp +++ b/src/blockfile/LegacyBlockFile.cpp @@ -30,11 +30,8 @@ #include #include -#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/NotYetAvailableException.cpp b/src/blockfile/NotYetAvailableException.cpp index 890bf5560..39c46d22f 100644 --- a/src/blockfile/NotYetAvailableException.cpp +++ b/src/blockfile/NotYetAvailableException.cpp @@ -9,8 +9,6 @@ #include "../Audacity.h" #include "NotYetAvailableException.h" -#include "../Internat.h" - NotYetAvailableException::~NotYetAvailableException() { } diff --git a/src/blockfile/ODDecodeBlockFile.cpp b/src/blockfile/ODDecodeBlockFile.cpp index 7ec481601..48ea2b441 100644 --- a/src/blockfile/ODDecodeBlockFile.cpp +++ b/src/blockfile/ODDecodeBlockFile.cpp @@ -28,9 +28,7 @@ The summary is eventually computed and written to a file in a background thread. #include #include "../DirManager.h" -#include "../FileException.h" #include "../FileFormats.h" -#include "../Internat.h" #include "NotYetAvailableException.h" const int bheaderTagLen = 20; diff --git a/src/blockfile/ODPCMAliasBlockFile.cpp b/src/blockfile/ODPCMAliasBlockFile.cpp index d4724a76c..b0ce135bb 100644 --- a/src/blockfile/ODPCMAliasBlockFile.cpp +++ b/src/blockfile/ODPCMAliasBlockFile.cpp @@ -28,10 +28,8 @@ The summary is eventually computed and written to a file in a background thread. #include #include -#include "PCMAliasBlockFile.h" #include "../DirManager.h" #include "../FileFormats.h" -#include "../Internat.h" #include "../ondemand/ODManager.h" #include "../AudioIO.h" diff --git a/src/blockfile/PCMAliasBlockFile.cpp b/src/blockfile/PCMAliasBlockFile.cpp index e4316e4cd..7761e5429 100644 --- a/src/blockfile/PCMAliasBlockFile.cpp +++ b/src/blockfile/PCMAliasBlockFile.cpp @@ -19,8 +19,6 @@ #include #include "../FileFormats.h" -#include "../Internat.h" -#include "../MemoryX.h" #include "../DirManager.h" diff --git a/src/blockfile/SilentBlockFile.cpp b/src/blockfile/SilentBlockFile.cpp index 237e930fa..df9c721c2 100644 --- a/src/blockfile/SilentBlockFile.cpp +++ b/src/blockfile/SilentBlockFile.cpp @@ -13,7 +13,6 @@ #include "../FileFormats.h" #include "../xml/XMLTagHandler.h" -#include "../xml/XMLWriter.h" SilentBlockFile::SilentBlockFile(size_t sampleLen): BlockFile{ wxFileNameWrapper{}, sampleLen } diff --git a/src/blockfile/SimpleBlockFile.cpp b/src/blockfile/SimpleBlockFile.cpp index 10f0fefa6..9c2b9253c 100644 --- a/src/blockfile/SimpleBlockFile.cpp +++ b/src/blockfile/SimpleBlockFile.cpp @@ -67,14 +67,11 @@ to get its definition, rather than rolling our own. #include #include "../DirManager.h" -#include "../FileException.h" #include "../Prefs.h" #include "../FileFormats.h" #include "sndfile.h" -#include "../Internat.h" -#include "../MemoryX.h" static wxUint32 SwapUintEndianess(wxUint32 in) diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp index d13a06ca6..99724b3cd 100644 --- a/src/commands/Command.cpp +++ b/src/commands/Command.cpp @@ -83,10 +83,6 @@ classes derived from it. #include #include -#include "../AudacityException.h" -#include "Validators.h" -#include "CommandType.h" -#include "CommandMisc.h" #include "CommandBuilder.h" #include "CommandTargets.h" #include "CommandDirectory.h" diff --git a/src/commands/CommandBuilder.cpp b/src/commands/CommandBuilder.cpp index c962a0450..a815fff1e 100644 --- a/src/commands/CommandBuilder.cpp +++ b/src/commands/CommandBuilder.cpp @@ -27,8 +27,6 @@ system by constructing BatchCommandEval objects. #include "CommandDirectory.h" #include "../Shuttle.h" #include "BatchEvalCommand.h" -#include "Command.h" -#include "CommandTargets.h" #include "ScriptCommandRelay.h" #include "CommandContext.h" diff --git a/src/commands/CommandContext.cpp b/src/commands/CommandContext.cpp index b199b4835..ad015b526 100644 --- a/src/commands/CommandContext.cpp +++ b/src/commands/CommandContext.cpp @@ -23,16 +23,11 @@ messaging from a command back to its invoker. #include "../Audacity.h" #include "CommandContext.h" -#include "Command.h" #include #include #include #include -#include "../AudacityException.h" -#include "Validators.h" -#include "CommandType.h" -#include "CommandMisc.h" #include "CommandBuilder.h" #include "CommandTargets.h" #include "CommandDirectory.h" diff --git a/src/commands/CommandDirectory.cpp b/src/commands/CommandDirectory.cpp index 4d484749e..1fb58f6de 100644 --- a/src/commands/CommandDirectory.cpp +++ b/src/commands/CommandDirectory.cpp @@ -17,8 +17,6 @@ functions to look up a command by name. #include "../Audacity.h" #include "CommandDirectory.h" -#include "CommandMisc.h" - #include "HelpCommand.h" #include "MessageCommand.h" #include "BatchEvalCommand.h" diff --git a/src/commands/CommandHandler.cpp b/src/commands/CommandHandler.cpp index 79cfb69f6..0954c4162 100644 --- a/src/commands/CommandHandler.cpp +++ b/src/commands/CommandHandler.cpp @@ -21,7 +21,6 @@ #include #include "../Project.h" -#include "Command.h" #include "AppCommandEvent.h" #include "ScriptCommandRelay.h" #include "../commands/CommandContext.h" diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index a6d39b4ae..a92f84d0d 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -82,7 +82,6 @@ CommandManager. It holds the callback for one command. #include "../AudacityHeaders.h" #include "CommandManager.h" -#include "CommandManagerWindowClasses.h" #include "CommandContext.h" #include @@ -94,12 +93,8 @@ CommandManager. It holds the callback for one command. #include #include -#include "../AudacityException.h" #include "../Menus.h" -#include "../Prefs.h" -#include "../Project.h" -#include "Keyboard.h" #include "../PluginManager.h" #include "../effects/EffectManager.h" #include "../widgets/LinkingHtmlWindow.h" diff --git a/src/commands/CommandSignature.cpp b/src/commands/CommandSignature.cpp index bc9f648b8..455f0d030 100644 --- a/src/commands/CommandSignature.cpp +++ b/src/commands/CommandSignature.cpp @@ -16,9 +16,6 @@ #include "../Audacity.h" #include "CommandSignature.h" -#include "CommandMisc.h" -#include "Validators.h" - CommandSignature::~CommandSignature() { } diff --git a/src/commands/CommandType.cpp b/src/commands/CommandType.cpp index ecde7e510..d97898703 100644 --- a/src/commands/CommandType.cpp +++ b/src/commands/CommandType.cpp @@ -20,8 +20,6 @@ Also acts as a factory. #include "../Audacity.h" #include "CommandType.h" -#include "CommandMisc.h" -#include "CommandSignature.h" #include OldStyleCommandType::OldStyleCommandType() diff --git a/src/commands/CompareAudioCommand.cpp b/src/commands/CompareAudioCommand.cpp index 7134e6454..7d52c1258 100644 --- a/src/commands/CompareAudioCommand.cpp +++ b/src/commands/CompareAudioCommand.cpp @@ -21,10 +21,8 @@ threshold of difference in two selected tracks #include "../Audacity.h" #include "CompareAudioCommand.h" -#include "../MemoryX.h" #include "../Project.h" #include "../WaveTrack.h" -#include "Command.h" #include @@ -34,7 +32,6 @@ threshold of difference in two selected tracks #include "../ShuttleGui.h" #include "../widgets/ErrorDialog.h" #include "../widgets/valnum.h" -#include "../SampleFormat.h" #include "CommandContext.h" extern void RegisterCompareAudio( Registrar & R){ diff --git a/src/commands/Demo.cpp b/src/commands/Demo.cpp index bc05041de..3562c2b1e 100644 --- a/src/commands/Demo.cpp +++ b/src/commands/Demo.cpp @@ -30,8 +30,6 @@ parameters. It is for development purposes. #include "../ShuttleGui.h" #include "../widgets/ErrorDialog.h" #include "../widgets/valnum.h" -#include "../SampleFormat.h" -#include "../commands/Command.h" #include "../commands/CommandContext.h" bool DemoCommand::DefineParams( ShuttleParams & S ){ diff --git a/src/commands/DragCommand.cpp b/src/commands/DragCommand.cpp index f9fffa43c..d8ecb4867 100644 --- a/src/commands/DragCommand.cpp +++ b/src/commands/DragCommand.cpp @@ -20,7 +20,6 @@ #include "DragCommand.h" #include "../Project.h" -#include "../Track.h" #include "../TrackPanel.h" #include "../WaveTrack.h" #include "../Shuttle.h" diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp index cbfd78c1d..1654cf92a 100644 --- a/src/commands/GetInfoCommand.cpp +++ b/src/commands/GetInfoCommand.cpp @@ -27,9 +27,7 @@ This class now lists #include "CommandManager.h" #include "../effects/EffectManager.h" #include "../widgets/Overlay.h" -#include "../widgets/OverlayPanel.h" #include "../TrackPanel.h" -#include "../Track.h" #include "../WaveClip.h" #include "../WaveTrack.h" #include "../LabelTrack.h" diff --git a/src/commands/GetTrackInfoCommand.cpp b/src/commands/GetTrackInfoCommand.cpp index 96b5a802d..aac97816f 100644 --- a/src/commands/GetTrackInfoCommand.cpp +++ b/src/commands/GetTrackInfoCommand.cpp @@ -20,7 +20,6 @@ #include "GetTrackInfoCommand.h" #include "../Project.h" -#include "../Track.h" #include "../TrackPanel.h" #include "../NoteTrack.h" #include "../WaveTrack.h" diff --git a/src/commands/ImportExportCommands.cpp b/src/commands/ImportExportCommands.cpp index 137b713bb..809c63558 100644 --- a/src/commands/ImportExportCommands.cpp +++ b/src/commands/ImportExportCommands.cpp @@ -18,7 +18,6 @@ #include "ImportExportCommands.h" #include "../Project.h" -#include "../Track.h" #include "../export/Export.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/commands/LoadCommands.cpp b/src/commands/LoadCommands.cpp index b4f237eda..cc3d6f0c7 100644 --- a/src/commands/LoadCommands.cpp +++ b/src/commands/LoadCommands.cpp @@ -18,14 +18,11 @@ modelled on BuiltinEffectsModule #include "../Prefs.h" -#include "../MemoryX.h" - #include "../effects/EffectManager.h" #include "Demo.h" #include "../commands/MessageCommand.h" #include "../commands/ScreenshotCommand.h" #include "../commands/CompareAudioCommand.h" -#include "../commands/SetTrackInfoCommand.h" #include "../commands/GetTrackInfoCommand.h" #include "../commands/SelectCommand.h" #include "../commands/PreferenceCommands.h" diff --git a/src/commands/MessageCommand.cpp b/src/commands/MessageCommand.cpp index a219c8866..915ce6734 100644 --- a/src/commands/MessageCommand.cpp +++ b/src/commands/MessageCommand.cpp @@ -16,7 +16,6 @@ #include "../Audacity.h" #include "MessageCommand.h" -#include "CommandType.h" #include "CommandContext.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp index 1073859d7..bb9872599 100644 --- a/src/commands/ScreenshotCommand.cpp +++ b/src/commands/ScreenshotCommand.cpp @@ -20,7 +20,6 @@ small calculations of rectangles. #include "../Audacity.h" #include "ScreenshotCommand.h" -#include "CommandTargets.h" #include "../Project.h" #include #include @@ -31,10 +30,8 @@ small calculations of rectangles. #include #include "../AdornedRulerPanel.h" -#include "../Track.h" #include "../TrackPanel.h" #include "../toolbars/ToolManager.h" -#include "../toolbars/ToolBar.h" #include "../Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/commands/ScriptCommandRelay.cpp b/src/commands/ScriptCommandRelay.cpp index b9585be9d..be3a24e94 100644 --- a/src/commands/ScriptCommandRelay.cpp +++ b/src/commands/ScriptCommandRelay.cpp @@ -24,7 +24,6 @@ code out of ModuleManager. #include "CommandTargets.h" #include "CommandBuilder.h" #include "AppCommandEvent.h" -#include "ResponseQueue.h" #include "../Project.h" #include "../AudacityApp.h" #include diff --git a/src/commands/SelectCommand.cpp b/src/commands/SelectCommand.cpp index b0f761ede..0277300a2 100644 --- a/src/commands/SelectCommand.cpp +++ b/src/commands/SelectCommand.cpp @@ -36,7 +36,6 @@ explicitly code all three. #include #include "../Project.h" -#include "../Track.h" #include "../TrackPanel.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/commands/SetClipCommand.cpp b/src/commands/SetClipCommand.cpp index 72333d83e..2a3881429 100644 --- a/src/commands/SetClipCommand.cpp +++ b/src/commands/SetClipCommand.cpp @@ -20,7 +20,6 @@ #include "SetClipCommand.h" #include "../Project.h" -#include "../Track.h" #include "../TrackPanel.h" #include "../WaveClip.h" #include "../WaveTrack.h" diff --git a/src/commands/SetEnvelopeCommand.cpp b/src/commands/SetEnvelopeCommand.cpp index be2a49ef5..c3defbb4e 100644 --- a/src/commands/SetEnvelopeCommand.cpp +++ b/src/commands/SetEnvelopeCommand.cpp @@ -20,7 +20,6 @@ #include "SetEnvelopeCommand.h" #include "../Project.h" -#include "../Track.h" #include "../TrackPanel.h" #include "../WaveClip.h" #include "../WaveTrack.h" diff --git a/src/commands/SetLabelCommand.cpp b/src/commands/SetLabelCommand.cpp index 41c5e2e98..ab948101f 100644 --- a/src/commands/SetLabelCommand.cpp +++ b/src/commands/SetLabelCommand.cpp @@ -20,7 +20,6 @@ #include "SetLabelCommand.h" #include "../Project.h" -#include "../Track.h" #include "../TrackPanel.h" #include "../WaveTrack.h" #include "../LabelTrack.h" diff --git a/src/commands/SetProjectCommand.cpp b/src/commands/SetProjectCommand.cpp index 796f0a8df..8c6266fb9 100644 --- a/src/commands/SetProjectCommand.cpp +++ b/src/commands/SetProjectCommand.cpp @@ -21,7 +21,6 @@ #include "SetProjectCommand.h" #include "../Project.h" -#include "../Track.h" #include "../TrackPanel.h" #include "../WaveTrack.h" #include "../Shuttle.h" diff --git a/src/commands/SetTrackInfoCommand.cpp b/src/commands/SetTrackInfoCommand.cpp index 7e7b1e42b..e7c690754 100644 --- a/src/commands/SetTrackInfoCommand.cpp +++ b/src/commands/SetTrackInfoCommand.cpp @@ -37,7 +37,6 @@ SetTrackAudioCommand and SetTrackVisualsCommand. #include "SetTrackInfoCommand.h" #include "../Project.h" -#include "../Track.h" #include "../TrackPanel.h" #include "../WaveTrack.h" #include "../prefs/WaveformSettings.h" diff --git a/src/effects/AutoDuck.cpp b/src/effects/AutoDuck.cpp index 818af1292..682101baf 100644 --- a/src/effects/AutoDuck.cpp +++ b/src/effects/AutoDuck.cpp @@ -28,11 +28,9 @@ #include "../AColor.h" #include "../AllThemeResources.h" -#include "../Internat.h" #include "../Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" -#include "../Theme.h" #include "../widgets/valnum.h" #include "../WaveTrack.h" diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp index ca80cf53d..382d22b3b 100644 --- a/src/effects/Compressor.cpp +++ b/src/effects/Compressor.cpp @@ -45,7 +45,6 @@ #include "../widgets/Ruler.h" #include "../WaveTrack.h" -#include "../Theme.h" #include "../AllThemeResources.h" enum diff --git a/src/effects/Echo.cpp b/src/effects/Echo.cpp index 930f4d711..473ddedd7 100644 --- a/src/effects/Echo.cpp +++ b/src/effects/Echo.cpp @@ -30,7 +30,6 @@ #include "../Shuttle.h" #include "../widgets/ErrorDialog.h" #include "../widgets/valnum.h" -#include "../SampleFormat.h" // Define keys, defaults, minimums, and maximums for the effect parameters // diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index 0bc3f886f..b20ad3ed9 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -48,7 +48,6 @@ greater use in future. #include "audacity/ConfigInterface.h" #include "EffectManager.h" -#include "../AudacityException.h" #include "../AudioIO.h" #include "../LabelTrack.h" #include "../Menus.h" @@ -71,7 +70,6 @@ greater use in future. #include "../widgets/NumericTextCtrl.h" #include "../widgets/ErrorDialog.h" #include "../FileNames.h" -#include "../commands/AudacityCommand.h" #include "../commands/CommandContext.h" #if defined(__WXMAC__) diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp index 252c4aeda..94039c6f8 100644 --- a/src/effects/EffectManager.cpp +++ b/src/effects/EffectManager.cpp @@ -34,7 +34,6 @@ effects. #endif #include "../Shuttle.h" -#include "../commands/Command.h" #include "../commands/CommandContext.h" #include "../PluginManager.h" diff --git a/src/effects/EffectRack.cpp b/src/effects/EffectRack.cpp index 9a924fa06..2310ea8fb 100644 --- a/src/effects/EffectRack.cpp +++ b/src/effects/EffectRack.cpp @@ -18,7 +18,6 @@ #if defined(EXPERIMENTAL_EFFECTS_RACK) -#include "../MemoryX.h" #include "../UndoManager.h" #include @@ -35,7 +34,6 @@ #include #include -#include "EffectManager.h" #include "../commands/CommandContext.h" #include "../Menus.h" #include "../Prefs.h" diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 1a6e51b44..e8c64b5e5 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -103,7 +103,6 @@ #include "../WaveTrack.h" #include "../widgets/Ruler.h" #include "../xml/XMLFileReader.h" -#include "../Theme.h" #include "../AllThemeResources.h" #include "../float_cast.h" diff --git a/src/effects/Equalization48x.cpp b/src/effects/Equalization48x.cpp index bb4a30de0..f99c1ff58 100644 --- a/src/effects/Equalization48x.cpp +++ b/src/effects/Equalization48x.cpp @@ -19,7 +19,6 @@ #include "../Experimental.h" #ifdef EXPERIMENTAL_EQ_SSE_THREADED -#include "../MemoryX.h" #include "../Project.h" #include "Equalization.h" #include "../WaveTrack.h" @@ -39,7 +38,6 @@ #include -#include "../RealFFTf.h" #include "../RealFFTf48x.h" #ifndef USE_SSE2 diff --git a/src/effects/FindClipping.cpp b/src/effects/FindClipping.cpp index 78636699e..7ee2572b7 100644 --- a/src/effects/FindClipping.cpp +++ b/src/effects/FindClipping.cpp @@ -33,7 +33,6 @@ #include "../LabelTrack.h" #include "../WaveTrack.h" -#include "../MemoryX.h" // Define keys, defaults, minimums, and maximums for the effect parameters // diff --git a/src/effects/Generator.cpp b/src/effects/Generator.cpp index a348b8e2f..09673668c 100644 --- a/src/effects/Generator.cpp +++ b/src/effects/Generator.cpp @@ -22,7 +22,6 @@ #include "TimeWarper.h" -#include "../MemoryX.h" #include "../widgets/ErrorDialog.h" bool Generator::Process() diff --git a/src/effects/LoadEffects.cpp b/src/effects/LoadEffects.cpp index 6594b54d5..2aba7f2af 100644 --- a/src/effects/LoadEffects.cpp +++ b/src/effects/LoadEffects.cpp @@ -18,8 +18,6 @@ #include "../Prefs.h" -#include "../MemoryX.h" - #include "EffectManager.h" #include "Amplify.h" diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp index b28c72125..d1f8e75b5 100644 --- a/src/effects/Normalize.cpp +++ b/src/effects/Normalize.cpp @@ -28,7 +28,6 @@ #include #include -#include "../Internat.h" #include "../Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/effects/SBSMSEffect.cpp b/src/effects/SBSMSEffect.cpp index 277be2bf0..ec89fbc35 100644 --- a/src/effects/SBSMSEffect.cpp +++ b/src/effects/SBSMSEffect.cpp @@ -22,7 +22,6 @@ effect that uses SBSMS to do its processing (TimeScale) #include "../WaveTrack.h" #include "../Project.h" #include "TimeWarper.h" -#include "../FileException.h" enum { SBSMSOutBlockSize = 512 diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index d32f58851..2b4114e33 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -58,7 +58,6 @@ a graph for EffectScienFilter. #include "../Project.h" #include "../Shuttle.h" #include "../ShuttleGui.h" -#include "../Theme.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" #include "../widgets/ErrorDialog.h" diff --git a/src/effects/SoundTouchEffect.cpp b/src/effects/SoundTouchEffect.cpp index 55204dead..4b380863f 100644 --- a/src/effects/SoundTouchEffect.cpp +++ b/src/effects/SoundTouchEffect.cpp @@ -22,7 +22,6 @@ effect that uses SoundTouch to do its processing (ChangeTempo #include "../LabelTrack.h" #include "../WaveTrack.h" #include "../Project.h" -#include "TimeWarper.h" #include "../NoteTrack.h" // Soundtouch defines these as well, which are also in generated configmac.h diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp index b3f6e7291..e247a3e0a 100644 --- a/src/effects/ToneGen.cpp +++ b/src/effects/ToneGen.cpp @@ -31,7 +31,6 @@ frequency changes smoothly during the tone. #include "../Project.h" #include "../Shuttle.h" #include "../ShuttleGui.h" -#include "../widgets/NumericTextCtrl.h" #include "../widgets/valnum.h" enum kInterpolations diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index 2e9b64c29..a30151f29 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -81,16 +81,12 @@ // dialogs, widgets and other stuff. This will need to be cleaned up. #include "../../FileNames.h" -#include "../../Internat.h" #include "../../PlatformCompatibility.h" #include "../../ShuttleGui.h" #include "../../effects/Effect.h" -#include "../../widgets/NumericTextCtrl.h" -#include "../../widgets/wxPanelWrapper.h" #include "../../widgets/valnum.h" #include "../../widgets/ErrorDialog.h" #include "../../xml/XMLFileReader.h" -#include "../../xml/XMLWriter.h" #if wxUSE_ACCESSIBILITY #include "../../widgets/WindowAccessible.h" @@ -98,7 +94,6 @@ #include "audacity/ConfigInterface.h" -#include "../../MemoryX.h" #include // Put this inclusion last. On Linux it makes some unfortunate pollution of diff --git a/src/effects/audiounits/AudioUnitEffect.cpp b/src/effects/audiounits/AudioUnitEffect.cpp index a2ffadd3a..d184221a8 100644 --- a/src/effects/audiounits/AudioUnitEffect.cpp +++ b/src/effects/audiounits/AudioUnitEffect.cpp @@ -42,8 +42,6 @@ #include "../../widgets/valnum.h" #include "../../widgets/wxPanelWrapper.h" -#include "../../Internat.h" - struct CFReleaser { void operator () (const void *p) const { if (p) CFRelease(p); } }; template diff --git a/src/effects/ladspa/LadspaEffect.cpp b/src/effects/ladspa/LadspaEffect.cpp index 86a31987c..fa4847b8e 100644 --- a/src/effects/ladspa/LadspaEffect.cpp +++ b/src/effects/ladspa/LadspaEffect.cpp @@ -25,8 +25,6 @@ effects from this one class. #include "../../Audacity.h" #include "LadspaEffect.h" // This class's header file -#include "ladspa.h" - #include #include // for wxUSE_* macros @@ -49,7 +47,6 @@ effects from this one class. #include #include "../../FileNames.h" -#include "../../Internat.h" #include "../../ShuttleGui.h" #include "../../widgets/valnum.h" #include "../../widgets/wxPanelWrapper.h" diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index 69459ee3d..e3817c628 100644 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -34,11 +34,8 @@ #include #include -#include "LoadLV2.h" -#include "../../Internat.h" #include "../../ShuttleGui.h" #include "../../widgets/valnum.h" -#include "../../widgets/wxPanelWrapper.h" #include "../../widgets/ErrorDialog.h" #include "lilv/lilv.h" diff --git a/src/effects/lv2/LoadLV2.cpp b/src/effects/lv2/LoadLV2.cpp index ea335c9ab..6dcc4be5b 100644 --- a/src/effects/lv2/LoadLV2.cpp +++ b/src/effects/lv2/LoadLV2.cpp @@ -29,7 +29,6 @@ Functions that find and load all LV2 plugins on the system. #include #include -#include "../../Internat.h" #include "../EffectManager.h" #include "LV2Effect.h" diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index acdb3bcb2..0f4ce058c 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -56,9 +56,7 @@ effects from this one class. #include "../EffectManager.h" #include "../../AudacityApp.h" #include "../../DirManager.h" -#include "../../FileException.h" #include "../../FileNames.h" -#include "../../Internat.h" #include "../../LabelTrack.h" #include "../../NoteTrack.h" #include "../../TimeTrack.h" diff --git a/src/export/Export.cpp b/src/export/Export.cpp index 425a081e8..9161cb4e5 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -61,7 +61,6 @@ #include "../DirManager.h" #include "../FileFormats.h" -#include "../Internat.h" #include "../Menus.h" #include "../Mix.h" #include "../Prefs.h" diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp index 4b95e0f5b..f83d812d8 100644 --- a/src/export/ExportCL.cpp +++ b/src/export/ExportCL.cpp @@ -34,14 +34,11 @@ #include "../Mix.h" #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Internat.h" #include "../float_cast.h" #include "../widgets/FileHistory.h" #include "../widgets/ErrorDialog.h" #include "../widgets/ProgressDialog.h" -#include "../Track.h" - //---------------------------------------------------------------------------- // ExportCLOptions diff --git a/src/export/ExportFFmpeg.cpp b/src/export/ExportFFmpeg.cpp index 981c89b6b..9757a90fc 100644 --- a/src/export/ExportFFmpeg.cpp +++ b/src/export/ExportFFmpeg.cpp @@ -36,12 +36,9 @@ function. #include #include "../FileFormats.h" -#include "../Internat.h" #include "../Mix.h" -#include "../Prefs.h" #include "../Project.h" #include "../Tags.h" -#include "../Track.h" #include "../widgets/ErrorDialog.h" #include "../widgets/ProgressDialog.h" diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp index 1b4526bb9..12fa8de1a 100644 --- a/src/export/ExportFFmpegDialogs.cpp +++ b/src/export/ExportFFmpegDialogs.cpp @@ -57,9 +57,7 @@ #include #include "../FileFormats.h" -#include "../Internat.h" #include "../Mix.h" -#include "../Prefs.h" #include "../Project.h" #include "../Tags.h" #include "../TranslatableStringArray.h" diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp index 5a69c654c..cb8f7d4d1 100644 --- a/src/export/ExportFLAC.cpp +++ b/src/export/ExportFLAC.cpp @@ -37,10 +37,8 @@ and libvorbis examples, Monty #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Internat.h" #include "../Tags.h" -#include "../Track.h" #include "../widgets/ErrorDialog.h" #include "../widgets/ProgressDialog.h" diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp index a7b9ab8bb..cbc9a3465 100644 --- a/src/export/ExportMP2.cpp +++ b/src/export/ExportMP2.cpp @@ -48,13 +48,11 @@ #include "Export.h" #include "../FileIO.h" -#include "../Internat.h" #include "../Mix.h" #include "../Prefs.h" #include "../Project.h" #include "../ShuttleGui.h" #include "../Tags.h" -#include "../Track.h" #include "../widgets/ErrorDialog.h" #include "../widgets/ProgressDialog.h" diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp index 42d5e1903..813e1ac22 100644 --- a/src/export/ExportMP3.cpp +++ b/src/export/ExportMP3.cpp @@ -82,7 +82,6 @@ #include "../FileNames.h" #include "../float_cast.h" -#include "../Internat.h" #include "../Mix.h" #include "../Prefs.h" #include "../Project.h" diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index 2ecdb646d..8474d658d 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -38,10 +38,7 @@ #include #include -#include "Export.h" - #include "../DirManager.h" -#include "../Internat.h" #include "../FileFormats.h" #include "../FileNames.h" #include "../LabelTrack.h" diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp index 273ba84e5..6fbcb2fae 100644 --- a/src/export/ExportOGG.cpp +++ b/src/export/ExportOGG.cpp @@ -33,9 +33,7 @@ #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Internat.h" #include "../Tags.h" -#include "../Track.h" #include "../widgets/ErrorDialog.h" #include "../widgets/ProgressDialog.h" diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp index 381ab466e..bf1e52227 100644 --- a/src/export/ExportPCM.cpp +++ b/src/export/ExportPCM.cpp @@ -26,14 +26,11 @@ #include "sndfile.h" #include "../FileFormats.h" -#include "../Internat.h" -#include "../MemoryX.h" #include "../Mix.h" #include "../Prefs.h" #include "../Project.h" #include "../ShuttleGui.h" #include "../Tags.h" -#include "../Track.h" #include "../ondemand/ODManager.h" #include "../widgets/ErrorDialog.h" #include "../widgets/ProgressDialog.h" diff --git a/src/import/FormatClassifier.cpp b/src/import/FormatClassifier.cpp index 0490bdf6c..c632fc372 100644 --- a/src/import/FormatClassifier.cpp +++ b/src/import/FormatClassifier.cpp @@ -27,7 +27,6 @@ for classification of the sample format and the used endianness. #include -#include "MultiFormatReader.h" #include "sndfile.h" FormatClassifier::FormatClassifier(const char* filename) : diff --git a/src/import/Import.cpp b/src/import/Import.cpp index cbef5566d..e23f7a173 100644 --- a/src/import/Import.cpp +++ b/src/import/Import.cpp @@ -37,7 +37,6 @@ and ImportLOF.cpp. #include "../Audacity.h" // for USE_* macros #include "Import.h" -#include "ImportPlugin.h" #include @@ -55,7 +54,6 @@ and ImportLOF.cpp. #include "ImportMP3.h" #include "ImportOGG.h" #include "ImportQT.h" -#include "ImportRaw.h" #include "ImportLOF.h" #include "ImportFLAC.h" #include "ImportFFmpeg.h" diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp index ee6c2c486..d02d0d2c4 100644 --- a/src/import/ImportFFmpeg.cpp +++ b/src/import/ImportFFmpeg.cpp @@ -35,7 +35,6 @@ Licensed under the GNU General Public License v2 or later #include #endif -#include "../MemoryX.h" #include "../widgets/ProgressDialog.h" @@ -155,7 +154,6 @@ static const auto exts = { // all the includes live here by default #include "Import.h" #include "../Tags.h" -#include "../Internat.h" #include "../WaveTrack.h" #include "ImportPlugin.h" diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp index 0d847fc7b..e958bf977 100644 --- a/src/import/ImportFLAC.cpp +++ b/src/import/ImportFLAC.cpp @@ -39,7 +39,6 @@ #include // needed for _("translated stings") even if we // don't have libflac available -#include "../AudacityException.h" #include "Import.h" #include "ImportPlugin.h" @@ -69,8 +68,6 @@ void GetFLACImportPlugin(ImportPluginList &importPluginList, #else /* USE_LIBFLAC */ -#include "../Internat.h" - #include #include #include diff --git a/src/import/ImportGStreamer.cpp b/src/import/ImportGStreamer.cpp index 162f5fa41..8c077f978 100644 --- a/src/import/ImportGStreamer.cpp +++ b/src/import/ImportGStreamer.cpp @@ -31,8 +31,6 @@ Licensed under the GNU General Public License v2 or later #include #include -#include "../MemoryX.h" - #define DESC _("GStreamer-compatible files") @@ -48,13 +46,9 @@ Licensed under the GNU General Public License v2 or later #endif // all the includes live here by default -#include "../AudacityException.h" -#include "../SampleFormat.h" #include "../Tags.h" -#include "../Internat.h" #include "../WaveTrack.h" #include "Import.h" -#include "ImportPlugin.h" extern "C" { diff --git a/src/import/ImportLOF.cpp b/src/import/ImportLOF.cpp index 846af737d..ef36033e7 100644 --- a/src/import/ImportLOF.cpp +++ b/src/import/ImportLOF.cpp @@ -89,7 +89,6 @@ #include "../Project.h" #include "../FileFormats.h" #include "../Prefs.h" -#include "../Internat.h" #include "../widgets/ErrorDialog.h" #include "../widgets/ProgressDialog.h" diff --git a/src/import/ImportMIDI.cpp b/src/import/ImportMIDI.cpp index 88518270b..506b773f2 100644 --- a/src/import/ImportMIDI.cpp +++ b/src/import/ImportMIDI.cpp @@ -21,7 +21,6 @@ //#include "strparse.h" //#include "mfmidi.h" -#include "../Internat.h" #include "../NoteTrack.h" #include "../widgets/ErrorDialog.h" diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp index 5788280b1..32503b9a1 100644 --- a/src/import/ImportMP3.cpp +++ b/src/import/ImportMP3.cpp @@ -39,11 +39,9 @@ #include #include -#include "../AudacityException.h" #include "../Prefs.h" #include "Import.h" #include "ImportPlugin.h" -#include "../Internat.h" #include "../Tags.h" #include "../prefs/QualityPrefs.h" #include "../widgets/ProgressDialog.h" diff --git a/src/import/ImportOGG.cpp b/src/import/ImportOGG.cpp index 1e7c41c89..2b8b49cb6 100644 --- a/src/import/ImportOGG.cpp +++ b/src/import/ImportOGG.cpp @@ -40,7 +40,6 @@ #include #include "../Prefs.h" -#include "../Internat.h" #include "../Tags.h" #include "../prefs/QualityPrefs.h" #include "../widgets/ProgressDialog.h" diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp index 039201338..dcd6d546e 100644 --- a/src/import/ImportPCM.cpp +++ b/src/import/ImportPCM.cpp @@ -22,7 +22,6 @@ #include "../Audacity.h" // for USE_* macros #include "ImportPCM.h" -#include "../Internat.h" #include "../Tags.h" #include diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp index 80895102e..e1cd60b1f 100644 --- a/src/import/ImportQT.cpp +++ b/src/import/ImportQT.cpp @@ -78,7 +78,6 @@ void GetQTImportPlugin(ImportPluginList &importPluginList, // There's a name collision between our Track and QuickTime's...workaround it #undef Track -#include "../Internat.h" #include "../Tags.h" #include "../WaveTrack.h" diff --git a/src/import/ImportRaw.cpp b/src/import/ImportRaw.cpp index d5a2ad426..fc08d0961 100644 --- a/src/import/ImportRaw.cpp +++ b/src/import/ImportRaw.cpp @@ -27,9 +27,7 @@ and sample size to help you importing data of an unknown format. #include "Import.h" #include "../DirManager.h" -#include "../FileException.h" #include "../FileFormats.h" -#include "../Internat.h" #include "../Prefs.h" #include "../ShuttleGui.h" #include "../UserException.h" @@ -55,7 +53,6 @@ and sample size to help you importing data of an unknown format. #include // #include "RawAudioGuess.h" -#include "MultiFormatReader.h" #include "FormatClassifier.h" #include "sndfile.h" diff --git a/src/import/RawAudioGuess.cpp b/src/import/RawAudioGuess.cpp index 027590f30..97e0749e0 100644 --- a/src/import/RawAudioGuess.cpp +++ b/src/import/RawAudioGuess.cpp @@ -17,7 +17,6 @@ #include "RawAudioGuess.h" #include "../AudacityException.h" -#include "../MemoryX.h" #include #include @@ -27,8 +26,6 @@ #include #include -#include "../Internat.h" - #define RAW_GUESS_DEBUG 0 #if RAW_GUESS_DEBUG diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp index be7fdb4cb..eb7d037f0 100644 --- a/src/menus/FileMenus.cpp +++ b/src/menus/FileMenus.cpp @@ -12,7 +12,6 @@ #include "../WaveTrack.h" #include "../commands/CommandContext.h" #include "../commands/CommandManager.h" -#include "../export/Export.h" #include "../export/ExportMultiple.h" #include "../widgets/ErrorDialog.h" #include "../widgets/FileHistory.h" diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp index 96eae6634..548eac47e 100644 --- a/src/menus/TransportMenus.cpp +++ b/src/menus/TransportMenus.cpp @@ -13,9 +13,6 @@ #include "../TrackPanel.h" #include "../UndoManager.h" #include "../WaveClip.h" -#include "../WaveTrack.h" -#include "../commands/CommandContext.h" -#include "../commands/CommandManager.h" #include "../prefs/TracksPrefs.h" #include "../toolbars/ControlToolBar.h" #include "../toolbars/TranscriptionToolBar.h" diff --git a/src/ondemand/ODComputeSummaryTask.cpp b/src/ondemand/ODComputeSummaryTask.cpp index ea5b00e94..d35a50794 100644 --- a/src/ondemand/ODComputeSummaryTask.cpp +++ b/src/ondemand/ODComputeSummaryTask.cpp @@ -19,7 +19,6 @@ updating the ODPCMAliasBlockFile and the GUI of the newly available data. #include "ODComputeSummaryTask.h" -#include "../AudacityException.h" #include "../blockfile/ODPCMAliasBlockFile.h" #include "../Sequence.h" #include "../WaveClip.h" diff --git a/src/ondemand/ODManager.cpp b/src/ondemand/ODManager.cpp index 1f79d0ea6..9a1fd879f 100644 --- a/src/ondemand/ODManager.cpp +++ b/src/ondemand/ODManager.cpp @@ -18,7 +18,6 @@ ODTask requests and internals. #include "ODManager.h" #include "ODTask.h" -#include "ODTaskThread.h" #include "ODWaveTrackTaskQueue.h" #include "../Project.h" #include diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp index 1b6d07c01..ae582d33f 100644 --- a/src/prefs/DevicePrefs.cpp +++ b/src/prefs/DevicePrefs.cpp @@ -35,7 +35,6 @@ other settings. #include "portaudio.h" #include "../AudioIO.h" -#include "../Internat.h" #include "../Prefs.h" #include "../ShuttleGui.h" #include "../DeviceManager.h" diff --git a/src/prefs/DirectoriesPrefs.cpp b/src/prefs/DirectoriesPrefs.cpp index f9713d1d8..fead3c0a2 100644 --- a/src/prefs/DirectoriesPrefs.cpp +++ b/src/prefs/DirectoriesPrefs.cpp @@ -34,7 +34,6 @@ #include "../Prefs.h" #include "../AudacityApp.h" -#include "../Internat.h" #include "../ShuttleGui.h" #include "../widgets/ErrorDialog.h" diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp index 350644ca8..5278628eb 100644 --- a/src/prefs/EffectsPrefs.cpp +++ b/src/prefs/EffectsPrefs.cpp @@ -29,8 +29,6 @@ #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Internat.h" - EffectsPrefs::EffectsPrefs(wxWindow * parent, wxWindowID winid) : PrefsPanel(parent, winid, _("Effects")) { diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp index 5c60ab2d8..6408cca04 100644 --- a/src/prefs/GUIPrefs.cpp +++ b/src/prefs/GUIPrefs.cpp @@ -34,7 +34,6 @@ #include "ThemePrefs.h" #include "../AColor.h" -#include "../Internat.h" GUIPrefs::GUIPrefs(wxWindow * parent, wxWindowID winid) /* i18n-hint: refers to Audacity's user interface settings */ diff --git a/src/prefs/ImportExportPrefs.cpp b/src/prefs/ImportExportPrefs.cpp index bbf0a5c91..e188cea07 100644 --- a/src/prefs/ImportExportPrefs.cpp +++ b/src/prefs/ImportExportPrefs.cpp @@ -23,8 +23,6 @@ #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Internat.h" - ImportExportPrefs::ImportExportPrefs(wxWindow * parent, wxWindowID winid) : PrefsPanel(parent, winid, _("Import / Export")) { diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index 6db0e7f54..ac0900f66 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -37,10 +37,8 @@ KeyConfigPrefs and MousePrefs use. #include "../Prefs.h" #include "../Project.h" #include "../commands/CommandManager.h" -#include "../commands/Keyboard.h" #include "../xml/XMLFileReader.h" -#include "../Internat.h" #include "../ShuttleGui.h" #include "../FileNames.h" diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp index 8f47d3b89..2219a764a 100644 --- a/src/prefs/LibraryPrefs.cpp +++ b/src/prefs/LibraryPrefs.cpp @@ -26,7 +26,6 @@ MP3 and FFmpeg encoding libraries. #include #include "../FFmpeg.h" -#include "../ShuttleGui.h" #include "../export/ExportMP3.h" #include "../widgets/LinkingHtmlWindow.h" #include "../widgets/HelpSystem.h" diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index 43b052e0a..c7be3a217 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -37,7 +37,6 @@ other settings. #include "../../lib-src/portmidi/pm_common/portmidi.h" -#include "../Internat.h" #include "../Prefs.h" #include "../ShuttleGui.h" #include "../widgets/ErrorDialog.h" diff --git a/src/prefs/ModulePrefs.cpp b/src/prefs/ModulePrefs.cpp index 9b315dbc2..ae6241e4d 100644 --- a/src/prefs/ModulePrefs.cpp +++ b/src/prefs/ModulePrefs.cpp @@ -24,7 +24,6 @@ with names like mnod-script-pipe that add NEW features. #include "../ShuttleGui.h" #include "../Prefs.h" -#include "../Internat.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/prefs/MousePrefs.cpp b/src/prefs/MousePrefs.cpp index 57fd4ccb6..523f08469 100644 --- a/src/prefs/MousePrefs.cpp +++ b/src/prefs/MousePrefs.cpp @@ -43,7 +43,6 @@ #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Internat.h" // The numbers of the columns of the mList. enum diff --git a/src/prefs/PlaybackPrefs.cpp b/src/prefs/PlaybackPrefs.cpp index 9daef6182..bf23c90a6 100644 --- a/src/prefs/PlaybackPrefs.cpp +++ b/src/prefs/PlaybackPrefs.cpp @@ -26,7 +26,6 @@ #include "../ShuttleGui.h" #include "../Prefs.h" -#include "../Internat.h" PlaybackPrefs::PlaybackPrefs(wxWindow * parent, wxWindowID winid) : PrefsPanel(parent, winid, _("Playback")) diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp index 0b1e57ac8..6a4596caf 100644 --- a/src/prefs/PrefsDialog.cpp +++ b/src/prefs/PrefsDialog.cpp @@ -39,8 +39,6 @@ #include "../Prefs.h" #include "../ShuttleGui.h" -#include "PrefsPanel.h" - #include "BatchPrefs.h" #include "DevicePrefs.h" #include "DirectoriesPrefs.h" diff --git a/src/prefs/ProjectsPrefs.cpp b/src/prefs/ProjectsPrefs.cpp index e379039bd..1bc30b815 100644 --- a/src/prefs/ProjectsPrefs.cpp +++ b/src/prefs/ProjectsPrefs.cpp @@ -25,8 +25,6 @@ handling. #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Internat.h" - //////////////////////////////////////////////////////////////////////////////// ProjectsPrefs::ProjectsPrefs(wxWindow * parent, wxWindowID winid) diff --git a/src/prefs/QualityPrefs.cpp b/src/prefs/QualityPrefs.cpp index c3d073bde..371242439 100644 --- a/src/prefs/QualityPrefs.cpp +++ b/src/prefs/QualityPrefs.cpp @@ -26,9 +26,7 @@ #include "../Dither.h" #include "../Prefs.h" #include "../Resample.h" -#include "../SampleFormat.h" #include "../ShuttleGui.h" -#include "../Internat.h" #define ID_SAMPLE_RATE_CHOICE 7001 diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index 7176eb387..e0a8d5a36 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -32,8 +32,6 @@ #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Internat.h" - #include "../widgets/Warning.h" using std::min; diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp index 16d71e180..157d088fd 100644 --- a/src/prefs/SpectrogramSettings.cpp +++ b/src/prefs/SpectrogramSettings.cpp @@ -25,12 +25,10 @@ Paul Licameli #include "../FFT.h" #include "../Prefs.h" -#include "../RealFFTf.h" #include #include "../widgets/ErrorDialog.h" -#include "../Internat.h" SpectrogramSettings::Globals::Globals() { diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp index 3924b08cd..72c672b34 100644 --- a/src/prefs/SpectrumPrefs.cpp +++ b/src/prefs/SpectrumPrefs.cpp @@ -27,7 +27,6 @@ #include "../FFT.h" #include "../Project.h" #include "../ShuttleGui.h" -#include "../WaveTrack.h" #include "../TrackPanel.h" diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp index 88ecee536..fc060c30d 100644 --- a/src/prefs/TracksBehaviorsPrefs.cpp +++ b/src/prefs/TracksBehaviorsPrefs.cpp @@ -21,7 +21,6 @@ #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Internat.h" TracksBehaviorsPrefs::TracksBehaviorsPrefs(wxWindow * parent, wxWindowID winid) /* i18n-hint: two nouns */ diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index f1624f19f..9dfe6061d 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -28,8 +28,6 @@ #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Internat.h" - int TracksPrefs::iPreferencePinned = -1; namespace { diff --git a/src/prefs/WarningsPrefs.cpp b/src/prefs/WarningsPrefs.cpp index 19424d741..c561f407e 100644 --- a/src/prefs/WarningsPrefs.cpp +++ b/src/prefs/WarningsPrefs.cpp @@ -24,8 +24,6 @@ #include "../ShuttleGui.h" -#include "../Internat.h" - //////////////////////////////////////////////////////////////////////////////// WarningsPrefs::WarningsPrefs(wxWindow * parent, wxWindowID winid) diff --git a/src/prefs/WaveformSettings.cpp b/src/prefs/WaveformSettings.cpp index bebb92c30..f5ed8ebfe 100644 --- a/src/prefs/WaveformSettings.cpp +++ b/src/prefs/WaveformSettings.cpp @@ -24,7 +24,6 @@ Paul Licameli #include "../Prefs.h" #include "../TranslatableStringArray.h" -#include "../Internat.h" WaveformSettings::Globals::Globals() diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp index 0b1dcbaea..05d8a1666 100644 --- a/src/toolbars/ControlToolBar.cpp +++ b/src/toolbars/ControlToolBar.cpp @@ -66,8 +66,6 @@ #include "../Menus.h" #include "../Prefs.h" #include "../Project.h" -#include "../Theme.h" -#include "../WaveTrack.h" #include "../widgets/AButton.h" #include "../widgets/Meter.h" #include "../widgets/LinkingHtmlWindow.h" diff --git a/src/toolbars/DeviceToolBar.cpp b/src/toolbars/DeviceToolBar.cpp index 5d5aa2b78..9d1899e22 100644 --- a/src/toolbars/DeviceToolBar.cpp +++ b/src/toolbars/DeviceToolBar.cpp @@ -43,7 +43,6 @@ #include "../Prefs.h" #include "../Project.h" #include "../ShuttleGui.h" -#include "../Theme.h" #include "../widgets/Grabber.h" #include "../DeviceManager.h" #include "../widgets/ErrorDialog.h" diff --git a/src/toolbars/EditToolBar.cpp b/src/toolbars/EditToolBar.cpp index a5cdddba7..d167e7d75 100644 --- a/src/toolbars/EditToolBar.cpp +++ b/src/toolbars/EditToolBar.cpp @@ -51,12 +51,9 @@ #include "../AllThemeResources.h" #include "../AudioIO.h" #include "../ImageManipulation.h" -#include "../Internat.h" #include "../Menus.h" #include "../Prefs.h" #include "../Project.h" -#include "../Theme.h" -#include "../Track.h" #include "../UndoManager.h" #include "../widgets/AButton.h" diff --git a/src/toolbars/MixerToolBar.cpp b/src/toolbars/MixerToolBar.cpp index cc48660b1..32e206bf1 100644 --- a/src/toolbars/MixerToolBar.cpp +++ b/src/toolbars/MixerToolBar.cpp @@ -36,7 +36,6 @@ #include "../ImageManipulation.h" #include "../Prefs.h" #include "../Project.h" -#include "../Theme.h" #include "../widgets/ASlider.h" #include "../widgets/Grabber.h" diff --git a/src/toolbars/ScrubbingToolBar.cpp b/src/toolbars/ScrubbingToolBar.cpp index 2029f43eb..a00a63591 100644 --- a/src/toolbars/ScrubbingToolBar.cpp +++ b/src/toolbars/ScrubbingToolBar.cpp @@ -33,11 +33,8 @@ #include "../AllThemeResources.h" #include "../AudioIO.h" #include "../ImageManipulation.h" -#include "../Internat.h" #include "../Prefs.h" #include "../Project.h" -#include "../Theme.h" -#include "../Track.h" #include "../UndoManager.h" #include "../widgets/AButton.h" #include "../tracks/ui/Scrubbing.h" diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp index 346508b2d..1151e48f4 100644 --- a/src/toolbars/SelectionBar.cpp +++ b/src/toolbars/SelectionBar.cpp @@ -28,7 +28,6 @@ with changes in the SelectionBar. #include "../Audacity.h" #include "SelectionBar.h" -#include "SelectionBarListener.h" // For compilers that support precompilation, includes "wx/wx.h". #include @@ -55,7 +54,6 @@ with changes in the SelectionBar. #include "../Prefs.h" #include "../Project.h" #include "../Snap.h" -#include "../widgets/NumericTextCtrl.h" #include "../AllThemeResources.h" #if wxUSE_ACCESSIBILITY diff --git a/src/toolbars/SpectralSelectionBar.cpp b/src/toolbars/SpectralSelectionBar.cpp index f295951a8..1bb6ec5a5 100644 --- a/src/toolbars/SpectralSelectionBar.cpp +++ b/src/toolbars/SpectralSelectionBar.cpp @@ -33,7 +33,6 @@ with changes in the SpectralSelectionBar. #include "../Experimental.h" #include -#include "../MemoryX.h" // For compilers that support precompilation, includes "wx/wx.h". #include @@ -57,9 +56,6 @@ with changes in the SpectralSelectionBar. #include "../Prefs.h" #include "../AllThemeResources.h" #include "../SelectedRegion.h" -#include "../widgets/NumericTextCtrl.h" - -#include "../Internat.h" #if wxUSE_ACCESSIBILITY #include "../widgets/WindowAccessible.h" diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp index 63d358a73..ce29ba9a1 100644 --- a/src/toolbars/ToolBar.cpp +++ b/src/toolbars/ToolBar.cpp @@ -52,8 +52,6 @@ in which buttons can be placed. #include "../AColor.h" #include "../ImageManipulation.h" #include "../Project.h" -#include "../Theme.h" -#include "../commands/Keyboard.h" #include "../commands/CommandManager.h" #include "../widgets/AButton.h" #include "../widgets/Grabber.h" diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp index 4a9d28b84..397be218f 100644 --- a/src/toolbars/ToolDock.cpp +++ b/src/toolbars/ToolDock.cpp @@ -49,7 +49,6 @@ #include "../ImageManipulation.h" #include "../Prefs.h" #include "../Project.h" -#include "../Theme.h" #include "../widgets/AButton.h" #include "../widgets/Grabber.h" diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp index 6b17b0cbb..6a5a81515 100644 --- a/src/toolbars/ToolManager.cpp +++ b/src/toolbars/ToolManager.cpp @@ -71,7 +71,6 @@ #include "../ImageManipulation.h" #include "../Prefs.h" #include "../Project.h" -#include "../Theme.h" #include "../widgets/AButton.h" #include "../widgets/ASlider.h" #include "../widgets/Meter.h" diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp index b78203b15..0d53a5824 100644 --- a/src/toolbars/ToolsToolBar.cpp +++ b/src/toolbars/ToolsToolBar.cpp @@ -51,7 +51,6 @@ #include "../ImageManipulation.h" #include "../Project.h" #include "../tracks/ui/Scrubbing.h" -#include "../Theme.h" #include "../widgets/AButton.h" diff --git a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp index 771a3e8cb..86a186bc7 100644 --- a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp @@ -16,7 +16,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../Project.h" #include "../../../RefreshCode.h" #include "../../../TrackPanelMouseEvent.h" -#include "../../../ViewInfo.h" LabelDefaultClickHandle::LabelDefaultClickHandle() { diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp index 5322deae7..ac5d69577 100644 --- a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp @@ -17,9 +17,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../RefreshCode.h" #include "../../../TrackPanelMouseEvent.h" #include "../../../UndoManager.h" -#include "../../../ViewInfo.h" - -#include "../../../MemoryX.h" #include #include diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.cpp b/src/tracks/labeltrack/ui/LabelTextHandle.cpp index 521d80821..1a43ff171 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelTextHandle.cpp @@ -18,7 +18,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../Project.h" #include "../../../RefreshCode.h" #include "../../../TrackPanelMouseEvent.h" -#include "../../../ViewInfo.h" #include "../../../images/Cursors.h" LabelTextHandle::LabelTextHandle diff --git a/src/tracks/labeltrack/ui/LabelTrackControls.cpp b/src/tracks/labeltrack/ui/LabelTrackControls.cpp index 3e8358242..0f5cf86f6 100644 --- a/src/tracks/labeltrack/ui/LabelTrackControls.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackControls.cpp @@ -22,7 +22,6 @@ Paul Licameli split from TrackPanel.cpp #include #include #include -#include "../../../Internat.h" LabelTrackControls::~LabelTrackControls() { diff --git a/src/tracks/labeltrack/ui/LabelTrackUI.cpp b/src/tracks/labeltrack/ui/LabelTrackUI.cpp index 59f9c0c2e..c99fff778 100644 --- a/src/tracks/labeltrack/ui/LabelTrackUI.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackUI.cpp @@ -11,7 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../LabelTrack.h" #include "LabelTrackControls.h" -#include "LabelDefaultClickHandle.h" #include "LabelTrackVRulerControls.h" #include "LabelGlyphHandle.h" #include "LabelTextHandle.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp index 0434eccc9..80a030e97 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp @@ -13,7 +13,6 @@ Paul Licameli split from TrackPanel.cpp #ifdef USE_MIDI #include "NoteTrackButtonHandle.h" -#include "../../../../HitTestResult.h" #include "../../../../TrackPanelMouseEvent.h" #include "../../../../NoteTrack.h" #include "../../../../Project.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp index 9cf9c9181..223543433 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp @@ -15,7 +15,6 @@ #ifdef EXPERIMENTAL_MIDI_OUT -#include "../../../../HitTestResult.h" #include "../../../../Project.h" #include "../../../../RefreshCode.h" #include "../../../../TrackPanel.h" // for TrackInfo diff --git a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp index 97ab167c5..733a8b0c6 100644 --- a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp +++ b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp @@ -12,11 +12,9 @@ Paul Licameli split from TrackPanel.cpp #include "PlayableTrackButtonHandles.h" #include "../../../commands/CommandManager.h" -#include "../../../HitTestResult.h" #include "../../../Menus.h" #include "../../../Project.h" #include "../../../RefreshCode.h" -#include "../../../Track.h" #include "../../../TrackPanel.h" #include "../../../TrackPanelMouseEvent.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp index 066456e9d..83c9f7d06 100644 --- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp @@ -13,8 +13,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Experimental.h" -#include "../../../../MemoryX.h" - #include "../../../../HitTestResult.h" #include "../../../../Project.h" #include "../../../../RefreshCode.h" @@ -22,7 +20,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../TrackPanelMouseEvent.h" #include "../../../../UndoManager.h" #include "../../../../WaveTrack.h" -#include "../../../../WaveTrackLocation.h" #include "../../../../../images/Cursors.h" CutlineHandle::CutlineHandle diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp index 392029727..fd296036a 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp @@ -14,7 +14,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Experimental.h" #include -#include "../../../../MemoryX.h" #include #include "../../../../Envelope.h" @@ -25,7 +24,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../TrackArtist.h" #include "../../../../TrackPanelMouseEvent.h" #include "../../../../UndoManager.h" -#include "../../../../ViewInfo.h" #include "../../../../WaveTrack.h" #include "../../../../../images/Cursors.h" #include "../../../../widgets/ErrorDialog.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp index 67579d9e1..62f432753 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp @@ -17,11 +17,9 @@ Paul Licameli split from TrackPanel.cpp #include "WaveTrackSliderHandles.h" #include "../../../../AudioIO.h" -#include "../../../../HitTestResult.h" #include "../../../../Menus.h" #include "../../../../Project.h" #include "../../../../RefreshCode.h" -#include "../../../../WaveTrack.h" #include "../../../../ShuttleGui.h" #include "../../../../TrackPanel.h" #include "../../../../TrackPanelMouseEvent.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp index 0d95176b4..f9d6e442e 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp @@ -11,7 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Audacity.h" #include "WaveTrackSliderHandles.h" -#include "../../../../HitTestResult.h" #include "../../../../Project.h" #include "../../../../RefreshCode.h" #include "../../../../TrackPanel.h" diff --git a/src/tracks/ui/BackgroundCell.cpp b/src/tracks/ui/BackgroundCell.cpp index f31037ee3..4e6641c4c 100644 --- a/src/tracks/ui/BackgroundCell.cpp +++ b/src/tracks/ui/BackgroundCell.cpp @@ -14,7 +14,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../HitTestResult.h" #include "../../Project.h" #include "../../RefreshCode.h" -#include "../../Track.h" #include "../../TrackPanelMouseEvent.h" #include "../../UIHandle.h" diff --git a/src/tracks/ui/ButtonHandle.cpp b/src/tracks/ui/ButtonHandle.cpp index 3cfd4a913..d3a1c9330 100644 --- a/src/tracks/ui/ButtonHandle.cpp +++ b/src/tracks/ui/ButtonHandle.cpp @@ -11,12 +11,9 @@ Paul Licameli #include "../../Audacity.h" #include "ButtonHandle.h" -#include "../../MemoryX.h" - #include "../../HitTestResult.h" #include "../../Project.h" #include "../../RefreshCode.h" -#include "../../Track.h" #include "../../TrackPanelMouseEvent.h" #include "../ui/TrackControls.h" diff --git a/src/tracks/ui/CommonTrackPanelCell.cpp b/src/tracks/ui/CommonTrackPanelCell.cpp index d3ed455a6..34d19250f 100644 --- a/src/tracks/ui/CommonTrackPanelCell.cpp +++ b/src/tracks/ui/CommonTrackPanelCell.cpp @@ -15,10 +15,8 @@ Paul Licameli split from TrackPanel.cpp #include "Scrubbing.h" -#include "../../HitTestResult.h" #include "../../Project.h" #include "../../RefreshCode.h" -#include "../../Track.h" #include "../../TrackPanel.h" #include "../../TrackPanelMouseEvent.h" diff --git a/src/tracks/ui/EditCursorOverlay.cpp b/src/tracks/ui/EditCursorOverlay.cpp index 8d37b46b5..d6fc4b714 100644 --- a/src/tracks/ui/EditCursorOverlay.cpp +++ b/src/tracks/ui/EditCursorOverlay.cpp @@ -14,10 +14,8 @@ Paul Licameli split from TrackPanel.cpp #include "../../AColor.h" #include "../../AdornedRulerPanel.h" #include "../../Project.h" -#include "../../Track.h" #include "../../TrackPanelAx.h" #include "../../TrackPanel.h" -#include "../../ViewInfo.h" #include diff --git a/src/tracks/ui/EnvelopeHandle.cpp b/src/tracks/ui/EnvelopeHandle.cpp index 9a20ed1bd..e9f993d78 100644 --- a/src/tracks/ui/EnvelopeHandle.cpp +++ b/src/tracks/ui/EnvelopeHandle.cpp @@ -13,8 +13,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../Experimental.h" -#include "../../MemoryX.h" - #include "../../Envelope.h" #include "../../HitTestResult.h" #include "../../prefs/WaveformSettings.h" @@ -23,7 +21,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../TimeTrack.h" #include "../../TrackArtist.h" #include "../../TrackPanelMouseEvent.h" -#include "../../ViewInfo.h" #include "../../WaveTrack.h" #include "../../../images/Cursors.h" diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp index 11b94122d..2a2e1c059 100644 --- a/src/tracks/ui/Scrubbing.cpp +++ b/src/tracks/ui/Scrubbing.cpp @@ -20,7 +20,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../Menus.h" #include "../../Project.h" #include "../../TrackPanel.h" -#include "../../TrackPanelCell.h" #include "../../prefs/PlaybackPrefs.h" #include "../../prefs/TracksPrefs.h" #include "../../toolbars/ControlToolBar.h" @@ -33,10 +32,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../toolbars/TranscriptionToolBar.h" #endif -#include "../../commands/CommandFunctors.h" -#include "../../commands/CommandContext.h" -#include "../../commands/CommandManager.h" - #include diff --git a/src/tracks/ui/SelectHandle.cpp b/src/tracks/ui/SelectHandle.cpp index a4d05d9c5..522f59a58 100644 --- a/src/tracks/ui/SelectHandle.cpp +++ b/src/tracks/ui/SelectHandle.cpp @@ -18,19 +18,14 @@ Paul Licameli split from TrackPanel.cpp #include "../../AColor.h" #include "../../FreqWindow.h" -#include "../../HitTestResult.h" #include "../../Menus.h" #include "../../NumberScale.h" #include "../../Project.h" #include "../../RefreshCode.h" -#include "../../Snap.h" #include "../../TrackPanel.h" #include "../../TrackPanelMouseEvent.h" -#include "../../ViewInfo.h" #include "../../WaveClip.h" #include "../../WaveTrack.h" -#include "../../commands/CommandManager.h" -#include "../../commands/Keyboard.h" #include "../../ondemand/ODManager.h" #include "../../prefs/SpectrogramSettings.h" #include "../../toolbars/ToolsToolBar.h" diff --git a/src/tracks/ui/SliderHandle.cpp b/src/tracks/ui/SliderHandle.cpp index 77e41a5b8..4e5fbd18a 100644 --- a/src/tracks/ui/SliderHandle.cpp +++ b/src/tracks/ui/SliderHandle.cpp @@ -15,7 +15,6 @@ Paul Licameli #include "../../HitTestResult.h" #include "../../Project.h" #include "../../RefreshCode.h" -#include "../../Track.h" #include "../../TrackPanelMouseEvent.h" SliderHandle::SliderHandle diff --git a/src/tracks/ui/TrackButtonHandles.cpp b/src/tracks/ui/TrackButtonHandles.cpp index 5929a54c9..ca3ab3c5c 100644 --- a/src/tracks/ui/TrackButtonHandles.cpp +++ b/src/tracks/ui/TrackButtonHandles.cpp @@ -11,11 +11,9 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "TrackButtonHandles.h" -#include "../../HitTestResult.h" #include "../../Menus.h" #include "../../Project.h" #include "../../RefreshCode.h" -#include "../../Track.h" #include "../../TrackPanel.h" #include "../../commands/CommandManager.h" diff --git a/src/tracks/ui/TrackControls.cpp b/src/tracks/ui/TrackControls.cpp index cba173433..5e44b09ba 100644 --- a/src/tracks/ui/TrackControls.cpp +++ b/src/tracks/ui/TrackControls.cpp @@ -13,16 +13,13 @@ Paul Licameli split from TrackPanel.cpp #include "TrackButtonHandles.h" #include "TrackSelectHandle.h" -#include "../../HitTestResult.h" #include "../../RefreshCode.h" #include "../../Menus.h" #include "../../Project.h" #include "../../TrackPanel.h" // for TrackInfo #include "../../TrackPanelMouseEvent.h" -#include "../../Track.h" #include #include "../../commands/CommandType.h" -#include "../../commands/Command.h" #include "../../commands/CommandManager.h" #include "../../ShuttleGui.h" #include "../../widgets/PopupMenuTable.h" diff --git a/src/tracks/ui/TrackSelectHandle.cpp b/src/tracks/ui/TrackSelectHandle.cpp index bebc9f5b2..2523caa6e 100644 --- a/src/tracks/ui/TrackSelectHandle.cpp +++ b/src/tracks/ui/TrackSelectHandle.cpp @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #include "TrackSelectHandle.h" #include "TrackControls.h" -#include "../../HitTestResult.h" #include "../../Menus.h" #include "../../Project.h" #include "../../RefreshCode.h" @@ -20,7 +19,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../TrackPanelMouseEvent.h" #include "../../WaveTrack.h" -#include "../../MemoryX.h" #include #include diff --git a/src/tracks/ui/TrackVRulerControls.cpp b/src/tracks/ui/TrackVRulerControls.cpp index 1a6ae0042..37ede3d9b 100644 --- a/src/tracks/ui/TrackVRulerControls.cpp +++ b/src/tracks/ui/TrackVRulerControls.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "TrackVRulerControls.h" -#include "../../HitTestResult.h" - #include "../../TrackPanel.h" #include "../../Track.h" diff --git a/src/tracks/ui/ZoomHandle.cpp b/src/tracks/ui/ZoomHandle.cpp index 3f8991a13..888914013 100644 --- a/src/tracks/ui/ZoomHandle.cpp +++ b/src/tracks/ui/ZoomHandle.cpp @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #include "ZoomHandle.h" #include -#include "../../MemoryX.h" #include #include @@ -22,7 +21,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../Project.h" #include "../../RefreshCode.h" #include "../../TrackPanelMouseEvent.h" -#include "../../ViewInfo.h" #include "../../../images/Cursors.h" /// This class takes care of our different zoom diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp index b73ccf536..262f4bece 100644 --- a/src/widgets/ASlider.cpp +++ b/src/widgets/ASlider.cpp @@ -64,7 +64,6 @@ or ASlider. #include "../Project.h" #include "../ShuttleGui.h" -#include "../Theme.h" #include "../AllThemeResources.h" #if wxUSE_ACCESSIBILITY diff --git a/src/widgets/ErrorDialog.cpp b/src/widgets/ErrorDialog.cpp index 3b421d4e5..74e837d47 100644 --- a/src/widgets/ErrorDialog.cpp +++ b/src/widgets/ErrorDialog.cpp @@ -37,7 +37,6 @@ #include "../AllThemeResources.h" #include "../ShuttleGui.h" #include "../HelpText.h" -#include "../Internat.h" #include "../Project.h" #include "../Prefs.h" #include "HelpSystem.h" diff --git a/src/widgets/ExpandingToolBar.cpp b/src/widgets/ExpandingToolBar.cpp index da695fe52..9dffd1052 100644 --- a/src/widgets/ExpandingToolBar.cpp +++ b/src/widgets/ExpandingToolBar.cpp @@ -67,8 +67,6 @@ ExpandingToolBar. #include "../Experimental.h" -#include "../Theme.h" - // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/widgets/Grid.cpp b/src/widgets/Grid.cpp index 7e6035291..18f9101f4 100644 --- a/src/widgets/Grid.cpp +++ b/src/widgets/Grid.cpp @@ -26,9 +26,7 @@ #include #include -#include "NumericTextCtrl.h" #include "../SelectedRegion.h" -#include "../Internat.h" #if wxUSE_ACCESSIBILITY #include "WindowAccessible.h" diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp index 8d479aecf..ea7e57b42 100644 --- a/src/widgets/HelpSystem.cpp +++ b/src/widgets/HelpSystem.cpp @@ -31,7 +31,6 @@ #include "../FileNames.h" #include "LinkingHtmlWindow.h" -#include "../Theme.h" #include "../AllThemeResources.h" #include "../ShuttleGui.h" #include "../HelpText.h" diff --git a/src/widgets/KeyView.cpp b/src/widgets/KeyView.cpp index d242096d7..8dd902b3e 100644 --- a/src/widgets/KeyView.cpp +++ b/src/widgets/KeyView.cpp @@ -22,11 +22,9 @@ #include "../AColor.h" #include "../ShuttleGui.h" #include "../commands/CommandManager.h" -#include "../commands/Keyboard.h" #include #include -#include "../Internat.h" #if wxUSE_ACCESSIBILITY #include "WindowAccessible.h" diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index e5e13e4c9..eaff53515 100644 --- a/src/widgets/Meter.cpp +++ b/src/widgets/Meter.cpp @@ -70,7 +70,6 @@ #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../Theme.h" #include "../AllThemeResources.h" #include "../widgets/valnum.h" diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp index 16ae951b5..ac12b2af4 100644 --- a/src/widgets/NumericTextCtrl.cpp +++ b/src/widgets/NumericTextCtrl.cpp @@ -169,7 +169,6 @@ different formats. #include "NumericTextCtrl.h" #include "audacity/Types.h" -#include "../Theme.h" #include "../AllThemeResources.h" #include "../AColor.h" #include "../Project.h" diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp index 567727c63..3126b6dd0 100644 --- a/src/widgets/ProgressDialog.cpp +++ b/src/widgets/ProgressDialog.cpp @@ -29,7 +29,6 @@ #include "../Audacity.h" #include "ProgressDialog.h" -#include "../MemoryX.h" #include #include @@ -53,7 +52,6 @@ #include "ErrorDialog.h" #include "../Prefs.h" -#include "../Internat.h" // This really should be a Preferences setting static const unsigned char beep[] = diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp index 84b63a807..289e78326 100644 --- a/src/widgets/Ruler.cpp +++ b/src/widgets/Ruler.cpp @@ -65,7 +65,6 @@ array of Ruler::Label. #include "../AColor.h" #include "../AllThemeResources.h" #include "../NumberScale.h" -#include "../Theme.h" #include "../TimeTrack.h" #include "../ViewInfo.h" diff --git a/src/widgets/Warning.cpp b/src/widgets/Warning.cpp index 485bde063..65c987a66 100644 --- a/src/widgets/Warning.cpp +++ b/src/widgets/Warning.cpp @@ -29,7 +29,6 @@ the ability to not see similar warnings again for this session. #include #include #include "wxPanelWrapper.h" -#include "../Internat.h" class WarningDialog final : public wxDialogWrapper { diff --git a/src/widgets/valnum.cpp b/src/widgets/valnum.cpp index 31588486a..626f82638 100644 --- a/src/widgets/valnum.cpp +++ b/src/widgets/valnum.cpp @@ -44,7 +44,6 @@ #include #include "numformatter.h" -#include "../Internat.h" // ============================================================================ // NumValidatorBase implementation diff --git a/src/xml/XMLFileReader.cpp b/src/xml/XMLFileReader.cpp index a165a2291..b271e7a13 100644 --- a/src/xml/XMLFileReader.cpp +++ b/src/xml/XMLFileReader.cpp @@ -21,8 +21,6 @@ #include -#include "../Internat.h" - XMLFileReader::XMLFileReader() { mParser = XML_ParserCreate(NULL); diff --git a/src/xml/XMLTagHandler.cpp b/src/xml/XMLTagHandler.cpp index 477a473e9..062f53318 100644 --- a/src/xml/XMLTagHandler.cpp +++ b/src/xml/XMLTagHandler.cpp @@ -24,9 +24,6 @@ #include "../Audacity.h" // for USE_* macros #include "XMLTagHandler.h" -#include "../MemoryX.h" -#include "../Internat.h" - #ifdef _WIN32 #include #include @@ -36,7 +33,6 @@ #include #include -#include "../SampleFormat.h" #include "../Track.h" // Length check. Is in part about not supplying malicious strings to file functions. diff --git a/src/xml/XMLWriter.cpp b/src/xml/XMLWriter.cpp index 52d8ca0af..c5b1bb33d 100644 --- a/src/xml/XMLWriter.cpp +++ b/src/xml/XMLWriter.cpp @@ -33,8 +33,6 @@ the general functionality for creating XML in UTF8 encoding. #include -#include "../Internat.h" - //table for xml encoding compatibility with expat decoding //see wxWidgets-2.8.12/src/expat/lib/xmltok_impl.h //and wxWidgets-2.8.12/src/expat/lib/asciitab.h