From 173a300427031408dbcbdb75acf839135c03d4e3 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 10 Nov 2018 21:40:37 -0500 Subject: [PATCH] Include nothing before Audacity.h, as comments say we should... ... and remove some duplicated inclusions --- src/AColor.cpp | 1 + src/AudacityApp.cpp | 3 ++- src/AudacityLogger.cpp | 1 + src/AudioIO.cpp | 1 + src/AudioIO.h | 3 ++- src/AutoRecovery.cpp | 3 ++- src/CellularPanel.cpp | 1 + src/DeviceChange.h | 1 + src/DeviceManager.cpp | 3 ++- src/Diags.cpp | 1 + src/DirManager.cpp | 1 + src/FFT.cpp | 1 + src/FFmpeg.cpp | 1 + src/FFmpeg.h | 3 ++- src/FileException.cpp | 1 + src/FileFormats.cpp | 1 + src/FileFormats.h | 3 ++- src/FileNames.h | 1 - src/HelpText.cpp | 4 +++- src/ImageManipulation.cpp | 3 ++- src/InconsistencyException.cpp | 1 + src/Internat.h | 3 ++- src/LabelTrack.cpp | 1 + src/MixerBoard.cpp | 1 + src/ModuleManager.cpp | 3 ++- src/NoteTrack.cpp | 1 + src/NoteTrack.h | 3 ++- src/PitchName.cpp | 3 ++- src/PluginManager.cpp | 4 ++-- src/Prefs.h | 1 + src/Profiler.cpp | 1 + src/Project.h | 1 + src/RealFFTf.cpp | 1 + src/RealFFTf.h | 1 + src/RealFFTf48x.cpp | 2 ++ src/Registrar.h | 1 + src/SampleFormat.h | 1 + src/SelectedRegion.h | 1 + src/SelectionState.cpp | 1 + src/ShuttleGui.cpp | 1 + src/Tags.h | 1 + src/TimeTrack.cpp | 1 + src/TimerRecordDialog.cpp | 1 + src/TrackArtist.cpp | 1 + src/TrackPanel.cpp | 1 + src/TrackPanelResizeHandle.cpp | 1 + src/UIHandle.cpp | 1 + src/VoiceKey.cpp | 2 +- src/WaveClip.h | 1 + src/WrappedType.cpp | 1 + src/blockfile/NotYetAvailableException.cpp | 1 + src/blockfile/SilentBlockFile.cpp | 1 + src/commands/AppCommandEvent.h | 3 ++- src/commands/AudacityCommand.h | 1 + src/commands/BatchEvalCommand.cpp | 1 + src/commands/Command.cpp | 1 + src/commands/CommandBuilder.cpp | 1 + src/commands/CommandContext.cpp | 1 + src/commands/CommandDirectory.cpp | 1 + src/commands/CommandHandler.cpp | 1 + src/commands/CommandManager.cpp | 3 ++- src/commands/CommandSignature.cpp | 1 + src/commands/CommandTargets.cpp | 1 + src/commands/CommandType.cpp | 1 + src/commands/CompareAudioCommand.cpp | 1 + src/commands/DragCommand.cpp | 1 + src/commands/GetInfoCommand.cpp | 1 + src/commands/GetTrackInfoCommand.cpp | 1 + src/commands/HelpCommand.cpp | 1 + src/commands/ImportExportCommands.cpp | 1 + src/commands/LoadCommands.cpp | 1 + src/commands/MessageCommand.cpp | 1 + src/commands/OpenSaveCommands.cpp | 1 + src/commands/PreferenceCommands.cpp | 1 + src/commands/ScreenshotCommand.cpp | 1 + src/commands/ScriptCommandRelay.h | 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/DtmfGen.cpp | 1 + src/effects/Effect.h | 1 + src/effects/EffectRack.cpp | 1 + src/effects/Equalization48x.cpp | 1 + src/effects/LoadEffects.cpp | 1 + src/effects/NoiseReduction.cpp | 1 + src/effects/NoiseRemoval.cpp | 1 + src/effects/Reverb.cpp | 1 - src/effects/ScoreAlignDialog.cpp | 1 + src/effects/TwoPassSimpleMono.cpp | 1 - src/effects/VST/VSTControlOSX.mm | 1 + src/effects/VST/VSTEffect.cpp | 1 - src/effects/audiounits/AUControl.mm | 1 + src/export/ExportCL.cpp | 1 + src/export/ExportFFmpeg.cpp | 1 + src/export/ExportFFmpegDialogs.cpp | 1 + src/export/ExportFFmpegDialogs.h | 1 + src/import/ImportGStreamer.cpp | 1 + src/import/ImportPCM.cpp | 1 + src/import/ImportPlugin.h | 1 + src/import/ImportQT.cpp | 1 + src/import/RawAudioGuess.cpp | 1 + src/menus/NavigationMenus.cpp | 1 + src/menus/WindowMenus.cpp | 1 + src/ondemand/ODDecodeTask.cpp | 1 + src/ondemand/ODManager.cpp | 1 + src/ondemand/ODTaskThread.h | 4 +++- src/ondemand/ODWaveTrackTaskQueue.cpp | 1 + src/prefs/ExtImportPrefs.cpp | 1 - src/prefs/KeyConfigPrefs.cpp | 1 + src/prefs/MidiIOPrefs.cpp | 1 + src/prefs/MousePrefs.cpp | 1 + src/prefs/RecordingPrefs.cpp | 1 + src/prefs/SpectrogramSettings.cpp | 1 + src/prefs/WaveformPrefs.cpp | 1 + src/prefs/WaveformSettings.cpp | 1 + src/toolbars/ControlToolBar.cpp | 3 ++- src/toolbars/ScrubbingToolBar.cpp | 1 + src/toolbars/ToolDock.cpp | 1 + src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp | 1 + src/tracks/labeltrack/ui/LabelGlyphHandle.cpp | 1 + src/tracks/labeltrack/ui/LabelTextHandle.cpp | 1 + src/tracks/labeltrack/ui/LabelTrackControls.cpp | 1 + src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp | 1 + src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp | 1 + src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp | 1 + src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp | 1 + .../playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp | 1 + .../playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp | 1 + src/tracks/timetrack/ui/TimeTrackControls.cpp | 1 + src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp | 1 + src/tracks/ui/CommonTrackPanelCell.cpp | 1 + src/tracks/ui/EditCursorOverlay.cpp | 1 + src/tracks/ui/EnvelopeHandle.cpp | 1 + src/tracks/ui/Scrubbing.cpp | 1 + src/tracks/ui/SliderHandle.cpp | 1 + src/tracks/ui/TimeShiftHandle.cpp | 1 + src/tracks/ui/TrackControls.cpp | 1 + src/tracks/ui/TrackSelectHandle.cpp | 1 + src/tracks/ui/TrackVRulerControls.cpp | 1 + src/widgets/ErrorDialog.h | 1 + src/widgets/HelpSystem.h | 1 + src/widgets/LinkingHtmlWindow.cpp | 4 ++-- src/widgets/MultiDialog.cpp | 1 + src/widgets/NumericTextCtrl.cpp | 1 + src/widgets/NumericTextCtrl.h | 3 ++- src/widgets/OverlayPanel.cpp | 1 + src/widgets/Warning.cpp | 1 - src/widgets/Warning.h | 1 + src/widgets/numformatter.cpp | 3 ++- src/widgets/valnum.cpp | 3 ++- src/widgets/wxPanelWrapper.cpp | 1 + src/xml/XMLTagHandler.h | 1 + src/xml/XMLWriter.cpp | 1 + 156 files changed, 174 insertions(+), 30 deletions(-) diff --git a/src/AColor.cpp b/src/AColor.cpp index 01c27cc90..b263faa3a 100644 --- a/src/AColor.cpp +++ b/src/AColor.cpp @@ -18,6 +18,7 @@ It is also a place to document colour usage policy in Audacity *//********************************************************************/ #include "Audacity.h" + #include #include #include diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index 29a0e8037..cb0939ce5 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -15,13 +15,14 @@ It handles initialization and termination by subclassing wxApp. *//*******************************************************************/ +#include "Audacity.h" // This should always be included first + #if 0 // This may be used to debug memory leaks. // See: Visual Leak Dectector @ http://vld.codeplex.com/ #include #endif -#include "Audacity.h" // This should always be included first #include "AudacityApp.h" #include "TranslatableStringArray.h" diff --git a/src/AudacityLogger.cpp b/src/AudacityLogger.cpp index e96ed9f5e..5af6e59d8 100644 --- a/src/AudacityLogger.cpp +++ b/src/AudacityLogger.cpp @@ -16,6 +16,7 @@ Provides thread-safe logging based on the wxWidgets log facility. #include "Audacity.h" // This should always be included first #include "AudacityLogger.h" + #include "FileNames.h" #include "ShuttleGui.h" diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp index 0056e2704..e3acdc0dd 100644 --- a/src/AudioIO.cpp +++ b/src/AudioIO.cpp @@ -414,6 +414,7 @@ TimeTrack and AudioIOListener and whether the playback is looped. *//*******************************************************************/ #include "Audacity.h" + #include "Experimental.h" #include "AudioIO.h" #include "float_cast.h" diff --git a/src/AudioIO.h b/src/AudioIO.h index e956d0d1d..91e39312a 100644 --- a/src/AudioIO.h +++ b/src/AudioIO.h @@ -13,8 +13,9 @@ #ifndef __AUDACITY_AUDIO_IO__ #define __AUDACITY_AUDIO_IO__ -#include "portaudio.h" #include "Audacity.h" + +#include "portaudio.h" #include "Experimental.h" #include "MemoryX.h" diff --git a/src/AutoRecovery.cpp b/src/AutoRecovery.cpp index fe66f531a..9529a060b 100644 --- a/src/AutoRecovery.cpp +++ b/src/AutoRecovery.cpp @@ -18,8 +18,9 @@ text or binary format to a file. *//********************************************************************/ -#include "AutoRecovery.h" #include "Audacity.h" +#include "AutoRecovery.h" + #include "FileNames.h" #include "blockfile/SimpleBlockFile.h" #include "Project.h" diff --git a/src/CellularPanel.cpp b/src/CellularPanel.cpp index d6312a46b..e7761fc1c 100644 --- a/src/CellularPanel.cpp +++ b/src/CellularPanel.cpp @@ -29,6 +29,7 @@ #include "Audacity.h" #include "CellularPanel.h" + #include "Project.h" #include "UIHandle.h" #include "TrackPanelCell.h" diff --git a/src/DeviceChange.h b/src/DeviceChange.h index 701118a86..4992e726b 100644 --- a/src/DeviceChange.h +++ b/src/DeviceChange.h @@ -12,6 +12,7 @@ #define __AUDACITY_DEVICECHANGE_H__ #include "Audacity.h" + #include "Experimental.h" #if defined(EXPERIMENTAL_DEVICE_CHANGE_HANDLER) diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp index 5ab615961..51dbae2f7 100644 --- a/src/DeviceManager.cpp +++ b/src/DeviceManager.cpp @@ -6,6 +6,8 @@ ******************************************************************/ +#include "Audacity.h" + #include "portaudio.h" #ifdef __WXMSW__ #include "pa_win_wasapi.h" @@ -15,7 +17,6 @@ #include "portmixer.h" #endif -#include "Audacity.h" // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/Diags.cpp b/src/Diags.cpp index 0f770b47a..3b42f9f73 100644 --- a/src/Diags.cpp +++ b/src/Diags.cpp @@ -29,6 +29,7 @@ count down so that we track how many times the event happens. #include "Audacity.h" + #include #include #include diff --git a/src/DirManager.cpp b/src/DirManager.cpp index 1d381e9d3..9159d0b31 100644 --- a/src/DirManager.cpp +++ b/src/DirManager.cpp @@ -63,6 +63,7 @@ #include "Audacity.h" #include "DirManager.h" + #include "MemoryX.h" #include // to use time() for srand() diff --git a/src/FFT.cpp b/src/FFT.cpp index ac79c81fb..d6d1138ba 100644 --- a/src/FFT.cpp +++ b/src/FFT.cpp @@ -40,6 +40,7 @@ */ #include "Audacity.h" + #include "Internat.h" #include "FFT.h" diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index 75e6ed8fc..7151ec2f6 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -19,6 +19,7 @@ License: GPL v2. See License.txt. #include "Audacity.h" // for config*.h #include "FFmpeg.h" + #include "FileNames.h" #include "Internat.h" #include "widgets/HelpSystem.h" diff --git a/src/FFmpeg.h b/src/FFmpeg.h index 5f171c7ff..706e97289 100644 --- a/src/FFmpeg.h +++ b/src/FFmpeg.h @@ -16,6 +16,8 @@ Describes shared object that is used to access FFmpeg libraries. #if !defined(__AUDACITY_FFMPEG__) #define __AUDACITY_FFMPEG__ +#include "Audacity.h" + #include "MemoryX.h" #include "Internat.h" @@ -144,7 +146,6 @@ extern "C" { } #endif -#include "Audacity.h" #include "Experimental.h" /* rather earlier than normal, but pulls in config*.h and other program stuff diff --git a/src/FileException.cpp b/src/FileException.cpp index b9bdfccd7..29545eb9e 100644 --- a/src/FileException.cpp +++ b/src/FileException.cpp @@ -8,6 +8,7 @@ #include "Audacity.h" #include "FileException.h" + #include "Internat.h" #include "Prefs.h" diff --git a/src/FileFormats.cpp b/src/FileFormats.cpp index cdf725347..470c1dcb8 100644 --- a/src/FileFormats.cpp +++ b/src/FileFormats.cpp @@ -16,6 +16,7 @@ information. #include "Audacity.h" + #include "MemoryX.h" #include #include diff --git a/src/FileFormats.h b/src/FileFormats.h index 212701cba..34297bb80 100644 --- a/src/FileFormats.h +++ b/src/FileFormats.h @@ -11,11 +11,12 @@ #ifndef __AUDACITY_FILE_FORMATS__ #define __AUDACITY_FILE_FORMATS__ +#include "Audacity.h" + #include #include #include -#include "Audacity.h" #include "audacity/Types.h" #include "sndfile.h" diff --git a/src/FileNames.h b/src/FileNames.h index 4ccc494e1..320785c2b 100644 --- a/src/FileNames.h +++ b/src/FileNames.h @@ -11,7 +11,6 @@ #ifndef __AUDACITY_FILE_NAMES__ #define __AUDACITY_FILE_NAMES__ -#include #include "Audacity.h" #include "audacity/Types.h" diff --git a/src/HelpText.cpp b/src/HelpText.cpp index d69341c7e..72b72319a 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -12,11 +12,13 @@ \brief Given a key, returns some html. *//********************************************************************/ +#include "Audacity.h" + #include #include -#include "Audacity.h" #include "HelpText.h" + #include "FileNames.h" #include "AboutDialog.h" #include "AllThemeResources.h" diff --git a/src/ImageManipulation.cpp b/src/ImageManipulation.cpp index 0061bfa28..0470a813f 100644 --- a/src/ImageManipulation.cpp +++ b/src/ImageManipulation.cpp @@ -22,9 +22,10 @@ channel. This collection of functions fills that gap. *//*********************************************************************/ +#include "Audacity.h" + #include -#include "Audacity.h" #include "ImageManipulation.h" #include "AllThemeResources.h" #include "Theme.h" diff --git a/src/InconsistencyException.cpp b/src/InconsistencyException.cpp index 33cdc5292..1a5a3ad0c 100644 --- a/src/InconsistencyException.cpp +++ b/src/InconsistencyException.cpp @@ -8,6 +8,7 @@ #include "Audacity.h" #include "InconsistencyException.h" + #include "Internat.h" InconsistencyException::~InconsistencyException() diff --git a/src/Internat.h b/src/Internat.h index 97ad6dda3..a22e99bcb 100644 --- a/src/Internat.h +++ b/src/Internat.h @@ -12,13 +12,14 @@ #ifndef __AUDACITY_INTERNAT__ #define __AUDACITY_INTERNAT__ +#include "Audacity.h" + #include #include #include #ifndef IN_RC -#include "Audacity.h" #include "audacity/Types.h" class wxArrayString; diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp index 7cae84948..c2a5c235c 100644 --- a/src/LabelTrack.cpp +++ b/src/LabelTrack.cpp @@ -30,6 +30,7 @@ for drawing different aspects of the label and its text box. #include "Audacity.h" #include "LabelTrack.h" + #include "Experimental.h" #include "TrackPanel.h" diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp index 4635230a7..0d632b7ed 100644 --- a/src/MixerBoard.cpp +++ b/src/MixerBoard.cpp @@ -10,6 +10,7 @@ **********************************************************************/ #include "Audacity.h" + #include "Menus.h" #include "MixerBoard.h" diff --git a/src/ModuleManager.cpp b/src/ModuleManager.cpp index 2224cd761..2445a9df4 100755 --- a/src/ModuleManager.cpp +++ b/src/ModuleManager.cpp @@ -18,13 +18,14 @@ i.e. an alternative to the usual interface, for Audacity. *//*******************************************************************/ +#include "Audacity.h" + #include #include #include #include #include -#include "Audacity.h" #include "AudacityApp.h" #include "FileNames.h" #include "Internat.h" diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index bd9f522bc..361716d6b 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -16,6 +16,7 @@ #include "Audacity.h" #include "NoteTrack.h" + #include "Experimental.h" #include diff --git a/src/NoteTrack.h b/src/NoteTrack.h index aa49fcd32..c7cf8d161 100644 --- a/src/NoteTrack.h +++ b/src/NoteTrack.h @@ -11,9 +11,10 @@ #ifndef __AUDACITY_NOTETRACK__ #define __AUDACITY_NOTETRACK__ +#include "Audacity.h" + #include #include -#include "Audacity.h" #include "Experimental.h" #include "Track.h" #include "effects/TimeWarper.h" diff --git a/src/PitchName.cpp b/src/PitchName.cpp index c2d3cca3b..8829541b1 100644 --- a/src/PitchName.cpp +++ b/src/PitchName.cpp @@ -17,10 +17,11 @@ *//*******************************************************************/ +#include "Audacity.h" + #include #include -#include "Audacity.h" #include "PitchName.h" #include "Internat.h" diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index 1bf374a8e..59ecb4e72 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -18,10 +18,10 @@ effects, generators, analysis-effects, commands. It also has functions for shared and private configs - which need to move out. *****************************************************************************/ -#include - #include "Audacity.h" +#include + #include #include #include diff --git a/src/Prefs.h b/src/Prefs.h index 155fcc698..5e8074bca 100644 --- a/src/Prefs.h +++ b/src/Prefs.h @@ -30,6 +30,7 @@ #define __AUDACITY_PREFS__ #include "Audacity.h" + #include "../include/audacity/ComponentInterface.h" #include diff --git a/src/Profiler.cpp b/src/Profiler.cpp index c1fa8c183..6c106d6b6 100644 --- a/src/Profiler.cpp +++ b/src/Profiler.cpp @@ -22,6 +22,7 @@ but it will probably work fine if you use it on a high level. #include "Audacity.h" #include "Profiler.h" + #include #include #include diff --git a/src/Project.h b/src/Project.h index dc3a2bc46..80c4c2789 100644 --- a/src/Project.h +++ b/src/Project.h @@ -19,6 +19,7 @@ #define __AUDACITY_PROJECT__ #include "Audacity.h" + #include "Experimental.h" #include "Track.h" diff --git a/src/RealFFTf.cpp b/src/RealFFTf.cpp index c457a62eb..6a1eff597 100644 --- a/src/RealFFTf.cpp +++ b/src/RealFFTf.cpp @@ -37,6 +37,7 @@ */ #include "Audacity.h" + #include #include #include diff --git a/src/RealFFTf.h b/src/RealFFTf.h index b9045700a..d497ca36b 100644 --- a/src/RealFFTf.h +++ b/src/RealFFTf.h @@ -2,6 +2,7 @@ #define __realfftf_h #include "Audacity.h" + #include "Experimental.h" #include "MemoryX.h" diff --git a/src/RealFFTf48x.cpp b/src/RealFFTf48x.cpp index 189d176a4..bcbdefe1c 100644 --- a/src/RealFFTf48x.cpp +++ b/src/RealFFTf48x.cpp @@ -53,7 +53,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #include "Audacity.h" + #include "Experimental.h" #ifdef EXPERIMENTAL_EQ_SSE_THREADED diff --git a/src/Registrar.h b/src/Registrar.h index e96d526c8..ca2694f74 100644 --- a/src/Registrar.h +++ b/src/Registrar.h @@ -21,6 +21,7 @@ responsible for calling the appropriate callback functions. #define __AUDACITY_REGISTRAR__ #include "Audacity.h" + #include "MemoryX.h" class LoadableModule; diff --git a/src/SampleFormat.h b/src/SampleFormat.h index 8df843bf7..2ddb00c15 100644 --- a/src/SampleFormat.h +++ b/src/SampleFormat.h @@ -12,6 +12,7 @@ #define __AUDACITY_SAMPLE_FORMAT__ #include "Audacity.h" + #include "MemoryX.h" #include diff --git a/src/SelectedRegion.h b/src/SelectedRegion.h index 957ef82b8..78f38f63a 100644 --- a/src/SelectedRegion.h +++ b/src/SelectedRegion.h @@ -26,6 +26,7 @@ #define __AUDACITY_SELECTEDREGION__ #include "Audacity.h" + #include "Experimental.h" #include diff --git a/src/SelectionState.cpp b/src/SelectionState.cpp index d376aff60..df072e84f 100644 --- a/src/SelectionState.cpp +++ b/src/SelectionState.cpp @@ -8,6 +8,7 @@ #include "Audacity.h" #include "SelectionState.h" + #include "ViewInfo.h" #include "Track.h" diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp index a040e5ea0..7f14ff2c3 100644 --- a/src/ShuttleGui.cpp +++ b/src/ShuttleGui.cpp @@ -94,6 +94,7 @@ for registering for changes. #include "Audacity.h" + #include "Experimental.h" #include "Prefs.h" #include "Shuttle.h" diff --git a/src/Tags.h b/src/Tags.h index 415d690d3..cc2327454 100644 --- a/src/Tags.h +++ b/src/Tags.h @@ -30,6 +30,7 @@ #define __AUDACITY_TAGS__ #include "Audacity.h" + #include "widgets/Grid.h" #include "xml/XMLTagHandler.h" diff --git a/src/TimeTrack.cpp b/src/TimeTrack.cpp index 56e863f62..aa49555b8 100644 --- a/src/TimeTrack.cpp +++ b/src/TimeTrack.cpp @@ -15,6 +15,7 @@ #include "Audacity.h" #include "TimeTrack.h" + #include "Experimental.h" #include diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index c55d37e40..5565f34b7 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -20,6 +20,7 @@ #include "Audacity.h" #include "TimerRecordDialog.h" + #include "FileNames.h" #include diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index 7115368a3..eea219fa1 100644 --- a/src/TrackArtist.cpp +++ b/src/TrackArtist.cpp @@ -40,6 +40,7 @@ audio tracks. #include "Audacity.h" #include "TrackArtist.h" + #include "float_cast.h" #include diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index a3ef61db7..e3046e950 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -61,6 +61,7 @@ is time to refresh some aspect of the screen. *//*****************************************************************/ #include "Audacity.h" + #include "AdornedRulerPanel.h" #include "Experimental.h" #include "TrackPanel.h" diff --git a/src/TrackPanelResizeHandle.cpp b/src/TrackPanelResizeHandle.cpp index 089387dc7..e365896f2 100644 --- a/src/TrackPanelResizeHandle.cpp +++ b/src/TrackPanelResizeHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "Audacity.h" #include "TrackPanelResizeHandle.h" + #include "Experimental.h" #include "MemoryX.h" diff --git a/src/UIHandle.cpp b/src/UIHandle.cpp index b8c3ef499..fd34d84fc 100644 --- a/src/UIHandle.cpp +++ b/src/UIHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli #include "Audacity.h" #include "UIHandle.h" + #include "RefreshCode.h" UIHandle::~UIHandle() diff --git a/src/VoiceKey.cpp b/src/VoiceKey.cpp index b1c39c6d1..41703c5b1 100644 --- a/src/VoiceKey.cpp +++ b/src/VoiceKey.cpp @@ -19,8 +19,8 @@ or "OFF" point #include "Audacity.h" - #include "VoiceKey.h" + #include #include #include diff --git a/src/WaveClip.h b/src/WaveClip.h index 93601c666..4e9b08540 100644 --- a/src/WaveClip.h +++ b/src/WaveClip.h @@ -13,6 +13,7 @@ #define __AUDACITY_WAVECLIP__ #include "Audacity.h" + #include "MemoryX.h" #include "SampleFormat.h" #include "widgets/ProgressDialog.h" diff --git a/src/WrappedType.cpp b/src/WrappedType.cpp index 3356573c2..156d838fd 100644 --- a/src/WrappedType.cpp +++ b/src/WrappedType.cpp @@ -26,6 +26,7 @@ *//**********************************************************************/ #include "Audacity.h" + #include #include "Internat.h" #include "WrappedType.h" diff --git a/src/blockfile/NotYetAvailableException.cpp b/src/blockfile/NotYetAvailableException.cpp index 356534bd9..890bf5560 100644 --- a/src/blockfile/NotYetAvailableException.cpp +++ b/src/blockfile/NotYetAvailableException.cpp @@ -8,6 +8,7 @@ #include "../Audacity.h" #include "NotYetAvailableException.h" + #include "../Internat.h" NotYetAvailableException::~NotYetAvailableException() diff --git a/src/blockfile/SilentBlockFile.cpp b/src/blockfile/SilentBlockFile.cpp index 3250a77c6..6a52f27d8 100644 --- a/src/blockfile/SilentBlockFile.cpp +++ b/src/blockfile/SilentBlockFile.cpp @@ -10,6 +10,7 @@ #include "../Audacity.h" #include "SilentBlockFile.h" + #include "../FileFormats.h" SilentBlockFile::SilentBlockFile(size_t sampleLen): diff --git a/src/commands/AppCommandEvent.h b/src/commands/AppCommandEvent.h index f90a307d4..eac2c8e3e 100644 --- a/src/commands/AppCommandEvent.h +++ b/src/commands/AppCommandEvent.h @@ -16,8 +16,9 @@ #ifndef __APPCOMMANDEVENT__ #define __APPCOMMANDEVENT__ -#include #include "../Audacity.h" + +#include #include "../MemoryX.h" DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, wxEVT_APP_COMMAND_RECEIVED, -1); diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h index b114d88a6..efc722b49 100644 --- a/src/commands/AudacityCommand.h +++ b/src/commands/AudacityCommand.h @@ -12,6 +12,7 @@ #define __AUDACITY_COMMAND__ #include "../Audacity.h" + #include "../MemoryX.h" #include diff --git a/src/commands/BatchEvalCommand.cpp b/src/commands/BatchEvalCommand.cpp index ee80537de..8b9b86a8f 100644 --- a/src/commands/BatchEvalCommand.cpp +++ b/src/commands/BatchEvalCommand.cpp @@ -15,6 +15,7 @@ #include "../Audacity.h" #include "BatchEvalCommand.h" + #include "CommandContext.h" ComponentInterfaceSymbol BatchEvalCommandType::BuildName() diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp index 7db2ed21b..d13a06ca6 100644 --- a/src/commands/Command.cpp +++ b/src/commands/Command.cpp @@ -77,6 +77,7 @@ classes derived from it. #include "../Audacity.h" #include "Command.h" + #include #include #include diff --git a/src/commands/CommandBuilder.cpp b/src/commands/CommandBuilder.cpp index 5758ca18d..c962a0450 100644 --- a/src/commands/CommandBuilder.cpp +++ b/src/commands/CommandBuilder.cpp @@ -23,6 +23,7 @@ system by constructing BatchCommandEval objects. #include "../Audacity.h" #include "CommandBuilder.h" + #include "CommandDirectory.h" #include "../Shuttle.h" #include "BatchEvalCommand.h" diff --git a/src/commands/CommandContext.cpp b/src/commands/CommandContext.cpp index ddd543045..1c90e0617 100644 --- a/src/commands/CommandContext.cpp +++ b/src/commands/CommandContext.cpp @@ -21,6 +21,7 @@ messaging from a command back to its invoker. *//*******************************************************************/ #include "../Audacity.h" + #include "Command.h" #include #include diff --git a/src/commands/CommandDirectory.cpp b/src/commands/CommandDirectory.cpp index 5382f907f..4d484749e 100644 --- a/src/commands/CommandDirectory.cpp +++ b/src/commands/CommandDirectory.cpp @@ -16,6 +16,7 @@ functions to look up a command by name. #include "../Audacity.h" #include "CommandDirectory.h" + #include "CommandMisc.h" #include "HelpCommand.h" diff --git a/src/commands/CommandHandler.cpp b/src/commands/CommandHandler.cpp index 079163a2c..79cfb69f6 100644 --- a/src/commands/CommandHandler.cpp +++ b/src/commands/CommandHandler.cpp @@ -18,6 +18,7 @@ #include "../Audacity.h" #include "CommandHandler.h" + #include #include "../Project.h" #include "Command.h" diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index ccc18a81d..deec644a1 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -75,8 +75,9 @@ CommandManager. It holds the callback for one command. *//******************************************************************/ -#include "../AudacityHeaders.h" #include "../Audacity.h" + +#include "../AudacityHeaders.h" #include "CommandManager.h" #include "CommandManagerWindowClasses.h" #include "CommandContext.h" diff --git a/src/commands/CommandSignature.cpp b/src/commands/CommandSignature.cpp index 324cbfad2..bc9f648b8 100644 --- a/src/commands/CommandSignature.cpp +++ b/src/commands/CommandSignature.cpp @@ -15,6 +15,7 @@ #include "../Audacity.h" #include "CommandSignature.h" + #include "CommandMisc.h" #include "Validators.h" diff --git a/src/commands/CommandTargets.cpp b/src/commands/CommandTargets.cpp index 9f3e9167d..ce4f4fe85 100644 --- a/src/commands/CommandTargets.cpp +++ b/src/commands/CommandTargets.cpp @@ -23,6 +23,7 @@ capture the more lengthy output from some commands. #include "../Audacity.h" #include "CommandTargets.h" + #include #include "../ShuttleGui.h" #include "../Project.h" diff --git a/src/commands/CommandType.cpp b/src/commands/CommandType.cpp index 41b62d211..ecde7e510 100644 --- a/src/commands/CommandType.cpp +++ b/src/commands/CommandType.cpp @@ -19,6 +19,7 @@ Also acts as a factory. #include "../Audacity.h" #include "CommandType.h" + #include "CommandMisc.h" #include "CommandSignature.h" #include diff --git a/src/commands/CompareAudioCommand.cpp b/src/commands/CompareAudioCommand.cpp index 213835648..7134e6454 100644 --- a/src/commands/CompareAudioCommand.cpp +++ b/src/commands/CompareAudioCommand.cpp @@ -20,6 +20,7 @@ threshold of difference in two selected tracks #include "../Audacity.h" #include "CompareAudioCommand.h" + #include "../MemoryX.h" #include "../Project.h" #include "../WaveTrack.h" diff --git a/src/commands/DragCommand.cpp b/src/commands/DragCommand.cpp index e3f15198b..f9fffa43c 100644 --- a/src/commands/DragCommand.cpp +++ b/src/commands/DragCommand.cpp @@ -18,6 +18,7 @@ #include "../Audacity.h" #include "DragCommand.h" + #include "../Project.h" #include "../Track.h" #include "../TrackPanel.h" diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp index 38ddc6af0..ff31c8ea6 100644 --- a/src/commands/GetInfoCommand.cpp +++ b/src/commands/GetInfoCommand.cpp @@ -22,6 +22,7 @@ This class now lists #include "../Audacity.h" #include "GetInfoCommand.h" + #include "../Project.h" #include "CommandManager.h" #include "../effects/EffectManager.h" diff --git a/src/commands/GetTrackInfoCommand.cpp b/src/commands/GetTrackInfoCommand.cpp index 532b82eac..96b5a802d 100644 --- a/src/commands/GetTrackInfoCommand.cpp +++ b/src/commands/GetTrackInfoCommand.cpp @@ -18,6 +18,7 @@ #include "../Audacity.h" #include "GetTrackInfoCommand.h" + #include "../Project.h" #include "../Track.h" #include "../TrackPanel.h" diff --git a/src/commands/HelpCommand.cpp b/src/commands/HelpCommand.cpp index 9757a0afd..6bc492e04 100644 --- a/src/commands/HelpCommand.cpp +++ b/src/commands/HelpCommand.cpp @@ -16,6 +16,7 @@ #include "../Audacity.h" #include "HelpCommand.h" + #include "../Shuttle.h" #include "../ShuttleGui.h" #include "CommandContext.h" diff --git a/src/commands/ImportExportCommands.cpp b/src/commands/ImportExportCommands.cpp index f3bac50e9..137b713bb 100644 --- a/src/commands/ImportExportCommands.cpp +++ b/src/commands/ImportExportCommands.cpp @@ -16,6 +16,7 @@ #include "../Audacity.h" #include "ImportExportCommands.h" + #include "../Project.h" #include "../Track.h" #include "../export/Export.h" diff --git a/src/commands/LoadCommands.cpp b/src/commands/LoadCommands.cpp index b132243db..64c4491fa 100644 --- a/src/commands/LoadCommands.cpp +++ b/src/commands/LoadCommands.cpp @@ -14,6 +14,7 @@ modelled on BuiltinEffectsModule *****************************************************************************/ #include "../Audacity.h" + #include "../Prefs.h" #include "LoadCommands.h" diff --git a/src/commands/MessageCommand.cpp b/src/commands/MessageCommand.cpp index d09ad2b1c..a219c8866 100644 --- a/src/commands/MessageCommand.cpp +++ b/src/commands/MessageCommand.cpp @@ -15,6 +15,7 @@ #include "../Audacity.h" #include "MessageCommand.h" + #include "CommandType.h" #include "CommandContext.h" #include "../Shuttle.h" diff --git a/src/commands/OpenSaveCommands.cpp b/src/commands/OpenSaveCommands.cpp index 9bd8bdf4d..01aae9b0c 100644 --- a/src/commands/OpenSaveCommands.cpp +++ b/src/commands/OpenSaveCommands.cpp @@ -16,6 +16,7 @@ #include "../Audacity.h" #include "OpenSaveCommands.h" + #include "../Menus.h" #include "../Project.h" #include "../export/Export.h" diff --git a/src/commands/PreferenceCommands.cpp b/src/commands/PreferenceCommands.cpp index aa83318ce..27c5d1fb4 100644 --- a/src/commands/PreferenceCommands.cpp +++ b/src/commands/PreferenceCommands.cpp @@ -17,6 +17,7 @@ SetPreferenceCommand classes #include "../Audacity.h" #include "PreferenceCommands.h" + #include "../Menus.h" #include "../Prefs.h" #include "../Shuttle.h" diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp index 0b1a64bac..c1b1350ed 100644 --- a/src/commands/ScreenshotCommand.cpp +++ b/src/commands/ScreenshotCommand.cpp @@ -19,6 +19,7 @@ small calculations of rectangles. #include "../Audacity.h" #include "ScreenshotCommand.h" + #include "CommandTargets.h" #include "../Project.h" #include diff --git a/src/commands/ScriptCommandRelay.h b/src/commands/ScriptCommandRelay.h index 453aa3d36..e83377629 100644 --- a/src/commands/ScriptCommandRelay.h +++ b/src/commands/ScriptCommandRelay.h @@ -17,6 +17,7 @@ #define __SCRIPT_COMMAND_RELAY__ #include "../Audacity.h" + #include "../MemoryX.h" class CommandHandler; diff --git a/src/commands/SelectCommand.cpp b/src/commands/SelectCommand.cpp index 70db38e76..ef4aa9b5d 100644 --- a/src/commands/SelectCommand.cpp +++ b/src/commands/SelectCommand.cpp @@ -30,6 +30,7 @@ explicitly code all three. *//*******************************************************************/ #include "../Audacity.h" + #include #include diff --git a/src/commands/SetClipCommand.cpp b/src/commands/SetClipCommand.cpp index 60d0667f9..67497497b 100644 --- a/src/commands/SetClipCommand.cpp +++ b/src/commands/SetClipCommand.cpp @@ -18,6 +18,7 @@ #include "../Audacity.h" #include "SetClipCommand.h" + #include "../Project.h" #include "../Track.h" #include "../TrackPanel.h" diff --git a/src/commands/SetEnvelopeCommand.cpp b/src/commands/SetEnvelopeCommand.cpp index 9dba3c01f..8f9356b0b 100644 --- a/src/commands/SetEnvelopeCommand.cpp +++ b/src/commands/SetEnvelopeCommand.cpp @@ -18,6 +18,7 @@ #include "../Audacity.h" #include "SetEnvelopeCommand.h" + #include "../Project.h" #include "../Track.h" #include "../TrackPanel.h" diff --git a/src/commands/SetLabelCommand.cpp b/src/commands/SetLabelCommand.cpp index c68a4c977..41c5e2e98 100644 --- a/src/commands/SetLabelCommand.cpp +++ b/src/commands/SetLabelCommand.cpp @@ -18,6 +18,7 @@ #include "../Audacity.h" #include "SetLabelCommand.h" + #include "../Project.h" #include "../Track.h" #include "../TrackPanel.h" diff --git a/src/commands/SetProjectCommand.cpp b/src/commands/SetProjectCommand.cpp index 6aeea7099..796f0a8df 100644 --- a/src/commands/SetProjectCommand.cpp +++ b/src/commands/SetProjectCommand.cpp @@ -19,6 +19,7 @@ #include "../Audacity.h" #include "SetProjectCommand.h" + #include "../Project.h" #include "../Track.h" #include "../TrackPanel.h" diff --git a/src/commands/SetTrackInfoCommand.cpp b/src/commands/SetTrackInfoCommand.cpp index ba7ec4b39..b9cc1ab51 100644 --- a/src/commands/SetTrackInfoCommand.cpp +++ b/src/commands/SetTrackInfoCommand.cpp @@ -35,6 +35,7 @@ SetTrackAudioCommand and SetTrackVisualsCommand. #include "../Audacity.h" #include "SetTrackInfoCommand.h" + #include "../Project.h" #include "../Track.h" #include "../TrackPanel.h" diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index 161d50329..61af46bdd 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -14,6 +14,7 @@ *//*******************************************************************/ #include "../Audacity.h" + #include "../Experimental.h" #include "DtmfGen.h" diff --git a/src/effects/Effect.h b/src/effects/Effect.h index c8b4f23ad..6ee845500 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -13,6 +13,7 @@ #define __AUDACITY_EFFECT__ #include "../Audacity.h" + #include "../MemoryX.h" #include diff --git a/src/effects/EffectRack.cpp b/src/effects/EffectRack.cpp index e033718bf..a5eb146f3 100644 --- a/src/effects/EffectRack.cpp +++ b/src/effects/EffectRack.cpp @@ -12,6 +12,7 @@ **********************************************************************/ #include "../Audacity.h" + #include "../Experimental.h" #if defined(EXPERIMENTAL_EFFECTS_RACK) diff --git a/src/effects/Equalization48x.cpp b/src/effects/Equalization48x.cpp index 4e518a729..f0883b1d8 100644 --- a/src/effects/Equalization48x.cpp +++ b/src/effects/Equalization48x.cpp @@ -14,6 +14,7 @@ *//****************************************************************/ #include "../Audacity.h" + #include "../Experimental.h" #ifdef EXPERIMENTAL_EQ_SSE_THREADED #include "../MemoryX.h" diff --git a/src/effects/LoadEffects.cpp b/src/effects/LoadEffects.cpp index 7885cfab8..18e39e51f 100644 --- a/src/effects/LoadEffects.cpp +++ b/src/effects/LoadEffects.cpp @@ -12,6 +12,7 @@ *****************************************************************************/ #include "../Audacity.h" + #include "../Prefs.h" #include "LoadEffects.h" diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp index 26d2d892c..f670fd7fb 100644 --- a/src/effects/NoiseReduction.cpp +++ b/src/effects/NoiseReduction.cpp @@ -37,6 +37,7 @@ */ #include "../Audacity.h" + #include "../Experimental.h" #include "NoiseReduction.h" #include "EffectManager.h" diff --git a/src/effects/NoiseRemoval.cpp b/src/effects/NoiseRemoval.cpp index 98ca16d16..1bd107336 100644 --- a/src/effects/NoiseRemoval.cpp +++ b/src/effects/NoiseRemoval.cpp @@ -39,6 +39,7 @@ *//*******************************************************************/ #include "../Audacity.h" + #include "../Experimental.h" #if !defined(EXPERIMENTAL_NOISE_REDUCTION) diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp index e72445888..8e71fbf07 100644 --- a/src/effects/Reverb.cpp +++ b/src/effects/Reverb.cpp @@ -20,7 +20,6 @@ #include #include -#include "../Audacity.h" #include "../Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/effects/ScoreAlignDialog.cpp b/src/effects/ScoreAlignDialog.cpp index 5bf616f94..0a08c6fcd 100644 --- a/src/effects/ScoreAlignDialog.cpp +++ b/src/effects/ScoreAlignDialog.cpp @@ -17,6 +17,7 @@ It \TODO: description *//*******************************************************************/ #include "../Audacity.h" + #include "../Experimental.h" #ifdef EXPERIMENTAL_SCOREALIGN diff --git a/src/effects/TwoPassSimpleMono.cpp b/src/effects/TwoPassSimpleMono.cpp index dbb7133df..ef63a6439 100644 --- a/src/effects/TwoPassSimpleMono.cpp +++ b/src/effects/TwoPassSimpleMono.cpp @@ -19,7 +19,6 @@ doing the second pass over all selected tracks. #include "../Audacity.h" - #include "TwoPassSimpleMono.h" #include "../WaveTrack.h" diff --git a/src/effects/VST/VSTControlOSX.mm b/src/effects/VST/VSTControlOSX.mm index 9d4abb11a..4ce3b0ab6 100644 --- a/src/effects/VST/VSTControlOSX.mm +++ b/src/effects/VST/VSTControlOSX.mm @@ -22,6 +22,7 @@ **********************************************************************/ #include "../../Audacity.h" + #include "VSTControl.h" #include "../../MemoryX.h" diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index ce2bf316a..2120bc94f 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -28,7 +28,6 @@ #if 0 #if defined(BUILDING_AUDACITY) -#include "../../Audacity.h" #include "../../PlatformCompatibility.h" // Make the main function private diff --git a/src/effects/audiounits/AUControl.mm b/src/effects/audiounits/AUControl.mm index b26ff8302..bb7429036 100644 --- a/src/effects/audiounits/AUControl.mm +++ b/src/effects/audiounits/AUControl.mm @@ -22,6 +22,7 @@ **********************************************************************/ #include "../../Audacity.h" + #include #include #include diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp index 2d020ab6e..685747de7 100644 --- a/src/export/ExportCL.cpp +++ b/src/export/ExportCL.cpp @@ -13,6 +13,7 @@ #include "../Audacity.h" #include "ExportCL.h" + #include "../Project.h" #include diff --git a/src/export/ExportFFmpeg.cpp b/src/export/ExportFFmpeg.cpp index 374c5f6c0..d11c9ea45 100644 --- a/src/export/ExportFFmpeg.cpp +++ b/src/export/ExportFFmpeg.cpp @@ -20,6 +20,7 @@ function. #include "../Audacity.h" // keep ffmpeg before wx because they interact + #include "../FFmpeg.h" // and Audacity.h before FFmpeg for config*.h #include diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp index 9562408db..d14afd232 100644 --- a/src/export/ExportFFmpegDialogs.cpp +++ b/src/export/ExportFFmpegDialogs.cpp @@ -37,6 +37,7 @@ *//*******************************************************************/ #include "../Audacity.h" // keep ffmpeg before wx because they interact + #include "../FFmpeg.h" // and Audacity.h before FFmpeg for config*.h #include "ExportFFmpegDialogs.h" diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h index 61cc69b6a..06f5e8fd5 100644 --- a/src/export/ExportFFmpegDialogs.h +++ b/src/export/ExportFFmpegDialogs.h @@ -14,6 +14,7 @@ LRN #if defined(USE_FFMPEG) #include "../Audacity.h" // keep ffmpeg before wx because they interact + #include "../FFmpeg.h" // and Audacity.h before FFmpeg for config*.h #include diff --git a/src/import/ImportGStreamer.cpp b/src/import/ImportGStreamer.cpp index 27e1af449..115ec4ff6 100644 --- a/src/import/ImportGStreamer.cpp +++ b/src/import/ImportGStreamer.cpp @@ -24,6 +24,7 @@ Licensed under the GNU General Public License v2 or later *//*******************************************************************/ #include "../Audacity.h" // needed before GStreamer.h + #include #include diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp index 900c86405..d2fa8c5a8 100644 --- a/src/import/ImportPCM.cpp +++ b/src/import/ImportPCM.cpp @@ -21,6 +21,7 @@ #include "../Audacity.h" #include "ImportPCM.h" + #include "../Internat.h" #include "../Tags.h" diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h index 2ccc5d05e..83c864a45 100644 --- a/src/import/ImportPlugin.h +++ b/src/import/ImportPlugin.h @@ -56,6 +56,7 @@ but little else. #define __AUDACITY_IMPORTER__ #include "../Audacity.h" + #include "audacity/Types.h" #include "../Internat.h" #include diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp index 4ac1fbed0..7962fe8e9 100644 --- a/src/import/ImportQT.cpp +++ b/src/import/ImportQT.cpp @@ -15,6 +15,7 @@ #include "../Audacity.h" #include "ImportQT.h" + #include "ImportPlugin.h" #include "../widgets/ErrorDialog.h" diff --git a/src/import/RawAudioGuess.cpp b/src/import/RawAudioGuess.cpp index 022ae4620..027590f30 100644 --- a/src/import/RawAudioGuess.cpp +++ b/src/import/RawAudioGuess.cpp @@ -15,6 +15,7 @@ #include "../Audacity.h" #include "RawAudioGuess.h" + #include "../AudacityException.h" #include "../MemoryX.h" diff --git a/src/menus/NavigationMenus.cpp b/src/menus/NavigationMenus.cpp index c3b88e7b1..f6f4f8e0c 100644 --- a/src/menus/NavigationMenus.cpp +++ b/src/menus/NavigationMenus.cpp @@ -1,4 +1,5 @@ #include "../Audacity.h" + #include "../Menus.h" #include "../Prefs.h" #include "../Project.h" diff --git a/src/menus/WindowMenus.cpp b/src/menus/WindowMenus.cpp index 078642879..0f03be789 100644 --- a/src/menus/WindowMenus.cpp +++ b/src/menus/WindowMenus.cpp @@ -1,4 +1,5 @@ #include "../Audacity.h" + #include "../commands/CommandManager.h" // This file collects a few things specific to Mac and requiring some diff --git a/src/ondemand/ODDecodeTask.cpp b/src/ondemand/ODDecodeTask.cpp index 8e1e0c278..1899fca43 100644 --- a/src/ondemand/ODDecodeTask.cpp +++ b/src/ondemand/ODDecodeTask.cpp @@ -18,6 +18,7 @@ updating the ODDecodeBlockFile and the GUI of the newly available data. #include "../Audacity.h" #include "ODDecodeTask.h" + #include "../blockfile/ODDecodeBlockFile.h" #include "../Sequence.h" #include "../WaveTrack.h" diff --git a/src/ondemand/ODManager.cpp b/src/ondemand/ODManager.cpp index e930612ba..1f79d0ea6 100644 --- a/src/ondemand/ODManager.cpp +++ b/src/ondemand/ODManager.cpp @@ -16,6 +16,7 @@ ODTask requests and internals. #include "../Audacity.h" #include "ODManager.h" + #include "ODTask.h" #include "ODTaskThread.h" #include "ODWaveTrackTaskQueue.h" diff --git a/src/ondemand/ODTaskThread.h b/src/ondemand/ODTaskThread.h index dd15fc155..efe4f4314 100644 --- a/src/ondemand/ODTaskThread.h +++ b/src/ondemand/ODTaskThread.h @@ -21,9 +21,11 @@ #ifndef __AUDACITY_ODTASKTHREAD__ #define __AUDACITY_ODTASKTHREAD__ -#include #include "../Audacity.h" // contains the set-up of AUDACITY_DLL_API + +#include + #include "../MemoryX.h" class ODTask; diff --git a/src/ondemand/ODWaveTrackTaskQueue.cpp b/src/ondemand/ODWaveTrackTaskQueue.cpp index 02eb55a55..dbc8a4441 100644 --- a/src/ondemand/ODWaveTrackTaskQueue.cpp +++ b/src/ondemand/ODWaveTrackTaskQueue.cpp @@ -18,6 +18,7 @@ tasks associated with a WaveTrack. #include "../Audacity.h" #include "ODWaveTrackTaskQueue.h" + #include "ODTask.h" #include "ODManager.h" #include "../WaveTrack.h" diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp index e1cf860e7..9d1bb520e 100644 --- a/src/prefs/ExtImportPrefs.cpp +++ b/src/prefs/ExtImportPrefs.cpp @@ -21,7 +21,6 @@ #include #include -#include "../Audacity.h" #include "../Prefs.h" #include "../ShuttleGui.h" #include "../widgets/ErrorDialog.h" diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index 2b4370d19..476cb2915 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -20,6 +20,7 @@ KeyConfigPrefs and MousePrefs use. *//*********************************************************************/ #include "../Audacity.h" + #include "../Experimental.h" #include "KeyConfigPrefs.h" diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index 82bb1265b..f202ddc98 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -24,6 +24,7 @@ other settings. *//********************************************************************/ #include "../Audacity.h" + #include "../Experimental.h" #ifdef EXPERIMENTAL_MIDI_OUT diff --git a/src/prefs/MousePrefs.cpp b/src/prefs/MousePrefs.cpp index a4821304b..472a2b953 100644 --- a/src/prefs/MousePrefs.cpp +++ b/src/prefs/MousePrefs.cpp @@ -33,6 +33,7 @@ *//********************************************************************/ #include "../Audacity.h" + #include "../Experimental.h" #include "MousePrefs.h" diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index d8cad408a..38d1b21d7 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -19,6 +19,7 @@ *//********************************************************************/ #include "../Audacity.h" + #include "../Experimental.h" #include "RecordingPrefs.h" diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp index 4ecbe6f90..fae740ea3 100644 --- a/src/prefs/SpectrogramSettings.cpp +++ b/src/prefs/SpectrogramSettings.cpp @@ -15,6 +15,7 @@ Paul Licameli #include "../Audacity.h" #include "SpectrogramSettings.h" + #include "../NumberScale.h" #include "../TranslatableStringArray.h" diff --git a/src/prefs/WaveformPrefs.cpp b/src/prefs/WaveformPrefs.cpp index 39b8c1925..fe5dbf91d 100644 --- a/src/prefs/WaveformPrefs.cpp +++ b/src/prefs/WaveformPrefs.cpp @@ -15,6 +15,7 @@ Paul Licameli #include "../Audacity.h" #include "WaveformPrefs.h" + #include "GUIPrefs.h" #include "GUISettings.h" diff --git a/src/prefs/WaveformSettings.cpp b/src/prefs/WaveformSettings.cpp index 6deeb0601..bebb92c30 100644 --- a/src/prefs/WaveformSettings.cpp +++ b/src/prefs/WaveformSettings.cpp @@ -15,6 +15,7 @@ Paul Licameli #include "../Audacity.h" #include "WaveformSettings.h" + #include "GUISettings.h" #include "GUIPrefs.h" diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp index 851224160..8257ba7e7 100644 --- a/src/toolbars/ControlToolBar.cpp +++ b/src/toolbars/ControlToolBar.cpp @@ -32,10 +32,11 @@ *//*******************************************************************/ +#include "../Audacity.h" + #include #include -#include "../Audacity.h" #include "../Experimental.h" #include "ControlToolBar.h" diff --git a/src/toolbars/ScrubbingToolBar.cpp b/src/toolbars/ScrubbingToolBar.cpp index 142f3adca..a86fd10a7 100644 --- a/src/toolbars/ScrubbingToolBar.cpp +++ b/src/toolbars/ScrubbingToolBar.cpp @@ -12,6 +12,7 @@ // Much of this is imitative of EditToolBar. Should there be a common base // class? + #include "../Audacity.h" #include "ScrubbingToolBar.h" diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp index ee38e1479..d0bb7f33f 100644 --- a/src/toolbars/ToolDock.cpp +++ b/src/toolbars/ToolDock.cpp @@ -22,6 +22,7 @@ *//**********************************************************************/ #include "../Audacity.h" + #include // For compilers that support precompilation, includes "wx/wx.h". diff --git a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp index 82c56e078..771a3e8cb 100644 --- a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../Audacity.h" #include "LabelDefaultClickHandle.h" + #include "../../../HitTestResult.h" #include "../../../LabelTrack.h" #include "../../../Project.h" diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp index 1653e5a3d..5322deae7 100644 --- a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../Audacity.h" #include "LabelGlyphHandle.h" + #include "../../../HitTestResult.h" #include "../../../LabelTrack.h" #include "../../../Project.h" diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.cpp b/src/tracks/labeltrack/ui/LabelTextHandle.cpp index 7eef7432d..20f328870 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelTextHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../Audacity.h" #include "LabelTextHandle.h" + #include "../../../Experimental.h" #include "../../../HitTestResult.h" #include "../../../LabelTrack.h" diff --git a/src/tracks/labeltrack/ui/LabelTrackControls.cpp b/src/tracks/labeltrack/ui/LabelTrackControls.cpp index 0ced6f2a9..3e8358242 100644 --- a/src/tracks/labeltrack/ui/LabelTrackControls.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackControls.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../Audacity.h" #include "LabelTrackControls.h" + #include "../../../HitTestResult.h" #include "../../../LabelTrack.h" #include "../../../widgets/PopupMenuTable.h" diff --git a/src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp b/src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp index ef5b8efcc..09ebe266b 100644 --- a/src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../Audacity.h" #include "LabelTrackVRulerControls.h" + #include "../../../HitTestResult.h" LabelTrackVRulerControls::~LabelTrackVRulerControls() diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp index 10c736fd8..3d50fd247 100644 --- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Audacity.h" #include "CutlineHandle.h" + #include "../../../../Experimental.h" #include "../../../../MemoryX.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp index 18d77bdfd..392029727 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Audacity.h" #include "SampleHandle.h" + #include "../../../../Experimental.h" #include diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp index 262ee840e..7bc88551d 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp @@ -9,6 +9,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ #include "../../../../Audacity.h" + #include "../../../../Experimental.h" #include "WaveTrackControls.h" #include "../../ui/PlayableTrackButtonHandles.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp index e8c9f403c..1708c65ef 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Audacity.h" #include "WaveTrackVRulerControls.h" + #include "WaveTrackVZoomHandle.h" #include "../../../../HitTestResult.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp index 3a9bba536..418559eac 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Audacity.h" #include "WaveTrackVZoomHandle.h" + #include "../../../../Experimental.h" #include "WaveTrackVRulerControls.h" diff --git a/src/tracks/timetrack/ui/TimeTrackControls.cpp b/src/tracks/timetrack/ui/TimeTrackControls.cpp index 74d9e7534..4bb5ddced 100644 --- a/src/tracks/timetrack/ui/TimeTrackControls.cpp +++ b/src/tracks/timetrack/ui/TimeTrackControls.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../Audacity.h" #include "TimeTrackControls.h" + #include "../../../HitTestResult.h" #include "../../../Project.h" #include "../../../RefreshCode.h" diff --git a/src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp b/src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp index b32d4ba8b..96d24f0f4 100644 --- a/src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp +++ b/src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../Audacity.h" #include "TimeTrackVRulerControls.h" + #include "../../../HitTestResult.h" TimeTrackVRulerControls::~TimeTrackVRulerControls() diff --git a/src/tracks/ui/CommonTrackPanelCell.cpp b/src/tracks/ui/CommonTrackPanelCell.cpp index 45cf92253..efb8b8cb5 100644 --- a/src/tracks/ui/CommonTrackPanelCell.cpp +++ b/src/tracks/ui/CommonTrackPanelCell.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "CommonTrackPanelCell.h" + #include "Scrubbing.h" #include "../../Experimental.h" diff --git a/src/tracks/ui/EditCursorOverlay.cpp b/src/tracks/ui/EditCursorOverlay.cpp index 4547510d7..d7e364371 100644 --- a/src/tracks/ui/EditCursorOverlay.cpp +++ b/src/tracks/ui/EditCursorOverlay.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "EditCursorOverlay.h" + #include "../../Experimental.h" #include "../../AColor.h" diff --git a/src/tracks/ui/EnvelopeHandle.cpp b/src/tracks/ui/EnvelopeHandle.cpp index 947b6241c..9a20ed1bd 100644 --- a/src/tracks/ui/EnvelopeHandle.cpp +++ b/src/tracks/ui/EnvelopeHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "EnvelopeHandle.h" + #include "../../Experimental.h" #include "../../MemoryX.h" diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp index 3adadb9fb..f4ba2fc89 100644 --- a/src/tracks/ui/Scrubbing.cpp +++ b/src/tracks/ui/Scrubbing.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "Scrubbing.h" + #include "../../Experimental.h" #include diff --git a/src/tracks/ui/SliderHandle.cpp b/src/tracks/ui/SliderHandle.cpp index abfd73f9d..77e41a5b8 100644 --- a/src/tracks/ui/SliderHandle.cpp +++ b/src/tracks/ui/SliderHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli #include "../../Audacity.h" #include "SliderHandle.h" + #include "../../widgets/ASlider.h" #include "../../HitTestResult.h" #include "../../Project.h" diff --git a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp index 5cc3140bd..f595164cf 100644 --- a/src/tracks/ui/TimeShiftHandle.cpp +++ b/src/tracks/ui/TimeShiftHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "TimeShiftHandle.h" + #include "../../Experimental.h" #include "TrackControls.h" diff --git a/src/tracks/ui/TrackControls.cpp b/src/tracks/ui/TrackControls.cpp index 4bcf9ae57..a5b2fb09b 100644 --- a/src/tracks/ui/TrackControls.cpp +++ b/src/tracks/ui/TrackControls.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "TrackControls.h" + #include "TrackButtonHandles.h" #include "TrackSelectHandle.h" #include "../../HitTestResult.h" diff --git a/src/tracks/ui/TrackSelectHandle.cpp b/src/tracks/ui/TrackSelectHandle.cpp index eb0d195a5..62d051ee3 100644 --- a/src/tracks/ui/TrackSelectHandle.cpp +++ b/src/tracks/ui/TrackSelectHandle.cpp @@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "TrackSelectHandle.h" + #include "TrackControls.h" #include "../../Experimental.h" #include "../../HitTestResult.h" diff --git a/src/tracks/ui/TrackVRulerControls.cpp b/src/tracks/ui/TrackVRulerControls.cpp index e7a71985c..d6965665c 100644 --- a/src/tracks/ui/TrackVRulerControls.cpp +++ b/src/tracks/ui/TrackVRulerControls.cpp @@ -9,6 +9,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ #include "../../Audacity.h" + #include "../../HitTestResult.h" #include "TrackVRulerControls.h" diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h index 25f718ecb..76f650bda 100644 --- a/src/widgets/ErrorDialog.h +++ b/src/widgets/ErrorDialog.h @@ -13,6 +13,7 @@ #define __AUDACITY_ERRORDIALOG__ #include "../Audacity.h" + #include #include #include diff --git a/src/widgets/HelpSystem.h b/src/widgets/HelpSystem.h index 354f0b67d..0a985d291 100644 --- a/src/widgets/HelpSystem.h +++ b/src/widgets/HelpSystem.h @@ -13,6 +13,7 @@ #define __AUDACITY_HELPSYSTEM__ #include "../Audacity.h" + #include #include diff --git a/src/widgets/LinkingHtmlWindow.cpp b/src/widgets/LinkingHtmlWindow.cpp index 0b385d370..9cd9cc278 100644 --- a/src/widgets/LinkingHtmlWindow.cpp +++ b/src/widgets/LinkingHtmlWindow.cpp @@ -13,11 +13,11 @@ **********************************************************************/ +#include "../Audacity.h" + // For compilers that support precompilation, includes "wx/wx.h". #include -#include "../Audacity.h" - #include #include #include diff --git a/src/widgets/MultiDialog.cpp b/src/widgets/MultiDialog.cpp index f368c9d6d..3b1657b81 100644 --- a/src/widgets/MultiDialog.cpp +++ b/src/widgets/MultiDialog.cpp @@ -19,6 +19,7 @@ for each problem encountered, since there can be many orphans. *//*******************************************************************/ #include "../Audacity.h" + #include "../Project.h" #include "MultiDialog.h" diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp index 1e12564a9..c69df3970 100644 --- a/src/widgets/NumericTextCtrl.cpp +++ b/src/widgets/NumericTextCtrl.cpp @@ -167,6 +167,7 @@ different formats. #include "../Audacity.h" #include "NumericTextCtrl.h" + #include "audacity/Types.h" #include "../Theme.h" #include "../AllThemeResources.h" diff --git a/src/widgets/NumericTextCtrl.h b/src/widgets/NumericTextCtrl.h index 2c41282e2..1a4f3b9e0 100644 --- a/src/widgets/NumericTextCtrl.h +++ b/src/widgets/NumericTextCtrl.h @@ -15,6 +15,8 @@ #ifndef __AUDACITY_TIME_TEXT_CTRL__ #define __AUDACITY_TIME_TEXT_CTRL__ +#include "../Audacity.h" + #include "../MemoryX.h" #include "../../include/audacity/ComponentInterface.h" #include @@ -25,7 +27,6 @@ #include #include -#include "../Audacity.h" #include "../Internat.h" #if wxUSE_ACCESSIBILITY diff --git a/src/widgets/OverlayPanel.cpp b/src/widgets/OverlayPanel.cpp index 9201321a6..6235ea44b 100644 --- a/src/widgets/OverlayPanel.cpp +++ b/src/widgets/OverlayPanel.cpp @@ -8,6 +8,7 @@ #include "../Audacity.h" #include "OverlayPanel.h" + #include "Overlay.h" #include "../AColor.h" #include diff --git a/src/widgets/Warning.cpp b/src/widgets/Warning.cpp index 51a6f528a..6562619e5 100644 --- a/src/widgets/Warning.cpp +++ b/src/widgets/Warning.cpp @@ -17,7 +17,6 @@ the ability to not see similar warnings again for this session. #include "../Audacity.h" - #include "Warning.h" #include "../Prefs.h" diff --git a/src/widgets/Warning.h b/src/widgets/Warning.h index ce08b5742..233ed8919 100644 --- a/src/widgets/Warning.h +++ b/src/widgets/Warning.h @@ -12,6 +12,7 @@ #define __AUDACITY_WARNING__ #include "../Audacity.h" + #include #include diff --git a/src/widgets/numformatter.cpp b/src/widgets/numformatter.cpp index 54f7b90e6..85c1cdf27 100644 --- a/src/widgets/numformatter.cpp +++ b/src/widgets/numformatter.cpp @@ -15,6 +15,8 @@ // headers // ---------------------------------------------------------------------------- +#include "../Audacity.h" + // For compilers that support precompilation, includes "wx.h". #include @@ -28,7 +30,6 @@ #endif -#include "../Audacity.h" #include "numformatter.h" #include "../Internat.h" #include diff --git a/src/widgets/valnum.cpp b/src/widgets/valnum.cpp index 78de7ce30..93e2f4233 100644 --- a/src/widgets/valnum.cpp +++ b/src/widgets/valnum.cpp @@ -19,10 +19,11 @@ // headers // ---------------------------------------------------------------------------- +#include "../Audacity.h" + // For compilers that support precompilation, includes "wx.h". #include -#include "../Audacity.h" #include "valnum.h" #include "ErrorDialog.h" diff --git a/src/widgets/wxPanelWrapper.cpp b/src/widgets/wxPanelWrapper.cpp index 3cea4c659..f5dfae838 100644 --- a/src/widgets/wxPanelWrapper.cpp +++ b/src/widgets/wxPanelWrapper.cpp @@ -8,6 +8,7 @@ #include "../Audacity.h" #include "wxPanelWrapper.h" + #include void wxTabTraversalWrapperCharHook(wxKeyEvent &event) diff --git a/src/xml/XMLTagHandler.h b/src/xml/XMLTagHandler.h index 56c37fd39..07e3ffd96 100644 --- a/src/xml/XMLTagHandler.h +++ b/src/xml/XMLTagHandler.h @@ -19,6 +19,7 @@ #define __AUDACITY_XML_TAG_HANDLER__ #include "../Audacity.h" + #include #include diff --git a/src/xml/XMLWriter.cpp b/src/xml/XMLWriter.cpp index 9d03af47b..2a243da56 100644 --- a/src/xml/XMLWriter.cpp +++ b/src/xml/XMLWriter.cpp @@ -25,6 +25,7 @@ the general functionality for creating XML in UTF8 encoding. *//*******************************************************************/ #include "../Audacity.h" + #include #include #include