diff --git a/src/AColor.h b/src/AColor.h index 0c2281555..fb6c0b955 100644 --- a/src/AColor.h +++ b/src/AColor.h @@ -14,7 +14,7 @@ #ifndef __AUDACITY_COLOR__ #define __AUDACITY_COLOR__ -#include "MemoryX.h" +#include #include // member variable #include // member variable diff --git a/src/AboutDialog.h b/src/AboutDialog.h index 8c481a872..3ac74924e 100644 --- a/src/AboutDialog.h +++ b/src/AboutDialog.h @@ -11,7 +11,6 @@ #ifndef __AUDACITY_ABOUT_DLG__ #define __AUDACITY_ABOUT_DLG__ -#include "MemoryX.h" #include #include "widgets/wxPanelWrapper.h" // to inherit diff --git a/src/AdornedRulerPanel.h b/src/AdornedRulerPanel.h index 0af6c913a..7d2f95c35 100644 --- a/src/AdornedRulerPanel.h +++ b/src/AdornedRulerPanel.h @@ -14,8 +14,6 @@ #include "CellularPanel.h" #include "widgets/Ruler.h" // member variable -#include "MemoryX.h" - class ViewInfo; class AudacityProject; class SnapManager; diff --git a/src/AudacityApp.h b/src/AudacityApp.h index f5f15693d..7dc1cec36 100644 --- a/src/AudacityApp.h +++ b/src/AudacityApp.h @@ -19,7 +19,6 @@ #include "Experimental.h" -#include "MemoryX.h" #include // to inherit #include // for wxDIR_FILES #include // member variable diff --git a/src/AudacityHeaders.h b/src/AudacityHeaders.h index 66a4583fa..74d9d846f 100644 --- a/src/AudacityHeaders.h +++ b/src/AudacityHeaders.h @@ -53,23 +53,18 @@ #include "FileFormats.h" #include "FreqWindow.h" #include "ImageManipulation.h" -#include "Internat.h" #include "LabelTrack.h" #include "Mix.h" #include "NoteTrack.h" #include "Prefs.h" #include "Project.h" -#include "SampleFormat.h" #include "Sequence.h" #include "TimeTrack.h" -#include "Track.h" #include "UndoManager.h" -#include "ViewInfo.h" #include "WaveTrack.h" #include "widgets/ASlider.h" #include "widgets/ProgressDialog.h" #include "widgets/Ruler.h" -#include "xml/XMLTagHandler.h" // PRL: These lines allow you to remove Project.h above. // They must be included before the definition of macro NEW below. diff --git a/src/AudioIO.h b/src/AudioIO.h index 322361c61..6e20fbc49 100644 --- a/src/AudioIO.h +++ b/src/AudioIO.h @@ -19,8 +19,8 @@ #include "portaudio.h" -#include "MemoryX.h" #include +#include #include #include #include // member variable diff --git a/src/AutoRecovery.h b/src/AutoRecovery.h index 1be3c6128..a79072516 100644 --- a/src/AutoRecovery.h +++ b/src/AutoRecovery.h @@ -12,7 +12,6 @@ #define __AUDACITY_AUTORECOVERY__ #include "xml/XMLTagHandler.h" -#include "xml/XMLWriter.h" #include // member variables diff --git a/src/BlockFile.h b/src/BlockFile.h index ad5d30b31..cab8b5f20 100644 --- a/src/BlockFile.h +++ b/src/BlockFile.h @@ -12,8 +12,6 @@ #ifndef __AUDACITY_BLOCKFILE__ #define __AUDACITY_BLOCKFILE__ -#include "MemoryX.h" - #include "SampleFormat.h" #include "wxFileNameWrapper.h" // member variable diff --git a/src/CrossFade.h b/src/CrossFade.h index 1e10c4594..425d5d2b0 100644 --- a/src/CrossFade.h +++ b/src/CrossFade.h @@ -15,7 +15,6 @@ /// accepts a list of WaveClips and can do a mini-mixing /// to produce the desired crossfading -#include "SampleFormat.h" #include "WaveClip.h" diff --git a/src/DirManager.h b/src/DirManager.h index 022f3e704..62d853a02 100644 --- a/src/DirManager.h +++ b/src/DirManager.h @@ -11,8 +11,6 @@ #ifndef _DIRMANAGER_ #define _DIRMANAGER_ -#include "MemoryX.h" - #include "audacity/Types.h" #include "xml/XMLTagHandler.h" diff --git a/src/Envelope.h b/src/Envelope.h index 78afaf4e7..c65c4bbf4 100644 --- a/src/Envelope.h +++ b/src/Envelope.h @@ -16,7 +16,6 @@ #include #include "xml/XMLTagHandler.h" -#include "Internat.h" class wxRect; class wxMouseEvent; diff --git a/src/FFmpeg.h b/src/FFmpeg.h index 56611cffc..261559ab8 100644 --- a/src/FFmpeg.h +++ b/src/FFmpeg.h @@ -18,10 +18,6 @@ Describes shared object that is used to access FFmpeg libraries. #include "Audacity.h" // for USE_* macros -#include "MemoryX.h" - -#include "Internat.h" - #include "widgets/wxPanelWrapper.h" // to inherit #if defined(__WXMSW__) diff --git a/src/FileFormats.h b/src/FileFormats.h index 77d763fdf..d459c9e36 100644 --- a/src/FileFormats.h +++ b/src/FileFormats.h @@ -102,7 +102,6 @@ extern FileExtensions sf_get_all_extensions(); wxString sf_normalize_name(const char *name); // This function wrapper uses a mutex to serialize calls to the SndFile library. -#include "MemoryX.h" #include "ondemand/ODTaskThread.h" extern ODLock libSndFileMutex; template diff --git a/src/FreqWindow.h b/src/FreqWindow.h index 0ec316f9b..218cb5fed 100644 --- a/src/FreqWindow.h +++ b/src/FreqWindow.h @@ -11,7 +11,6 @@ #ifndef __AUDACITY_FREQ_WINDOW__ #define __AUDACITY_FREQ_WINDOW__ -#include "MemoryX.h" #include #include // member variable #include // to inherit diff --git a/src/LabelDialog.h b/src/LabelDialog.h index 8a3d3df62..91fdb959f 100644 --- a/src/LabelDialog.h +++ b/src/LabelDialog.h @@ -14,7 +14,6 @@ #include #include -#include "Internat.h" #include "widgets/wxPanelWrapper.h" // to inherit #include "audacity/ComponentInterface.h" // member variable diff --git a/src/Mix.h b/src/Mix.h index 975a0e237..6afe5869b 100644 --- a/src/Mix.h +++ b/src/Mix.h @@ -20,7 +20,6 @@ #ifndef __AUDACITY_MIX__ #define __AUDACITY_MIX__ -#include "MemoryX.h" #include "SampleFormat.h" #include diff --git a/src/Profiler.h b/src/Profiler.h index 41f3586a6..37a8ba4b5 100644 --- a/src/Profiler.h +++ b/src/Profiler.h @@ -26,7 +26,6 @@ but it will probably work fine if you use it on a high level. #ifndef __AUDACITY_PROFILER__ #define __AUDACITY_PROFILER__ -#include "MemoryX.h" #include #include #include "ondemand/ODTaskThread.h" diff --git a/src/Project.h b/src/Project.h index 62fb8d09f..5ed8eac77 100644 --- a/src/Project.h +++ b/src/Project.h @@ -29,7 +29,6 @@ #include "TrackPanelListener.h" #include "AudioIOListener.h" -#include "xml/XMLTagHandler.h" #include "toolbars/SelectionBarListener.h" #include "toolbars/SpectralSelectionBarListener.h" diff --git a/src/Resample.h b/src/Resample.h index bfd1466fe..0a9bf246e 100644 --- a/src/Resample.h +++ b/src/Resample.h @@ -14,8 +14,6 @@ #include "Audacity.h" -#include "MemoryX.h" - #include "SampleFormat.h" class EnumSetting; diff --git a/src/Sequence.h b/src/Sequence.h index 65338acfa..26dbb0040 100644 --- a/src/Sequence.h +++ b/src/Sequence.h @@ -11,12 +11,10 @@ #ifndef __AUDACITY_SEQUENCE__ #define __AUDACITY_SEQUENCE__ -#include "MemoryX.h" #include #include "SampleFormat.h" #include "xml/XMLTagHandler.h" -#include "xml/XMLWriter.h" #include "ondemand/ODTaskThread.h" #include "audacity/Types.h" diff --git a/src/Snap.h b/src/Snap.h index b1ceab01f..074625c92 100644 --- a/src/Snap.h +++ b/src/Snap.h @@ -18,7 +18,6 @@ #include #include #include "widgets/NumericTextCtrl.h" -#include "Internat.h" class AudacityProject; class Track; diff --git a/src/SplashDialog.h b/src/SplashDialog.h index 5e9454868..3b8e148f4 100644 --- a/src/SplashDialog.h +++ b/src/SplashDialog.h @@ -11,7 +11,6 @@ #ifndef __AUDACITY_SPLASH_DLG__ #define __AUDACITY_SPLASH_DLG__ -#include "MemoryX.h" #include "widgets/wxPanelWrapper.h" // to inherit class wxBitmap; diff --git a/src/Tags.h b/src/Tags.h index 9955799bf..c8721ae16 100644 --- a/src/Tags.h +++ b/src/Tags.h @@ -33,7 +33,6 @@ #include "xml/XMLTagHandler.h" -#include "MemoryX.h" #include #include "widgets/wxPanelWrapper.h" // to inherit diff --git a/src/TimeDialog.h b/src/TimeDialog.h index f59ffed05..9c9a9c24a 100644 --- a/src/TimeDialog.h +++ b/src/TimeDialog.h @@ -15,7 +15,6 @@ #include "widgets/NumericTextCtrl.h" // for NumericFormatSymbol #include "widgets/wxPanelWrapper.h" // to inherit -#include "Internat.h" class NumericTextCtrl; class ShuttleGui; diff --git a/src/Track.h b/src/Track.h index 0bb0d5fbd..76a089c1f 100644 --- a/src/Track.h +++ b/src/Track.h @@ -15,7 +15,6 @@ #include "Experimental.h" -#include "MemoryX.h" #include #include #include diff --git a/src/TrackPanel.h b/src/TrackPanel.h index 39196df78..df927807d 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -14,7 +14,6 @@ #include "Audacity.h" // for USE_* macros #include "Experimental.h" -#include "MemoryX.h" #include #include // for wxUSE_* macros diff --git a/src/TrackPanelResizeHandle.h b/src/TrackPanelResizeHandle.h index 18df6319b..223b6f63c 100644 --- a/src/TrackPanelResizeHandle.h +++ b/src/TrackPanelResizeHandle.h @@ -11,7 +11,6 @@ Paul Licameli split from TrackPanel.cpp #ifndef __AUDACITY_TRACK_PANEL_RESIZE_HANDLE__ #define __AUDACITY_TRACK_PANEL_RESIZE_HANDLE__ -#include "MemoryX.h" #include "UIHandle.h" class Track; diff --git a/src/UndoManager.h b/src/UndoManager.h index 1e96672f5..29d713c41 100644 --- a/src/UndoManager.h +++ b/src/UndoManager.h @@ -49,7 +49,6 @@ #ifndef __AUDACITY_UNDOMANAGER__ #define __AUDACITY_UNDOMANAGER__ -#include "MemoryX.h" #include #include // to declare custom event types #include "ondemand/ODTaskThread.h" diff --git a/src/WaveClip.h b/src/WaveClip.h index b1a2c51d1..10b5579bb 100644 --- a/src/WaveClip.h +++ b/src/WaveClip.h @@ -14,7 +14,6 @@ #include "Audacity.h" -#include "MemoryX.h" #include "SampleFormat.h" #include "ondemand/ODTaskThread.h" #include "xml/XMLTagHandler.h" diff --git a/src/WaveTrack.h b/src/WaveTrack.h index 20720f460..bcf682611 100644 --- a/src/WaveTrack.h +++ b/src/WaveTrack.h @@ -12,7 +12,6 @@ #define __AUDACITY_WAVETRACK__ #include "Track.h" -#include "SampleFormat.h" #include #include diff --git a/src/blockfile/LegacyAliasBlockFile.h b/src/blockfile/LegacyAliasBlockFile.h index 37cb1635c..6738ceb10 100644 --- a/src/blockfile/LegacyAliasBlockFile.h +++ b/src/blockfile/LegacyAliasBlockFile.h @@ -11,7 +11,6 @@ #ifndef __AUDACITY_LEGACYALIASBLOCKFILE__ #define __AUDACITY_LEGACYALIASBLOCKFILE__ -#include "../BlockFile.h" #include "PCMAliasBlockFile.h" /// An AliasBlockFile that references uncompressed data in an existing file diff --git a/src/blockfile/ODDecodeBlockFile.h b/src/blockfile/ODDecodeBlockFile.h index c0dbaa985..e67962c5a 100644 --- a/src/blockfile/ODDecodeBlockFile.h +++ b/src/blockfile/ODDecodeBlockFile.h @@ -28,8 +28,6 @@ Also, see ODPCMAliasBlockFile for a similar file. #define __AUDACITY_ODDecodeBlockFile__ #include "SimpleBlockFile.h" -#include "../BlockFile.h" -#include "../ondemand/ODTaskThread.h" #include "../ondemand/ODDecodeTask.h" #include // member variable diff --git a/src/blockfile/ODPCMAliasBlockFile.h b/src/blockfile/ODPCMAliasBlockFile.h index 105866413..5c0cf794b 100644 --- a/src/blockfile/ODPCMAliasBlockFile.h +++ b/src/blockfile/ODPCMAliasBlockFile.h @@ -37,8 +37,6 @@ Some of these methods have been overridden only because they used the unsafe wxL #define __AUDACITY_ODPCMALIASBLOCKFILE__ #include "PCMAliasBlockFile.h" -#include "../BlockFile.h" -#include "../ondemand/ODTaskThread.h" /// An AliasBlockFile that references uncompressed data in an existing file class ODPCMAliasBlockFile final : public PCMAliasBlockFile diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h index 0199db908..c17d15dad 100644 --- a/src/commands/AudacityCommand.h +++ b/src/commands/AudacityCommand.h @@ -13,16 +13,13 @@ #include "../Audacity.h" -#include "../MemoryX.h" #include -#include "../MemoryX.h" #include #include // to inherit #include "../widgets/wxPanelWrapper.h" // to inherit -#include "../Internat.h" #include "../include/audacity/ComponentInterface.h" #include "../include/audacity/EffectAutomationParameters.h" // for command automation diff --git a/src/commands/Command.h b/src/commands/Command.h index 2152c0a89..f2501e96a 100644 --- a/src/commands/Command.h +++ b/src/commands/Command.h @@ -17,9 +17,6 @@ #ifndef __COMMAND__ #define __COMMAND__ -#include "../MemoryX.h" - -#include "CommandMisc.h" #include "CommandSignature.h" #include "../commands/AudacityCommand.h" diff --git a/src/commands/CommandContext.h b/src/commands/CommandContext.h index 8f2eb3f4b..c80502411 100644 --- a/src/commands/CommandContext.h +++ b/src/commands/CommandContext.h @@ -12,7 +12,6 @@ #define __AUDACITY_COMMAND_CONTEXT__ #include "audacity/Types.h" -#include "../MemoryX.h" #include "Command.h" class AudacityProject; diff --git a/src/commands/CommandDirectory.h b/src/commands/CommandDirectory.h index e097ce9e4..2122f4bed 100644 --- a/src/commands/CommandDirectory.h +++ b/src/commands/CommandDirectory.h @@ -23,8 +23,6 @@ they are kept separate to make things simpler. #ifndef __COMMANDDIRECTORY__ #define __COMMANDDIRECTORY__ -#include "../MemoryX.h" -#include "CommandMisc.h" #include "CommandType.h" class CommandOutputTargets; diff --git a/src/commands/CommandFunctors.h b/src/commands/CommandFunctors.h index 6449e57d0..167213d2a 100644 --- a/src/commands/CommandFunctors.h +++ b/src/commands/CommandFunctors.h @@ -9,7 +9,6 @@ #ifndef __AUDACITY_COMMAND_FUNCTORS__ #define __AUDACITY_COMMAND_FUNCTORS__ -#include "../MemoryX.h" #include "Command.h" class AudacityProject; diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h index 1026fcbe6..5387ef4a3 100644 --- a/src/commands/CommandManager.h +++ b/src/commands/CommandManager.h @@ -19,7 +19,6 @@ #include "CommandFunctors.h" #include "CommandFlag.h" -#include "../MemoryX.h" #include "Keyboard.h" #include diff --git a/src/commands/CommandTargets.h b/src/commands/CommandTargets.h index a4ea97f04..2275de989 100644 --- a/src/commands/CommandTargets.h +++ b/src/commands/CommandTargets.h @@ -156,7 +156,7 @@ public: #if 0 -#include "../widgets/ProgressDialog.h" // Member variable +//#include "../widgets/ProgressDialog.h" // Member variable /// Sends command progress information to a ProgressDialog class GUIProgressTarget final : public CommandProgressTarget diff --git a/src/commands/CommandType.h b/src/commands/CommandType.h index 18a89b561..9fb343b2a 100644 --- a/src/commands/CommandType.h +++ b/src/commands/CommandType.h @@ -16,9 +16,7 @@ #ifndef __COMMANDTYPE__ #define __COMMANDTYPE__ -#include "CommandMisc.h" #include "CommandSignature.h" -#include "../MemoryX.h" #include "../commands/AudacityCommand.h" class OldStyleCommand; diff --git a/src/commands/ScreenshotCommand.h b/src/commands/ScreenshotCommand.h index 4fd327b97..f7e1a82ce 100644 --- a/src/commands/ScreenshotCommand.h +++ b/src/commands/ScreenshotCommand.h @@ -14,7 +14,6 @@ #define __SCREENSHOT_COMMAND__ #include "Command.h" -#include "../commands/AudacityCommand.h" #include // member variable diff --git a/src/commands/SetClipCommand.h b/src/commands/SetClipCommand.h index 4f118b205..4c9b6a13f 100644 --- a/src/commands/SetClipCommand.h +++ b/src/commands/SetClipCommand.h @@ -16,8 +16,6 @@ #ifndef __SET_CLIP_COMMAND__ #define __SET_CLIP_COMMAND__ -#include "Command.h" -#include "CommandType.h" #include "SetTrackInfoCommand.h" #define SET_CLIP_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Set Clip") } diff --git a/src/commands/SetEnvelopeCommand.h b/src/commands/SetEnvelopeCommand.h index e5b058fc2..6b365fa10 100644 --- a/src/commands/SetEnvelopeCommand.h +++ b/src/commands/SetEnvelopeCommand.h @@ -16,8 +16,6 @@ #ifndef __SET_ENVELOPE_COMMAND__ #define __SET_ENVELOPE_COMMAND__ -#include "Command.h" -#include "CommandType.h" #include "SetTrackInfoCommand.h" #define SET_ENVELOPE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Set Envelope") } diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h index 8d1772ae9..a1a3aa4ee 100644 --- a/src/effects/Compressor.h +++ b/src/effects/Compressor.h @@ -12,7 +12,6 @@ #define __AUDACITY_EFFECT_COMPRESSOR__ #include "TwoPassSimpleMono.h" -#include "../SampleFormat.h" class wxCheckBox; class wxSlider; diff --git a/src/effects/Echo.h b/src/effects/Echo.h index c0fc1dec0..f2084abb6 100644 --- a/src/effects/Echo.h +++ b/src/effects/Echo.h @@ -13,7 +13,6 @@ #define __AUDACITY_EFFECT_ECHO__ #include "Effect.h" -#include "../SampleFormat.h" class ShuttleGui; diff --git a/src/effects/Effect.h b/src/effects/Effect.h index 1f5382792..2f41d3274 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -16,10 +16,8 @@ #include "../Experimental.h" -#include "../MemoryX.h" #include -#include "../MemoryX.h" #include class wxButton; @@ -31,9 +29,7 @@ class wxWindow; #include "audacity/ConfigInterface.h" #include "audacity/EffectInterface.h" -#include "../SampleFormat.h" #include "../SelectedRegion.h" -#include "../Internat.h" #include "../Track.h" diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index 2608f406d..0afb6bbc6 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -20,9 +20,7 @@ #include // for wxUSE_* macros #include "Effect.h" -#include "../xml/XMLTagHandler.h" #include "../RealFFTf.h" -#include "../SampleFormat.h" #define EQUALIZATION_PLUGIN_SYMBOL \ ComponentInterfaceSymbol{ XO("Equalization") } diff --git a/src/effects/NoiseReduction.h b/src/effects/NoiseReduction.h index b87e3c1d9..6fc8614d4 100644 --- a/src/effects/NoiseReduction.h +++ b/src/effects/NoiseReduction.h @@ -15,8 +15,6 @@ #include "Effect.h" -#include "../MemoryX.h" - #define NOISEREDUCTION_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Noise Reduction") } class EffectNoiseReduction final : public Effect { diff --git a/src/effects/NoiseRemoval.h b/src/effects/NoiseRemoval.h index a6dee084e..47c0595b8 100644 --- a/src/effects/NoiseRemoval.h +++ b/src/effects/NoiseRemoval.h @@ -20,9 +20,6 @@ #include "Effect.h" -#include "../MemoryX.h" -#include "../SampleFormat.h" - class wxButton; class wxSizer; class wxSlider; diff --git a/src/effects/ladspa/LadspaEffect.h b/src/effects/ladspa/LadspaEffect.h index 68a70ca30..b2af1d0cc 100644 --- a/src/effects/ladspa/LadspaEffect.h +++ b/src/effects/ladspa/LadspaEffect.h @@ -13,7 +13,6 @@ class wxStaticText; class wxTextCtrl; class wxCheckBox; -#include "../../MemoryX.h" #include // member variable #include "audacity/EffectInterface.h" diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h index 2b1dabfb2..6d0993122 100644 --- a/src/effects/lv2/LV2Effect.h +++ b/src/effects/lv2/LV2Effect.h @@ -15,7 +15,6 @@ class wxArrayString; -#include "../../MemoryX.h" #include #include "lv2/lv2plug.in/ns/ext/atom/forge.h" diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h index 9504a5851..d3b406be8 100644 --- a/src/effects/vamp/VampEffect.h +++ b/src/effects/vamp/VampEffect.h @@ -17,7 +17,6 @@ #include -#include "../../SampleFormat.h" #include "../Effect.h" class wxStaticText; diff --git a/src/export/Export.h b/src/export/Export.h index 055e33cd1..10d39757f 100644 --- a/src/export/Export.h +++ b/src/export/Export.h @@ -11,7 +11,6 @@ #ifndef __AUDACITY_EXPORT__ #define __AUDACITY_EXPORT__ -#include "../MemoryX.h" #include #include // member variable #include "../SampleFormat.h" diff --git a/src/import/FormatClassifier.h b/src/import/FormatClassifier.h index a233bd9fd..03a7585f4 100644 --- a/src/import/FormatClassifier.h +++ b/src/import/FormatClassifier.h @@ -12,7 +12,6 @@ #define __AUDACITY_FORMATCLASSIFIER_H_ #include -#include "../SampleFormat.h" #include "MultiFormatReader.h" #include "SpecPowerMeter.h" diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h index 559844acf..1ee2409d7 100644 --- a/src/import/ImportPlugin.h +++ b/src/import/ImportPlugin.h @@ -59,7 +59,6 @@ but little else. #include "audacity/Types.h" #include "../Internat.h" -#include "../MemoryX.h" #include "ImportRaw.h" // defines TrackHolders diff --git a/src/ondemand/ODComputeSummaryTask.h b/src/ondemand/ODComputeSummaryTask.h index 9dca4ae55..2821aa8ea 100644 --- a/src/ondemand/ODComputeSummaryTask.h +++ b/src/ondemand/ODComputeSummaryTask.h @@ -21,7 +21,6 @@ updating the ODPCMAliasBlockFile and the GUI of the newly available data. #include #include "ODTask.h" -#include "ODTaskThread.h" #include "../Internat.h" class ODPCMAliasBlockFile; class WaveTrack; diff --git a/src/ondemand/ODDecodeFFmpegTask.h b/src/ondemand/ODDecodeFFmpegTask.h index 05cd65f6c..b01c03269 100644 --- a/src/ondemand/ODDecodeFFmpegTask.h +++ b/src/ondemand/ODDecodeFFmpegTask.h @@ -14,14 +14,11 @@ #include "../Experimental.h" -#include "../MemoryX.h" - #ifdef EXPERIMENTAL_OD_FFMPEG #include "../import/ImportRaw.h" // for TrackHolders #include #include "ODDecodeTask.h" -#include "ODTaskThread.h" struct streamContext; using Scs = ArrayOf>; diff --git a/src/ondemand/ODDecodeFlacTask.h b/src/ondemand/ODDecodeFlacTask.h index e44a02e8b..86ffd2e24 100644 --- a/src/ondemand/ODDecodeFlacTask.h +++ b/src/ondemand/ODDecodeFlacTask.h @@ -31,7 +31,6 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o #include #include // data member #include "ODDecodeTask.h" -#include "ODTaskThread.h" #include "FLAC++/decoder.h" diff --git a/src/ondemand/ODDecodeTask.h b/src/ondemand/ODDecodeTask.h index dffcf113e..a9859732a 100644 --- a/src/ondemand/ODDecodeTask.h +++ b/src/ondemand/ODDecodeTask.h @@ -28,10 +28,8 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o #ifndef __AUDACITY_ODDecodeTask__ #define __AUDACITY_ODDecodeTask__ -#include "../MemoryX.h" #include #include "ODTask.h" -#include "ODTaskThread.h" #include "../Internat.h" class ODDecodeBlockFile; class WaveTrack; diff --git a/src/ondemand/ODTask.h b/src/ondemand/ODTask.h index 23801a5ad..4349f0cef 100644 --- a/src/ondemand/ODTask.h +++ b/src/ondemand/ODTask.h @@ -23,10 +23,8 @@ in a background thread. #ifndef __AUDACITY_ODTASK__ #define __AUDACITY_ODTASK__ -#include "ODTaskThread.h" #include "../BlockFile.h" -#include "../MemoryX.h" #include #include // to declare custom event type class AudacityProject; diff --git a/src/ondemand/ODWaveTrackTaskQueue.h b/src/ondemand/ODWaveTrackTaskQueue.h index dbd239721..5f22ae7d3 100644 --- a/src/ondemand/ODWaveTrackTaskQueue.h +++ b/src/ondemand/ODWaveTrackTaskQueue.h @@ -22,7 +22,6 @@ tasks associated with a WaveTrack. #ifndef __AUDACITY_ODWAVETRACKTASKQUEUE__ #define __AUDACITY_ODWAVETRACKTASKQUEUE__ -#include "../MemoryX.h" #include #include "ODTaskThread.h" class Track; diff --git a/src/prefs/PrefsDialog.h b/src/prefs/PrefsDialog.h index 4945ce032..cdb5afdcd 100644 --- a/src/prefs/PrefsDialog.h +++ b/src/prefs/PrefsDialog.h @@ -15,7 +15,6 @@ #include #include #include "../widgets/wxPanelWrapper.h" // to inherit -#include "../Internat.h" class wxTreebook; class wxTreeEvent; diff --git a/src/toolbars/ControlToolBar.h b/src/toolbars/ControlToolBar.h index d791007bc..a3f45da7d 100644 --- a/src/toolbars/ControlToolBar.h +++ b/src/toolbars/ControlToolBar.h @@ -14,9 +14,7 @@ #ifndef __AUDACITY_CONTROL_TOOLBAR__ #define __AUDACITY_CONTROL_TOOLBAR__ -#include "../MemoryX.h" #include "ToolBar.h" -#include "../Theme.h" class wxBoxSizer; class wxCommandEvent; diff --git a/src/toolbars/DeviceToolBar.h b/src/toolbars/DeviceToolBar.h index 71c38c5ee..5c996a014 100644 --- a/src/toolbars/DeviceToolBar.h +++ b/src/toolbars/DeviceToolBar.h @@ -11,7 +11,6 @@ #ifndef __AUDACITY_DEVICE_TOOLBAR__ #define __AUDACITY_DEVICE_TOOLBAR__ -#include "../MemoryX.h" #include #include "ToolBar.h" diff --git a/src/toolbars/EditToolBar.h b/src/toolbars/EditToolBar.h index bc7918d5a..a81dc1bea 100644 --- a/src/toolbars/EditToolBar.h +++ b/src/toolbars/EditToolBar.h @@ -19,7 +19,6 @@ #include #include "ToolBar.h" -#include "../Theme.h" class wxCommandEvent; class wxDC; diff --git a/src/toolbars/MixerToolBar.h b/src/toolbars/MixerToolBar.h index 215657f64..90da18a04 100644 --- a/src/toolbars/MixerToolBar.h +++ b/src/toolbars/MixerToolBar.h @@ -11,7 +11,6 @@ #ifndef __AUDACITY_MIXER_TOOLBAR__ #define __AUDACITY_MIXER_TOOLBAR__ -#include "../MemoryX.h" #include "ToolBar.h" class wxSize; diff --git a/src/toolbars/ScrubbingToolBar.h b/src/toolbars/ScrubbingToolBar.h index 7c9f99a88..08e855f9f 100644 --- a/src/toolbars/ScrubbingToolBar.h +++ b/src/toolbars/ScrubbingToolBar.h @@ -17,7 +17,6 @@ #include #include "ToolBar.h" -#include "../Theme.h" class wxCommandEvent; class wxDC; diff --git a/src/toolbars/ToolDock.h b/src/toolbars/ToolDock.h index 996efd0b4..0c152b7f9 100644 --- a/src/toolbars/ToolDock.h +++ b/src/toolbars/ToolDock.h @@ -14,7 +14,6 @@ #define __AUDACITY_TOOLDOCK__ #include -#include "../MemoryX.h" // for std::move #include #include "ToolBar.h" diff --git a/src/toolbars/ToolManager.h b/src/toolbars/ToolManager.h index c779fa065..84d70a52a 100644 --- a/src/toolbars/ToolManager.h +++ b/src/toolbars/ToolManager.h @@ -13,14 +13,12 @@ #ifndef __AUDACITY_TOOLMANAGER__ #define __AUDACITY_TOOLMANAGER__ -#include "../MemoryX.h" #include #include // to inherit #include // to inherit #include // member variable #include "ToolDock.h" -#include "ToolBar.h" class wxCommandEvent; class wxFrame; diff --git a/src/toolbars/ToolsToolBar.h b/src/toolbars/ToolsToolBar.h index a50cab94a..a881d0d45 100644 --- a/src/toolbars/ToolsToolBar.h +++ b/src/toolbars/ToolsToolBar.h @@ -18,8 +18,6 @@ #include "ToolBar.h" -#include "../Theme.h" - class wxCommandEvent; class wxDC; class wxGridSizer; diff --git a/src/toolbars/TranscriptionToolBar.h b/src/toolbars/TranscriptionToolBar.h index c03f2c1e8..0ccb97acd 100644 --- a/src/toolbars/TranscriptionToolBar.h +++ b/src/toolbars/TranscriptionToolBar.h @@ -17,11 +17,9 @@ #include "ToolBar.h" -#include "../MemoryX.h" #include // member variable #include "audacity/Types.h" -#include "../Theme.h" class wxChoice; class wxCommandEvent; diff --git a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h index 6da34ff86..71927e527 100644 --- a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h +++ b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_LABEL_DEFAULT_CLICK_HANDLE__ #include "../../../UIHandle.h" -#include "../../../MemoryX.h" class wxMouseEvent; class LabelTrack; diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.h b/src/tracks/labeltrack/ui/LabelGlyphHandle.h index b83f46d81..a45655931 100644 --- a/src/tracks/labeltrack/ui/LabelGlyphHandle.h +++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_LABEL_GLYPH_HANDLE__ #include "LabelDefaultClickHandle.h" -#include "../../../MemoryX.h" class wxMouseState; class LabelTrack; diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.h b/src/tracks/labeltrack/ui/LabelTextHandle.h index 0d1b80a6c..db568ce0c 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.h +++ b/src/tracks/labeltrack/ui/LabelTextHandle.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_LABEL_TEXT_HANDLE__ #include "LabelDefaultClickHandle.h" -#include "../../../MemoryX.h" #include "../../../SelectedRegion.h" class wxMouseState; diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h index 56d4ddb1f..ca9eb5aad 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h @@ -14,7 +14,6 @@ Paul Licameli split from TrackPanel.cpp class wxMouseState; class NoteTrack; -#include "../../../../MemoryX.h" #include "../../../../UIHandle.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h index 84a378c9b..b75d851d6 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_NOTE_TRACK_CONTROLS__ #include "../../../ui/TrackControls.h" -#include "../../../../MemoryX.h" class MuteButtonHandle; class SoloButtonHandle; class NoteTrackButtonHandle; diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h index 14a03ed17..479b6ca86 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h @@ -14,7 +14,6 @@ Paul Licameli split from TrackPanel.cpp class wxMouseState; class NoteTrack; -#include "../../../../MemoryX.h" #include "../../../../UIHandle.h" class NoteTrackVZoomHandle : public UIHandle diff --git a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h index 82d210440..1592e5039 100644 --- a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h @@ -13,8 +13,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../UIHandle.h" -#include "../../../../MemoryX.h" - class Alg_seq; class NoteTrack; class Track; diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h index da08da2b6..3d7835372 100644 --- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h @@ -11,9 +11,7 @@ Paul Licameli #ifndef __AUDACITY_CUTLINE_HANDLE__ #define __AUDACITY_CUTLINE_HANDLE__ -#include "../../../../MemoryX.h" #include "../../../../UIHandle.h" -#include "../../../../MemoryX.h" #include "../../../../WaveTrackLocation.h" class wxMouseEvent; diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h index 8bb74f744..13793d9d6 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h @@ -13,7 +13,6 @@ Paul Licameli #include "../../../../UIHandle.h" #include "audacity/Types.h" -#include "../../../../MemoryX.h" class wxMouseEvent; class wxMouseState; diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h index bee59773e..8c45ffbbc 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h @@ -13,7 +13,6 @@ Paul Licameli split from TrackPanel.cpp class wxMouseState; class WaveTrack; -#include "../../../../MemoryX.h" #include "../../../../UIHandle.h" diff --git a/src/tracks/ui/BackgroundCell.h b/src/tracks/ui/BackgroundCell.h index c9810822e..1b0bec329 100644 --- a/src/tracks/ui/BackgroundCell.h +++ b/src/tracks/ui/BackgroundCell.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_BACKGROUND_CELL__ #include "CommonTrackPanelCell.h" -#include "../../MemoryX.h" class AudacityProject; diff --git a/src/tracks/ui/ButtonHandle.h b/src/tracks/ui/ButtonHandle.h index 04a33f4ac..b4384c813 100644 --- a/src/tracks/ui/ButtonHandle.h +++ b/src/tracks/ui/ButtonHandle.h @@ -12,7 +12,6 @@ Paul Licameli #define __AUDACITY_BUTTON_HANDLE__ #include "../../UIHandle.h" -#include "../../MemoryX.h" class wxMouseEvent; class wxMouseState; diff --git a/src/tracks/ui/CommonTrackPanelCell.h b/src/tracks/ui/CommonTrackPanelCell.h index 41dade441..362150fa1 100644 --- a/src/tracks/ui/CommonTrackPanelCell.h +++ b/src/tracks/ui/CommonTrackPanelCell.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_COMMON_TRACK_PANEL_CELL__ #include "../../TrackPanelCell.h" -#include "../../MemoryX.h" #include class Track; diff --git a/src/tracks/ui/EnvelopeHandle.h b/src/tracks/ui/EnvelopeHandle.h index e887d87f8..e3139c7a9 100644 --- a/src/tracks/ui/EnvelopeHandle.h +++ b/src/tracks/ui/EnvelopeHandle.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_ENVELOPE_HANDLE__ #include "../../UIHandle.h" -#include "../../MemoryX.h" #include diff --git a/src/tracks/ui/Scrubbing.h b/src/tracks/ui/Scrubbing.h index 28235c603..6f95b6564 100644 --- a/src/tracks/ui/Scrubbing.h +++ b/src/tracks/ui/Scrubbing.h @@ -13,12 +13,10 @@ Paul Licameli split from TrackPanel.cpp #include "../../Experimental.h" -#include "../../MemoryX.h" #include #include #include "../../widgets/Overlay.h" // to inherit -#include "../../commands/CommandFunctors.h" #include "../../commands/CommandContext.h" #include "../../commands/CommandManager.h" // for MenuTable #include "../../../include/audacity/Types.h" diff --git a/src/tracks/ui/SelectHandle.h b/src/tracks/ui/SelectHandle.h index 6cba35b62..c3e18eea6 100644 --- a/src/tracks/ui/SelectHandle.h +++ b/src/tracks/ui/SelectHandle.h @@ -15,7 +15,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../SelectedRegion.h" #include "../../Snap.h" -#include "../../MemoryX.h" #include class SelectionStateChanger; diff --git a/src/tracks/ui/SliderHandle.h b/src/tracks/ui/SliderHandle.h index b27a9e637..981875f4e 100644 --- a/src/tracks/ui/SliderHandle.h +++ b/src/tracks/ui/SliderHandle.h @@ -11,7 +11,6 @@ Paul Licameli #ifndef __AUDACITY_SLIDER_HANDLE__ #define __AUDACITY_SLIDER_HANDLE__ -#include "../../MemoryX.h" #include "../../UIHandle.h" class wxMouseEvent; diff --git a/src/tracks/ui/TimeShiftHandle.h b/src/tracks/ui/TimeShiftHandle.h index 782ce7a83..ee671a26f 100644 --- a/src/tracks/ui/TimeShiftHandle.h +++ b/src/tracks/ui/TimeShiftHandle.h @@ -13,8 +13,6 @@ Paul Licameli #include "../../UIHandle.h" -#include "../../MemoryX.h" - #include "../../Snap.h" #include "../../Track.h" diff --git a/src/tracks/ui/TrackControls.h b/src/tracks/ui/TrackControls.h index cf7c36e21..940521502 100644 --- a/src/tracks/ui/TrackControls.h +++ b/src/tracks/ui/TrackControls.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_TRACK_CONTROLS__ #include "CommonTrackPanelCell.h" -#include "../../MemoryX.h" class PopupMenuTable; class Track; diff --git a/src/tracks/ui/TrackSelectHandle.h b/src/tracks/ui/TrackSelectHandle.h index 4805c39fd..cbca1a382 100644 --- a/src/tracks/ui/TrackSelectHandle.h +++ b/src/tracks/ui/TrackSelectHandle.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_TRACK_SELECT_HANDLE__ #include "../../UIHandle.h" -#include "../../MemoryX.h" class wxMouseEvent; class Track; diff --git a/src/tracks/ui/TrackVRulerControls.h b/src/tracks/ui/TrackVRulerControls.h index 469ba3983..7e3f2e10e 100644 --- a/src/tracks/ui/TrackVRulerControls.h +++ b/src/tracks/ui/TrackVRulerControls.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_TRACK_VRULER_CONTROLS__ #include "CommonTrackPanelCell.h" -#include "../../MemoryX.h" class Track; class wxDC; diff --git a/src/widgets/AButton.h b/src/widgets/AButton.h index 28731ca2b..a43ccd2e1 100644 --- a/src/widgets/AButton.h +++ b/src/widgets/AButton.h @@ -12,7 +12,6 @@ #ifndef __AUDACITY_BUTTON__ #define __AUDACITY_BUTTON__ -#include "../MemoryX.h" #include #include // for wxUSE_* macros diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h index 30030c5a1..45a08c5f0 100644 --- a/src/widgets/ASlider.h +++ b/src/widgets/ASlider.h @@ -13,7 +13,6 @@ #ifndef __AUDACITY_SLIDER__ #define __AUDACITY_SLIDER__ -#include "../MemoryX.h" #include // for wxUSE_* macros #include #include // member variable diff --git a/src/widgets/BackedPanel.h b/src/widgets/BackedPanel.h index bdfc0419d..843606b62 100644 --- a/src/widgets/BackedPanel.h +++ b/src/widgets/BackedPanel.h @@ -9,7 +9,6 @@ #ifndef __AUDACITY_BACKED_PANEL__ #define __AUDACITY_BACKED_PANEL__ -#include "../MemoryX.h" #include // member variable #include "wxPanelWrapper.h" // to inherit diff --git a/src/widgets/ExpandingToolBar.h b/src/widgets/ExpandingToolBar.h index 92fe4f367..75a5f9b88 100644 --- a/src/widgets/ExpandingToolBar.h +++ b/src/widgets/ExpandingToolBar.h @@ -11,7 +11,6 @@ #ifndef __AUDACITY_EXPANDING_TOOL_BAR__ #define __AUDACITY_EXPANDING_TOOL_BAR__ -#include "../MemoryX.h" #include #include #include // use macros and typedefs in this header @@ -19,7 +18,6 @@ #include // to inherit #include "ImageRoll.h" -#include "wxPanelWrapper.h" // to inherit #include diff --git a/src/widgets/Grid.h b/src/widgets/Grid.h index 92f5feafa..5ffc2dffa 100644 --- a/src/widgets/Grid.h +++ b/src/widgets/Grid.h @@ -11,13 +11,11 @@ #ifndef __AUDACITY_WIDGETS_GRID__ #define __AUDACITY_WIDGETS_GRID__ -#include "../MemoryX.h" #include #include // for wxUSE_* macros #include #include // to inherit wxGridCellEditor #include "NumericTextCtrl.h" -#include "../Internat.h" #if wxUSE_ACCESSIBILITY class GridAx; diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h index e2fcb946f..12dec88e4 100644 --- a/src/widgets/ProgressDialog.h +++ b/src/widgets/ProgressDialog.h @@ -20,7 +20,6 @@ #include "../Audacity.h" -#include "../MemoryX.h" #include #include #include // member variable