From c5ebc396eb06857b4509101fdd2b0620dc0658b3 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 9 May 2021 11:16:56 -0400 Subject: [PATCH] Audacity.h has shrunk to nothing, now remove it! --- modules/mod-null/ModNullCallback.cpp | 2 +- modules/mod-nyq-bench/NyqBench.cpp | 2 +- modules/mod-script-pipe/ScripterCallback.cpp | 1 - src/AColor.cpp | 2 +- src/AboutDialog.cpp | 2 +- src/ActiveProjects.cpp | 2 +- src/ActiveProjects.h | 2 +- src/AdornedRulerPanel.cpp | 2 +- src/AllThemeResources.h | 2 +- src/Audacity.h | 26 ------------------- src/AudacityApp.cpp | 2 +- src/AudacityApp.h | 2 +- src/AudacityException.cpp | 2 +- src/AudacityFileConfig.cpp | 2 +- src/AudacityHeaders.h | 2 +- src/AudacityLogger.cpp | 2 +- src/AudacityLogger.h | 2 +- src/AudioIO.cpp | 2 +- src/AudioIO.h | 2 +- src/AudioIOBase.cpp | 2 +- src/AudioIOBase.h | 2 +- src/AudioIOListener.h | 2 +- src/BatchCommandDialog.cpp | 2 +- src/BatchCommands.cpp | 2 +- src/BatchProcessDialog.cpp | 2 +- src/Benchmark.cpp | 2 +- src/CMakeLists.txt | 1 - src/CellularPanel.cpp | 2 +- src/Clipboard.h | 2 +- src/CommonCommandFlags.cpp | 2 +- src/CommonCommandFlags.h | 2 +- src/CrashReport.cpp | 2 +- src/CrashReport.h | 2 +- src/DeviceChange.h | 2 +- src/DeviceManager.cpp | 2 +- src/Diags.cpp | 2 +- src/EnvelopeEditor.cpp | 2 +- src/FFT.cpp | 2 +- src/FFmpeg.cpp | 2 +- src/FFmpeg.h | 2 +- src/FileException.cpp | 2 +- src/FileFormats.cpp | 2 +- src/FileFormats.h | 2 +- src/FileIO.cpp | 2 +- src/FileNames.cpp | 2 +- src/FileNames.h | 2 +- src/FreqWindow.cpp | 2 +- src/HelpText.cpp | 2 +- src/HistoryWindow.cpp | 2 +- src/ImageManipulation.cpp | 2 +- src/InconsistencyException.cpp | 2 +- src/Internat.h | 2 +- src/InterpolateAudio.h | 2 +- src/KeyboardCapture.h | 2 +- src/LabelDialog.cpp | 2 +- src/LabelTrack.cpp | 2 +- src/LangChoice.cpp | 2 +- src/Languages.cpp | 2 +- src/Legacy.cpp | 2 +- src/Lyrics.h | 2 +- src/Menus.cpp | 2 +- src/Mix.cpp | 2 +- src/MixerBoard.cpp | 2 +- src/MixerBoard.h | 2 +- src/ModuleManager.cpp | 2 +- src/NoteTrack.cpp | 2 +- src/NoteTrack.h | 2 +- src/PitchName.cpp | 2 +- src/PluginManager.cpp | 2 +- src/Prefs.cpp | 2 +- src/Prefs.h | 2 +- src/Printing.cpp | 2 +- src/Profiler.cpp | 2 +- src/Project.cpp | 2 +- src/Project.h | 2 +- src/ProjectAudioManager.cpp | 2 +- src/ProjectSerializer.cpp | 2 +- src/RealFFTf.cpp | 2 +- src/RealFFTf.h | 2 +- src/RealFFTf48x.cpp | 2 +- src/Registrar.h | 2 +- src/Resample.h | 2 +- src/SampleBlock.cpp | 2 +- src/SampleFormat.h | 2 +- src/Screenshot.h | 2 +- src/SelectedRegion.h | 2 +- src/SelectionState.cpp | 2 +- src/Sequence.cpp | 2 +- src/Sequence.h | 2 +- src/Shuttle.cpp | 2 +- src/ShuttleGui.cpp | 2 +- src/ShuttleGui.h | 2 +- src/ShuttlePrefs.cpp | 2 +- src/Snap.cpp | 2 +- src/SoundActivatedRecord.cpp | 2 +- src/SpectrumAnalyst.cpp | 2 +- src/SplashDialog.cpp | 2 +- src/Tags.cpp | 2 +- src/Tags.h | 2 +- src/TempDirectory.h | 2 +- src/Theme.cpp | 2 +- src/Theme.h | 2 +- src/TimeDialog.cpp | 2 +- src/TimeTrack.cpp | 2 +- src/TimerRecordDialog.cpp | 2 +- src/Track.cpp | 2 +- src/Track.h | 2 +- src/TrackArtist.cpp | 2 +- src/TrackArtist.h | 2 +- src/TrackInfo.cpp | 2 +- src/TrackInfo.h | 2 +- src/TrackPanel.cpp | 2 +- src/TrackPanel.h | 2 +- src/TrackPanelAx.cpp | 2 +- src/TrackPanelAx.h | 2 +- src/TrackPanelCell.h | 2 +- src/TrackPanelDrawable.h | 2 +- src/TrackPanelListener.h | 2 +- src/TrackPanelResizeHandle.cpp | 2 +- src/TrackPanelResizerCell.cpp | 2 +- src/UIHandle.cpp | 2 +- src/UndoManager.cpp | 2 +- src/UserException.cpp | 2 +- src/VoiceKey.cpp | 2 +- src/WaveClip.h | 2 +- src/WrappedType.cpp | 2 +- src/WrappedType.h | 2 +- src/ZoomInfo.cpp | 2 +- src/commands/AppCommandEvent.h | 2 +- src/commands/AudacityCommand.cpp | 2 +- src/commands/AudacityCommand.h | 2 +- src/commands/BatchEvalCommand.cpp | 2 +- src/commands/Command.cpp | 2 +- src/commands/CommandBuilder.cpp | 2 +- src/commands/CommandContext.cpp | 2 +- src/commands/CommandDirectory.cpp | 2 +- src/commands/CommandHandler.cpp | 2 +- src/commands/CommandManager.cpp | 2 +- src/commands/CommandSignature.cpp | 2 +- src/commands/CommandTargets.cpp | 2 +- src/commands/CommandType.cpp | 2 +- src/commands/CompareAudioCommand.cpp | 2 +- src/commands/Demo.cpp | 2 +- src/commands/DragCommand.cpp | 2 +- src/commands/GetInfoCommand.cpp | 2 +- src/commands/GetTrackInfoCommand.cpp | 2 +- src/commands/HelpCommand.cpp | 2 +- src/commands/ImportExportCommands.cpp | 2 +- src/commands/Keyboard.cpp | 2 +- src/commands/LoadCommands.cpp | 2 +- src/commands/MessageCommand.cpp | 2 +- src/commands/OpenSaveCommands.cpp | 2 +- src/commands/PreferenceCommands.cpp | 2 +- src/commands/ScreenshotCommand.cpp | 2 +- src/commands/ScriptCommandRelay.h | 2 +- src/commands/SelectCommand.cpp | 2 +- src/commands/SetClipCommand.cpp | 2 +- src/commands/SetEnvelopeCommand.cpp | 2 +- src/commands/SetLabelCommand.cpp | 2 +- src/commands/SetProjectCommand.cpp | 2 +- src/commands/SetTrackInfoCommand.cpp | 2 +- src/effects/Amplify.cpp | 2 +- src/effects/AutoDuck.cpp | 2 +- src/effects/BassTreble.cpp | 2 +- src/effects/Biquad.cpp | 2 +- src/effects/ChangePitch.cpp | 2 +- src/effects/ChangePitch.h | 2 +- src/effects/ChangeSpeed.cpp | 2 +- src/effects/ChangeTempo.cpp | 2 +- src/effects/ChangeTempo.h | 2 +- src/effects/ClickRemoval.cpp | 2 +- src/effects/Compressor.cpp | 2 +- src/effects/Contrast.cpp | 2 +- src/effects/Distortion.cpp | 2 +- src/effects/DtmfGen.cpp | 2 +- src/effects/Echo.cpp | 2 +- src/effects/Effect.cpp | 2 +- src/effects/Effect.h | 2 +- src/effects/EffectManager.cpp | 2 +- src/effects/EffectUI.cpp | 2 +- src/effects/Equalization.cpp | 2 +- src/effects/Equalization48x.cpp | 2 +- src/effects/Fade.cpp | 2 +- src/effects/FindClipping.cpp | 2 +- src/effects/Invert.cpp | 2 +- src/effects/LoadEffects.cpp | 2 +- src/effects/Loudness.cpp | 2 +- src/effects/Noise.cpp | 2 +- src/effects/NoiseReduction.cpp | 2 +- src/effects/NoiseRemoval.cpp | 2 +- src/effects/NoiseRemoval.h | 2 +- src/effects/Normalize.cpp | 2 +- src/effects/Paulstretch.cpp | 2 +- src/effects/Phaser.cpp | 2 +- src/effects/RealtimeEffectManager.cpp | 2 +- src/effects/Repair.cpp | 2 +- src/effects/Repeat.cpp | 2 +- src/effects/Reverb.cpp | 2 +- src/effects/Reverse.cpp | 2 +- src/effects/SBSMSEffect.cpp | 2 +- src/effects/SBSMSEffect.h | 2 +- src/effects/ScienFilter.cpp | 2 +- src/effects/ScoreAlignDialog.cpp | 2 +- src/effects/Silence.cpp | 2 +- src/effects/SimpleMono.cpp | 2 +- src/effects/SoundTouchEffect.cpp | 2 +- src/effects/SoundTouchEffect.h | 2 +- src/effects/StereoToMono.cpp | 2 +- src/effects/TimeScale.cpp | 2 +- src/effects/TimeScale.h | 2 +- src/effects/TimeWarper.cpp | 2 +- src/effects/ToneGen.cpp | 2 +- src/effects/TruncSilence.cpp | 2 +- src/effects/TwoPassSimpleMono.cpp | 2 +- src/effects/VST/VSTControlOSX.mm | 2 +- src/effects/VST/VSTEffect.cpp | 2 +- src/effects/VST/VSTEffect.h | 2 +- src/effects/Wahwah.cpp | 2 +- src/effects/audiounits/AUControl.mm | 2 +- src/effects/audiounits/AudioUnitEffect.cpp | 2 +- src/effects/audiounits/AudioUnitEffect.h | 2 +- src/effects/ladspa/LadspaEffect.cpp | 2 +- src/effects/lv2/LV2Effect.cpp | 2 +- src/effects/lv2/LV2Effect.h | 2 +- src/effects/lv2/LoadLV2.cpp | 2 +- src/effects/nyquist/LoadNyquist.cpp | 2 +- src/effects/nyquist/Nyquist.cpp | 2 +- src/effects/vamp/LoadVamp.cpp | 2 +- src/effects/vamp/LoadVamp.h | 2 +- src/effects/vamp/VampEffect.cpp | 2 +- src/effects/vamp/VampEffect.h | 2 +- src/export/Export.cpp | 2 +- src/export/ExportCL.cpp | 2 +- src/export/ExportFFmpeg.cpp | 4 +-- src/export/ExportFFmpegDialogs.cpp | 4 +-- src/export/ExportFFmpegDialogs.h | 4 +-- src/export/ExportFLAC.cpp | 2 +- src/export/ExportMP2.cpp | 2 +- src/export/ExportMP3.cpp | 2 +- src/export/ExportMultiple.cpp | 2 +- src/export/ExportOGG.cpp | 2 +- src/export/ExportPCM.cpp | 2 +- src/float_cast.h | 2 +- src/import/Import.cpp | 2 +- src/import/ImportAUP.cpp | 2 +- src/import/ImportFFmpeg.cpp | 2 +- src/import/ImportFLAC.cpp | 2 +- src/import/ImportLOF.cpp | 2 +- src/import/ImportMIDI.cpp | 2 +- src/import/ImportMIDI.h | 2 +- src/import/ImportMP3.cpp | 2 +- src/import/ImportOGG.cpp | 2 +- src/import/ImportPCM.cpp | 2 +- src/import/ImportPlugin.h | 2 +- src/import/ImportRaw.cpp | 2 +- src/import/RawAudioGuess.cpp | 2 +- src/menus/EditMenus.cpp | 2 +- src/menus/FileMenus.cpp | 2 +- src/menus/HelpMenus.cpp | 2 +- src/menus/NavigationMenus.cpp | 2 +- src/menus/PluginMenus.cpp | 2 +- src/menus/SelectMenus.cpp | 2 +- src/menus/ToolbarMenus.cpp | 2 +- src/menus/TrackMenus.cpp | 2 +- src/menus/TransportMenus.cpp | 2 +- src/menus/ViewMenus.cpp | 2 +- src/menus/WindowMenus.cpp | 2 +- src/prefs/BatchPrefs.cpp | 2 +- src/prefs/DevicePrefs.cpp | 2 +- src/prefs/DirectoriesPrefs.cpp | 2 +- src/prefs/EffectsPrefs.cpp | 2 +- src/prefs/ExtImportPrefs.cpp | 2 +- src/prefs/GUIPrefs.cpp | 2 +- src/prefs/ImportExportPrefs.cpp | 2 +- src/prefs/KeyConfigPrefs.cpp | 2 +- src/prefs/LibraryPrefs.cpp | 2 +- src/prefs/MidiIOPrefs.cpp | 2 +- src/prefs/ModulePrefs.cpp | 2 +- src/prefs/MousePrefs.cpp | 2 +- src/prefs/PlaybackPrefs.cpp | 2 +- src/prefs/PrefsDialog.cpp | 2 +- src/prefs/QualityPrefs.cpp | 2 +- src/prefs/RecordingPrefs.cpp | 2 +- src/prefs/RecordingPrefs.h | 2 +- src/prefs/SpectrogramSettings.cpp | 2 +- src/prefs/SpectrumPrefs.cpp | 2 +- src/prefs/ThemePrefs.cpp | 2 +- src/prefs/TracksBehaviorsPrefs.cpp | 2 +- src/prefs/TracksPrefs.cpp | 2 +- src/prefs/WarningsPrefs.cpp | 2 +- src/prefs/WaveformPrefs.cpp | 2 +- src/prefs/WaveformSettings.cpp | 2 +- src/toolbars/ControlToolBar.cpp | 2 +- src/toolbars/DeviceToolBar.cpp | 2 +- src/toolbars/EditToolBar.cpp | 2 +- src/toolbars/MeterToolBar.cpp | 2 +- src/toolbars/MixerToolBar.cpp | 2 +- src/toolbars/ScrubbingToolBar.cpp | 2 +- src/toolbars/SelectionBar.cpp | 2 +- src/toolbars/SpectralSelectionBar.cpp | 2 +- src/toolbars/SpectralSelectionBarListener.h | 2 +- src/toolbars/TimeToolBar.cpp | 2 +- src/toolbars/ToolBar.cpp | 2 +- src/toolbars/ToolDock.cpp | 2 +- src/toolbars/ToolManager.cpp | 2 +- src/toolbars/ToolsToolBar.cpp | 2 +- src/toolbars/TranscriptionToolBar.cpp | 2 +- .../labeltrack/ui/LabelDefaultClickHandle.cpp | 2 +- src/tracks/labeltrack/ui/LabelGlyphHandle.cpp | 2 +- src/tracks/labeltrack/ui/LabelTextHandle.cpp | 2 +- .../labeltrack/ui/LabelTrackControls.cpp | 2 +- .../ui/LabelTrackVRulerControls.cpp | 2 +- src/tracks/labeltrack/ui/LabelTrackView.cpp | 2 +- .../notetrack/ui/NoteTrackButtonHandle.cpp | 2 +- .../notetrack/ui/NoteTrackControls.cpp | 2 +- .../notetrack/ui/NoteTrackControls.h | 2 +- .../notetrack/ui/NoteTrackSliderHandles.cpp | 2 +- .../notetrack/ui/NoteTrackVRulerControls.cpp | 2 +- .../notetrack/ui/NoteTrackVZoomHandle.cpp | 2 +- .../notetrack/ui/NoteTrackView.cpp | 2 +- .../notetrack/ui/StretchHandle.cpp | 2 +- .../ui/PlayableTrackButtonHandles.cpp | 2 +- .../ui/PlayableTrackControls.cpp | 2 +- .../wavetrack/ui/CutlineHandle.cpp | 2 +- .../wavetrack/ui/SampleHandle.cpp | 2 +- .../wavetrack/ui/SpectrumVZoomHandle.cpp | 2 +- .../wavetrack/ui/SpectrumView.cpp | 2 +- .../wavetrack/ui/WaveTrackControls.cpp | 2 +- .../wavetrack/ui/WaveTrackSliderHandles.cpp | 2 +- .../wavetrack/ui/WaveTrackVRulerControls.cpp | 2 +- .../wavetrack/ui/WaveTrackVZoomHandle.cpp | 2 +- .../wavetrack/ui/WaveformVZoomHandle.cpp | 2 +- .../wavetrack/ui/WaveformView.cpp | 2 +- src/tracks/timetrack/ui/TimeTrackControls.cpp | 2 +- .../timetrack/ui/TimeTrackVRulerControls.cpp | 2 +- .../timetrack/ui/TimeTrackVZoomHandle.cpp | 2 +- src/tracks/ui/BackgroundCell.cpp | 2 +- src/tracks/ui/ButtonHandle.cpp | 2 +- src/tracks/ui/CommonTrackPanelCell.h | 2 +- src/tracks/ui/EditCursorOverlay.cpp | 2 +- src/tracks/ui/EnvelopeHandle.cpp | 2 +- src/tracks/ui/PlayIndicatorOverlay.cpp | 2 +- src/tracks/ui/Scrubbing.cpp | 2 +- src/tracks/ui/Scrubbing.h | 2 +- src/tracks/ui/SelectHandle.cpp | 2 +- src/tracks/ui/SliderHandle.cpp | 2 +- src/tracks/ui/TimeShiftHandle.cpp | 2 +- src/tracks/ui/TrackButtonHandles.cpp | 2 +- src/tracks/ui/TrackControls.cpp | 2 +- src/tracks/ui/TrackSelectHandle.cpp | 2 +- src/tracks/ui/TrackVRulerControls.cpp | 2 +- src/tracks/ui/ZoomHandle.cpp | 2 +- src/widgets/AButton.cpp | 2 +- src/widgets/ASlider.cpp | 2 +- src/widgets/AttachableScrollBar.cpp | 2 +- src/widgets/BackedPanel.cpp | 2 +- src/widgets/ErrorDialog.cpp | 2 +- src/widgets/ErrorDialog.h | 2 +- src/widgets/FileConfig.cpp | 2 +- src/widgets/FileHistory.cpp | 2 +- src/widgets/Grabber.cpp | 2 +- src/widgets/Grabber.h | 2 +- src/widgets/Grid.cpp | 2 +- src/widgets/HelpSystem.cpp | 2 +- src/widgets/HelpSystem.h | 2 +- src/widgets/HtmlWindow.cpp | 2 +- src/widgets/HtmlWindow.h | 2 +- src/widgets/ImageRoll.cpp | 2 +- src/widgets/KeyView.cpp | 2 +- src/widgets/KeyView.h | 2 +- src/widgets/Meter.cpp | 2 +- src/widgets/MultiDialog.cpp | 2 +- src/widgets/NumericTextCtrl.cpp | 2 +- src/widgets/NumericTextCtrl.h | 2 +- src/widgets/Overlay.h | 2 +- src/widgets/OverlayPanel.cpp | 2 +- src/widgets/PopupMenuTable.cpp | 2 +- src/widgets/ProgressDialog.cpp | 2 +- src/widgets/ProgressDialog.h | 2 +- src/widgets/ReadOnlyText.h | 2 +- src/widgets/Ruler.cpp | 2 +- src/widgets/Warning.cpp | 2 +- src/widgets/Warning.h | 2 +- src/widgets/numformatter.cpp | 2 +- src/widgets/valnum.cpp | 2 +- src/widgets/wxPanelWrapper.cpp | 2 +- src/widgets/wxTextCtrlWrapper.h | 2 +- src/xml/XMLFileReader.h | 2 +- src/xml/XMLTagHandler.cpp | 2 +- src/xml/XMLTagHandler.h | 2 +- src/xml/XMLWriter.cpp | 2 +- win/audacity.rc | 2 -- 392 files changed, 391 insertions(+), 421 deletions(-) delete mode 100644 src/Audacity.h diff --git a/modules/mod-null/ModNullCallback.cpp b/modules/mod-null/ModNullCallback.cpp index 26636ad4e..b3fe3d837 100644 --- a/modules/mod-null/ModNullCallback.cpp +++ b/modules/mod-null/ModNullCallback.cpp @@ -27,7 +27,7 @@ click from the menu into the actual function to be called. #include #include "ModNullCallback.h" -#include "Audacity.h" + #include "ModuleManager.h" #include "ShuttleGui.h" #include "Project.h" diff --git a/modules/mod-nyq-bench/NyqBench.cpp b/modules/mod-nyq-bench/NyqBench.cpp index 54518b4cd..626b1d830 100755 --- a/modules/mod-nyq-bench/NyqBench.cpp +++ b/modules/mod-nyq-bench/NyqBench.cpp @@ -6,7 +6,7 @@ **********************************************************************/ -#include "Audacity.h" + #include diff --git a/modules/mod-script-pipe/ScripterCallback.cpp b/modules/mod-script-pipe/ScripterCallback.cpp index b5427dc91..513096233 100644 --- a/modules/mod-script-pipe/ScripterCallback.cpp +++ b/modules/mod-script-pipe/ScripterCallback.cpp @@ -15,7 +15,6 @@ #include #include "ScripterCallback.h" -#include "../../src/Audacity.h" /* There are several functions that can be used in a GUI module. diff --git a/src/AColor.cpp b/src/AColor.cpp index 2a5d5cf41..097ad04ba 100644 --- a/src/AColor.cpp +++ b/src/AColor.cpp @@ -17,7 +17,7 @@ It is also a place to document colour usage policy in Audacity *//********************************************************************/ -#include "Audacity.h" + #include "AColor.h" diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index e82c9e76e..798e9ee8a 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -25,7 +25,7 @@ hold information about one contributor to Audacity. *//********************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "AboutDialog.h" diff --git a/src/ActiveProjects.cpp b/src/ActiveProjects.cpp index 4215cac75..7e2967461 100644 --- a/src/ActiveProjects.cpp +++ b/src/ActiveProjects.cpp @@ -11,7 +11,7 @@ *//********************************************************************/ -#include "Audacity.h" + #include "ActiveProjects.h" #include "Prefs.h" diff --git a/src/ActiveProjects.h b/src/ActiveProjects.h index 71d8e12dc..aff9dabe6 100644 --- a/src/ActiveProjects.h +++ b/src/ActiveProjects.h @@ -9,7 +9,7 @@ #ifndef __AUDACITY_ACTIVE_PROJECTS__ #define __AUDACITY_ACTIVE_PROJECTS__ -#include "Audacity.h" + #include "audacity/Types.h" #include diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp index d88f28b9a..ea8a8ed2e 100644 --- a/src/AdornedRulerPanel.cpp +++ b/src/AdornedRulerPanel.cpp @@ -18,7 +18,7 @@ *//******************************************************************/ -#include "Audacity.h" + #include "AdornedRulerPanel.h" diff --git a/src/AllThemeResources.h b/src/AllThemeResources.h index a5f3601f4..e62b72dec 100644 --- a/src/AllThemeResources.h +++ b/src/AllThemeResources.h @@ -44,7 +44,7 @@ from there. Audacity will look for a file called "Pause.png". // Note: No '#ifndef/#define' pair on this header file. // we want to include it multiple times in Theme.cpp. -#include "Audacity.h" + #include "MacroMagic.h" diff --git a/src/Audacity.h b/src/Audacity.h deleted file mode 100644 index 1fe3481d1..000000000 --- a/src/Audacity.h +++ /dev/null @@ -1,26 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - Audacity(R) is copyright (c) 1999-2015 Audacity Team. - License: GPL v2. See License.txt. - - Audacity.h - - Dominic Mazzoni - Joshua Haberman - Vaughan Johnson - et alii - -********************************************************************//*! - -\file Audacity.h - - This is the main include file for Audacity. All files which need - any Audacity-specific \#defines or need to access any of Audacity's - global functions should \#include this file. - -*//********************************************************************/ - -#ifndef __AUDACITY_H__ -#define __AUDACITY_H__ -#endif // __AUDACITY_H__ diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index aa37206dd..f5c63c9ad 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -15,7 +15,7 @@ It handles initialization and termination by subclassing wxApp. *//*******************************************************************/ -#include "Audacity.h" // This should always be included first; for USE_* macros and __UNIX__ + #include "AudacityApp.h" diff --git a/src/AudacityApp.h b/src/AudacityApp.h index b6a65ac83..6241c2d34 100644 --- a/src/AudacityApp.h +++ b/src/AudacityApp.h @@ -14,7 +14,7 @@ #ifndef __AUDACITY_APP__ #define __AUDACITY_APP__ -#include "Audacity.h" + #include "audacity/Types.h" diff --git a/src/AudacityException.cpp b/src/AudacityException.cpp index 6f9ae3c0e..c571d509a 100644 --- a/src/AudacityException.cpp +++ b/src/AudacityException.cpp @@ -9,7 +9,7 @@ ***********************************************************************/ -#include "Audacity.h" + #include "AudacityException.h" #include diff --git a/src/AudacityFileConfig.cpp b/src/AudacityFileConfig.cpp index fb0bd7936..cd9abdab4 100644 --- a/src/AudacityFileConfig.cpp +++ b/src/AudacityFileConfig.cpp @@ -8,7 +8,7 @@ Paul Licameli split from Prefs.cpp **********************************************************************/ -#include "Audacity.h" + #include "AudacityFileConfig.h" #include "widgets/HelpSystem.h" diff --git a/src/AudacityHeaders.h b/src/AudacityHeaders.h index 4219dbab8..fcd49bf9e 100644 --- a/src/AudacityHeaders.h +++ b/src/AudacityHeaders.h @@ -17,7 +17,7 @@ **********************************************************************/ -#include "Audacity.h" + #include #include diff --git a/src/AudacityLogger.cpp b/src/AudacityLogger.cpp index 2551e8b82..a11fbad60 100644 --- a/src/AudacityLogger.cpp +++ b/src/AudacityLogger.cpp @@ -14,7 +14,7 @@ Provides thread-safe logging based on the wxWidgets log facility. *//*******************************************************************/ -#include "Audacity.h" // This should always be included first + #include "AudacityLogger.h" diff --git a/src/AudacityLogger.h b/src/AudacityLogger.h index 23499323b..925619b97 100644 --- a/src/AudacityLogger.h +++ b/src/AudacityLogger.h @@ -14,7 +14,7 @@ #ifndef __AUDACITY_LOGGER__ #define __AUDACITY_LOGGER__ -#include "Audacity.h" + diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp index 39261002a..0bf03e122 100644 --- a/src/AudioIO.cpp +++ b/src/AudioIO.cpp @@ -413,7 +413,7 @@ time warp info and AudioIOListener and whether the playback is looped. *//*******************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "AudioIO.h" diff --git a/src/AudioIO.h b/src/AudioIO.h index 409a7c067..e95f4c984 100644 --- a/src/AudioIO.h +++ b/src/AudioIO.h @@ -13,7 +13,7 @@ #ifndef __AUDACITY_AUDIO_IO__ #define __AUDACITY_AUDIO_IO__ -#include "Audacity.h" // for USE_* macros + #include "AudioIOBase.h" // to inherit diff --git a/src/AudioIOBase.cpp b/src/AudioIOBase.cpp index f88e2441b..b3920f538 100644 --- a/src/AudioIOBase.cpp +++ b/src/AudioIOBase.cpp @@ -8,7 +8,7 @@ Paul Licameli split from AudioIO.cpp **********************************************************************/ -#include "Audacity.h" + #include "AudioIOBase.h" diff --git a/src/AudioIOBase.h b/src/AudioIOBase.h index 7101a3923..8490ea4e2 100644 --- a/src/AudioIOBase.h +++ b/src/AudioIOBase.h @@ -11,7 +11,7 @@ Paul Licameli split from AudioIO.h #ifndef __AUDACITY_AUDIO_IO_BASE__ #define __AUDACITY_AUDIO_IO_BASE__ -#include "Audacity.h" // for USE_* macros + #include diff --git a/src/AudioIOListener.h b/src/AudioIOListener.h index a07973018..9367a5b8c 100644 --- a/src/AudioIOListener.h +++ b/src/AudioIOListener.h @@ -13,7 +13,7 @@ #ifndef __AUDACITY_AUDIO_IO_LISTENER__ #define __AUDACITY_AUDIO_IO_LISTENER__ -#include "Audacity.h" + class WaveTrack; using WaveTrackArray = diff --git a/src/BatchCommandDialog.cpp b/src/BatchCommandDialog.cpp index 07f23e354..402469a5b 100644 --- a/src/BatchCommandDialog.cpp +++ b/src/BatchCommandDialog.cpp @@ -18,7 +18,7 @@ selected command. *//*******************************************************************/ -#include "Audacity.h" + #include "BatchCommandDialog.h" #ifdef __WXMSW__ diff --git a/src/BatchCommands.cpp b/src/BatchCommands.cpp index 13ef58cbc..60dc787e1 100644 --- a/src/BatchCommands.cpp +++ b/src/BatchCommands.cpp @@ -17,7 +17,7 @@ processing. See also MacrosWindow and ApplyMacroDialog. #define wxLOG_COMPONENT "MacroCommands" -#include "Audacity.h" // for USE_* macros + #include "BatchCommands.h" #include diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp index 9393dedb1..32390e9c0 100644 --- a/src/BatchProcessDialog.cpp +++ b/src/BatchProcessDialog.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "BatchProcessDialog.h" #include // for wxUSE_* macros diff --git a/src/Benchmark.cpp b/src/Benchmark.cpp index e786f89b5..d3d71cb7d 100644 --- a/src/Benchmark.cpp +++ b/src/Benchmark.cpp @@ -15,7 +15,7 @@ of sample block storage. *//*******************************************************************/ -#include "Audacity.h" + #include "Benchmark.h" #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6334f84ca..3ff5911fb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,7 +72,6 @@ list( APPEND SOURCES AllThemeResources.cpp AllThemeResources.h AttachedVirtualFunction.h - Audacity.h AudacityApp.cpp AudacityApp.h $<$:AudacityApp.mm> diff --git a/src/CellularPanel.cpp b/src/CellularPanel.cpp index 3fb25a60c..77c211273 100644 --- a/src/CellularPanel.cpp +++ b/src/CellularPanel.cpp @@ -27,7 +27,7 @@ *//*****************************************************************/ -#include "Audacity.h" + #include "CellularPanel.h" #include diff --git a/src/Clipboard.h b/src/Clipboard.h index bbd7c669b..6c446aad4 100644 --- a/src/Clipboard.h +++ b/src/Clipboard.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_CLIPBOARD__ #define __AUDACITY_CLIPBOARD__ -#include "Audacity.h" + #include #include // to inherit wxEvtHandler diff --git a/src/CommonCommandFlags.cpp b/src/CommonCommandFlags.cpp index da38a35d8..3c40dd21f 100644 --- a/src/CommonCommandFlags.cpp +++ b/src/CommonCommandFlags.cpp @@ -8,7 +8,7 @@ Paul Licameli split from Menus.cpp **********************************************************************/ -#include "Audacity.h" + #include "CommonCommandFlags.h" diff --git a/src/CommonCommandFlags.h b/src/CommonCommandFlags.h index 7c1ad372f..af5052657 100644 --- a/src/CommonCommandFlags.h +++ b/src/CommonCommandFlags.h @@ -11,7 +11,7 @@ Paul Licameli split from Menus.cpp #ifndef __AUDACITY_COMMON_COMMAND_FLAGS__ #define __AUDACITY_COMMON_COMMAND_FLAGS__ -#include "Audacity.h" + #include "commands/CommandFlag.h" diff --git a/src/CrashReport.cpp b/src/CrashReport.cpp index 3f6f55dca..1a8f60e76 100644 --- a/src/CrashReport.cpp +++ b/src/CrashReport.cpp @@ -6,7 +6,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "CrashReport.h" #if defined(HAS_CRASH_REPORT) diff --git a/src/CrashReport.h b/src/CrashReport.h index f72f442b2..96e21a5f9 100644 --- a/src/CrashReport.h +++ b/src/CrashReport.h @@ -14,7 +14,7 @@ #undef HAS_CRASH_REPORT -#include "Audacity.h" + #if defined(EXPERIMENTAL_CRASH_REPORT) diff --git a/src/DeviceChange.h b/src/DeviceChange.h index 8cb62eae5..e9eb475db 100644 --- a/src/DeviceChange.h +++ b/src/DeviceChange.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_DEVICECHANGE_H__ #define __AUDACITY_DEVICECHANGE_H__ -#include "Audacity.h" // for HAVE_LIBUDEV_H + diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp index 32c85a755..07f4f370d 100644 --- a/src/DeviceManager.cpp +++ b/src/DeviceManager.cpp @@ -6,7 +6,7 @@ ******************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "DeviceManager.h" // For compilers that support precompilation, includes "wx/wx.h". diff --git a/src/Diags.cpp b/src/Diags.cpp index d442f4b96..f3227141c 100644 --- a/src/Diags.cpp +++ b/src/Diags.cpp @@ -28,7 +28,7 @@ count down so that we track how many times the event happens. *//********************************************************************/ -#include "Audacity.h" + #include "Diags.h" #include diff --git a/src/EnvelopeEditor.cpp b/src/EnvelopeEditor.cpp index 20cc40f40..a4556b2b3 100644 --- a/src/EnvelopeEditor.cpp +++ b/src/EnvelopeEditor.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "Audacity.h" + #include "EnvelopeEditor.h" diff --git a/src/FFT.cpp b/src/FFT.cpp index 9bac8edd1..158ba2f63 100644 --- a/src/FFT.cpp +++ b/src/FFT.cpp @@ -39,7 +39,7 @@ * 9: Gaussian(a=4.5) */ -#include "Audacity.h" + #include "FFT.h" #include "Internat.h" diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index 6fccf1d16..9c3431aa1 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -17,7 +17,7 @@ License: GPL v2. See License.txt. // Store function pointers here when including FFmpeg.h #define DEFINE_FFMPEG_POINTERS -#include "Audacity.h" // for config*.h // for USE_* macros + #include "FFmpeg.h" #include "FileNames.h" diff --git a/src/FFmpeg.h b/src/FFmpeg.h index 41428cab6..8f5abb2f3 100644 --- a/src/FFmpeg.h +++ b/src/FFmpeg.h @@ -16,7 +16,7 @@ Describes shared object that is used to access FFmpeg libraries. #if !defined(__AUDACITY_FFMPEG__) #define __AUDACITY_FFMPEG__ -#include "Audacity.h" // for USE_* macros + #include "widgets/wxPanelWrapper.h" // to inherit diff --git a/src/FileException.cpp b/src/FileException.cpp index 16c8fea07..e84c09ae1 100644 --- a/src/FileException.cpp +++ b/src/FileException.cpp @@ -7,7 +7,7 @@ */ -#include "Audacity.h" + #include "FileException.h" #include "FileNames.h" diff --git a/src/FileFormats.cpp b/src/FileFormats.cpp index 6a250b0f6..457dae154 100644 --- a/src/FileFormats.cpp +++ b/src/FileFormats.cpp @@ -15,7 +15,7 @@ information. *//*******************************************************************/ -#include "Audacity.h" + #include "FileFormats.h" #include diff --git a/src/FileFormats.h b/src/FileFormats.h index 8ec006704..596fb54a9 100644 --- a/src/FileFormats.h +++ b/src/FileFormats.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_FILE_FORMATS__ #define __AUDACITY_FILE_FORMATS__ -#include "Audacity.h" // for __UNIX__ + #include "audacity/Types.h" diff --git a/src/FileIO.cpp b/src/FileIO.cpp index edded2a30..2e7c04e2c 100644 --- a/src/FileIO.cpp +++ b/src/FileIO.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "Audacity.h" + #include "FileIO.h" #include diff --git a/src/FileNames.cpp b/src/FileNames.cpp index cb22c2786..2e238b856 100644 --- a/src/FileNames.cpp +++ b/src/FileNames.cpp @@ -20,7 +20,7 @@ used throughout Audacity into this one place. *//********************************************************************/ -#include "Audacity.h" + #include "FileNames.h" diff --git a/src/FileNames.h b/src/FileNames.h index b88ba34dd..c7a8212e0 100644 --- a/src/FileNames.h +++ b/src/FileNames.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_FILE_NAMES__ #define __AUDACITY_FILE_NAMES__ -#include "Audacity.h" + #include // for wxDIR_FILES #include // function return value diff --git a/src/FreqWindow.cpp b/src/FreqWindow.cpp index 0b66a2343..02a2ba7b1 100644 --- a/src/FreqWindow.cpp +++ b/src/FreqWindow.cpp @@ -32,7 +32,7 @@ the mouse around. */ -#include "Audacity.h" + #include "FreqWindow.h" #include diff --git a/src/HelpText.cpp b/src/HelpText.cpp index d22054b37..29149585a 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -12,7 +12,7 @@ \brief Given a key, returns some html. *//********************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "HelpText.h" diff --git a/src/HistoryWindow.cpp b/src/HistoryWindow.cpp index dea40b396..461aec39d 100644 --- a/src/HistoryWindow.cpp +++ b/src/HistoryWindow.cpp @@ -16,7 +16,7 @@ undo memory so as to free up space. *//*******************************************************************/ -#include "Audacity.h" + #include "HistoryWindow.h" #include diff --git a/src/ImageManipulation.cpp b/src/ImageManipulation.cpp index 97bf9774e..38cab933a 100644 --- a/src/ImageManipulation.cpp +++ b/src/ImageManipulation.cpp @@ -22,7 +22,7 @@ channel. This collection of functions fills that gap. *//*********************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "ImageManipulation.h" #include diff --git a/src/InconsistencyException.cpp b/src/InconsistencyException.cpp index e3c771590..acce74e79 100644 --- a/src/InconsistencyException.cpp +++ b/src/InconsistencyException.cpp @@ -7,7 +7,7 @@ */ -#include "Audacity.h" + #include "InconsistencyException.h" InconsistencyException::~InconsistencyException() diff --git a/src/Internat.h b/src/Internat.h index b6edc94b0..c0b18dea7 100644 --- a/src/Internat.h +++ b/src/Internat.h @@ -12,7 +12,7 @@ #ifndef __AUDACITY_INTERNAT__ #define __AUDACITY_INTERNAT__ -#include "Audacity.h" + #include diff --git a/src/InterpolateAudio.h b/src/InterpolateAudio.h index ea3b094e0..d19c8d58e 100644 --- a/src/InterpolateAudio.h +++ b/src/InterpolateAudio.h @@ -25,7 +25,7 @@ #ifndef __AUDACITY_INTERPOLATE_AUDIO__ #define __AUDACITY_INTERPOLATE_AUDIO__ -#include "Audacity.h" + #include // See top of file for a description of the algorithm. Interpolates diff --git a/src/KeyboardCapture.h b/src/KeyboardCapture.h index d6285eb35..463bae4c2 100644 --- a/src/KeyboardCapture.h +++ b/src/KeyboardCapture.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_KEYBOARD_CAPTURE__ #define __AUDACITY_KEYBOARD_CAPTURE__ -#include "Audacity.h" + #include #include diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp index 048eeb1ca..715c3555e 100644 --- a/src/LabelDialog.cpp +++ b/src/LabelDialog.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "LabelDialog.h" #include diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp index feadd863e..1d6e7b08a 100644 --- a/src/LabelTrack.cpp +++ b/src/LabelTrack.cpp @@ -28,7 +28,7 @@ for drawing different aspects of the label and its text box. *//*******************************************************************/ -#include "Audacity.h" // for HAVE_GTK + #include "LabelTrack.h" #include "tracks/ui/TrackView.h" diff --git a/src/LangChoice.cpp b/src/LangChoice.cpp index 75bed5281..3b82b6486 100644 --- a/src/LangChoice.cpp +++ b/src/LangChoice.cpp @@ -15,7 +15,7 @@ of languages for Audacity. *//*******************************************************************/ -#include "Audacity.h" + #include "LangChoice.h" #include diff --git a/src/Languages.cpp b/src/Languages.cpp index b47e6fbd4..5f04b41de 100644 --- a/src/Languages.cpp +++ b/src/Languages.cpp @@ -30,7 +30,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "Languages.h" #include "MemoryX.h" diff --git a/src/Legacy.cpp b/src/Legacy.cpp index dc587c430..af1b98d4a 100644 --- a/src/Legacy.cpp +++ b/src/Legacy.cpp @@ -26,7 +26,7 @@ On failure the old version is put back in place. *//*******************************************************************/ -#include "Audacity.h" + #include "Legacy.h" #include diff --git a/src/Lyrics.h b/src/Lyrics.h index 7e3dd48f2..76a0e2112 100644 --- a/src/Lyrics.h +++ b/src/Lyrics.h @@ -12,7 +12,7 @@ #ifndef __AUDACITY_LYRICS__ #define __AUDACITY_LYRICS__ -#include "Audacity.h" + #include #include // to inherit diff --git a/src/Menus.cpp b/src/Menus.cpp index 7cb4dd962..253420a51 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -25,7 +25,7 @@ *//*******************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "Menus.h" diff --git a/src/Mix.cpp b/src/Mix.cpp index 775d967a2..158343c88 100644 --- a/src/Mix.cpp +++ b/src/Mix.cpp @@ -21,7 +21,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "Mix.h" #include diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp index 84152ffb1..b283a12d0 100644 --- a/src/MixerBoard.cpp +++ b/src/MixerBoard.cpp @@ -9,7 +9,7 @@ **********************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "MixerBoard.h" diff --git a/src/MixerBoard.h b/src/MixerBoard.h index 5959b9e49..6c7f9188b 100644 --- a/src/MixerBoard.h +++ b/src/MixerBoard.h @@ -8,7 +8,7 @@ **********************************************************************/ -#include "Audacity.h" // for USE_* macros + #ifndef __AUDACITY_MIXER_BOARD__ diff --git a/src/ModuleManager.cpp b/src/ModuleManager.cpp index 9255c7545..238a54d44 100755 --- a/src/ModuleManager.cpp +++ b/src/ModuleManager.cpp @@ -18,7 +18,7 @@ i.e. an alternative to the usual interface, for Audacity. *//*******************************************************************/ -#include "Audacity.h" + #include "ModuleManager.h" #include "audacity/ModuleInterface.h" diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index a6a8ecf91..6214aa038 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "NoteTrack.h" diff --git a/src/NoteTrack.h b/src/NoteTrack.h index dcef3ba9c..59c4e0acb 100644 --- a/src/NoteTrack.h +++ b/src/NoteTrack.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_NOTETRACK__ #define __AUDACITY_NOTETRACK__ -#include "Audacity.h" // for USE_* macros + diff --git a/src/PitchName.cpp b/src/PitchName.cpp index 37871a0fc..af9a02366 100644 --- a/src/PitchName.cpp +++ b/src/PitchName.cpp @@ -17,7 +17,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "PitchName.h" #include diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index 61079eaa9..18c20aac6 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -18,7 +18,7 @@ effects, generators, analysis-effects, commands. It also has functions for shared and private configs - which need to move out. *****************************************************************************/ -#include "Audacity.h" + #include "PluginManager.h" diff --git a/src/Prefs.cpp b/src/Prefs.cpp index 6f02f668d..1e50017f2 100755 --- a/src/Prefs.cpp +++ b/src/Prefs.cpp @@ -50,7 +50,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "Prefs.h" #include diff --git a/src/Prefs.h b/src/Prefs.h index ebc254e68..f712d7bf4 100644 --- a/src/Prefs.h +++ b/src/Prefs.h @@ -29,7 +29,7 @@ #ifndef __AUDACITY_PREFS__ #define __AUDACITY_PREFS__ -#include "Audacity.h" + // Increment this every time the prefs need to be reset // the first part (before the r) indicates the version the reset took place diff --git a/src/Printing.cpp b/src/Printing.cpp index 3ff5510af..1c067e74a 100644 --- a/src/Printing.cpp +++ b/src/Printing.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "Printing.h" #include diff --git a/src/Profiler.cpp b/src/Profiler.cpp index 76c1b3c92..8d60e79c9 100644 --- a/src/Profiler.cpp +++ b/src/Profiler.cpp @@ -20,7 +20,7 @@ but it will probably work fine if you use it on a high level. *//*******************************************************************/ -#include "Audacity.h" + #include "Profiler.h" #include diff --git a/src/Project.cpp b/src/Project.cpp index 5cfadcf5c..cc3e478d8 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -9,7 +9,7 @@ *//*******************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "Project.h" #include "KeyboardCapture.h" diff --git a/src/Project.h b/src/Project.h index c114f4178..a500daa8d 100644 --- a/src/Project.h +++ b/src/Project.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_PROJECT__ #define __AUDACITY_PROJECT__ -#include "Audacity.h" + #include "ClientData.h" // to inherit diff --git a/src/ProjectAudioManager.cpp b/src/ProjectAudioManager.cpp index d3fc65b10..84b62646e 100644 --- a/src/ProjectAudioManager.cpp +++ b/src/ProjectAudioManager.cpp @@ -8,7 +8,7 @@ Paul Licameli split from ProjectManager.cpp **********************************************************************/ -#include "Audacity.h" + #include "ProjectAudioManager.h" diff --git a/src/ProjectSerializer.cpp b/src/ProjectSerializer.cpp index e1d413d3f..ce2f3c518 100644 --- a/src/ProjectSerializer.cpp +++ b/src/ProjectSerializer.cpp @@ -13,7 +13,7 @@ *//********************************************************************/ -#include "Audacity.h" + #include "ProjectSerializer.h" #include diff --git a/src/RealFFTf.cpp b/src/RealFFTf.cpp index 2fb2c9ade..ed443d1ae 100644 --- a/src/RealFFTf.cpp +++ b/src/RealFFTf.cpp @@ -36,7 +36,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Audacity.h" + #include "RealFFTf.h" diff --git a/src/RealFFTf.h b/src/RealFFTf.h index abd657dfb..20d44449f 100644 --- a/src/RealFFTf.h +++ b/src/RealFFTf.h @@ -1,7 +1,7 @@ #ifndef __realfftf_h #define __realfftf_h -#include "Audacity.h" + diff --git a/src/RealFFTf48x.cpp b/src/RealFFTf48x.cpp index 8df792389..42d5b846f 100644 --- a/src/RealFFTf48x.cpp +++ b/src/RealFFTf48x.cpp @@ -54,7 +54,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Audacity.h" // for USE_* macros + #include "RealFFTf48x.h" diff --git a/src/Registrar.h b/src/Registrar.h index c747467c7..a499884ad 100644 --- a/src/Registrar.h +++ b/src/Registrar.h @@ -20,7 +20,7 @@ responsible for calling the appropriate callback functions. #ifndef __AUDACITY_REGISTRAR__ #define __AUDACITY_REGISTRAR__ -#include "Audacity.h" + #include "MemoryX.h" diff --git a/src/Resample.h b/src/Resample.h index 35e0ac3d2..109238bd5 100644 --- a/src/Resample.h +++ b/src/Resample.h @@ -12,7 +12,7 @@ #ifndef __AUDACITY_RESAMPLE_H__ #define __AUDACITY_RESAMPLE_H__ -#include "Audacity.h" + #include "SampleFormat.h" diff --git a/src/SampleBlock.cpp b/src/SampleBlock.cpp index df2f1816d..a8b700115 100644 --- a/src/SampleBlock.cpp +++ b/src/SampleBlock.cpp @@ -6,7 +6,7 @@ SampleBlock.cpp **********************************************************************/ -#include "Audacity.h" + #include "InconsistencyException.h" #include "SampleBlock.h" #include "SampleFormat.h" diff --git a/src/SampleFormat.h b/src/SampleFormat.h index 3e61bc841..8e5506380 100644 --- a/src/SampleFormat.h +++ b/src/SampleFormat.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_SAMPLE_FORMAT__ #define __AUDACITY_SAMPLE_FORMAT__ -#include "Audacity.h" + #include "MemoryX.h" #include diff --git a/src/Screenshot.h b/src/Screenshot.h index db7b4cdfc..0b6dba624 100644 --- a/src/Screenshot.h +++ b/src/Screenshot.h @@ -19,7 +19,7 @@ #ifndef __AUDACITY_SCREENSHOT__ #define __AUDACITY_SCREENSHOT__ -#include "Audacity.h" + #include diff --git a/src/SelectedRegion.h b/src/SelectedRegion.h index 4882f6e57..cab93653d 100644 --- a/src/SelectedRegion.h +++ b/src/SelectedRegion.h @@ -25,7 +25,7 @@ #ifndef __AUDACITY_SELECTEDREGION__ #define __AUDACITY_SELECTEDREGION__ -#include "Audacity.h" + diff --git a/src/SelectionState.cpp b/src/SelectionState.cpp index d49e11900..5d0f76362 100644 --- a/src/SelectionState.cpp +++ b/src/SelectionState.cpp @@ -6,7 +6,7 @@ **********************************************************************/ -#include "Audacity.h" + #include "SelectionState.h" #include "ViewInfo.h" diff --git a/src/Sequence.cpp b/src/Sequence.cpp index 8cd6d091c..72ace225a 100644 --- a/src/Sequence.cpp +++ b/src/Sequence.cpp @@ -28,7 +28,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "Sequence.h" #include diff --git a/src/Sequence.h b/src/Sequence.h index f60611c3e..902db0975 100644 --- a/src/Sequence.h +++ b/src/Sequence.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_SEQUENCE__ #define __AUDACITY_SEQUENCE__ -#include "Audacity.h" + #include #include diff --git a/src/Shuttle.cpp b/src/Shuttle.cpp index c4fa4c7d1..fe5547cf1 100644 --- a/src/Shuttle.cpp +++ b/src/Shuttle.cpp @@ -50,7 +50,7 @@ preferences. *//*******************************************************************/ -#include "Audacity.h" + #include "Shuttle.h" #include diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp index c5bfab81a..55e683289 100644 --- a/src/ShuttleGui.cpp +++ b/src/ShuttleGui.cpp @@ -93,7 +93,7 @@ for registering for changes. *//******************************************************************/ -#include "Audacity.h" + #include "ShuttleGui.h" diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h index ff9358358..11be1c669 100644 --- a/src/ShuttleGui.h +++ b/src/ShuttleGui.h @@ -14,7 +14,7 @@ #ifndef SHUTTLE_GUI #define SHUTTLE_GUI -#include "Audacity.h" + #include "audacity/Types.h" #include diff --git a/src/ShuttlePrefs.cpp b/src/ShuttlePrefs.cpp index fa7071b81..76975d249 100644 --- a/src/ShuttlePrefs.cpp +++ b/src/ShuttlePrefs.cpp @@ -24,7 +24,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "ShuttlePrefs.h" #include diff --git a/src/Snap.cpp b/src/Snap.cpp index 5bb84c0b4..fe5f1a672 100644 --- a/src/Snap.cpp +++ b/src/Snap.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "Snap.h" #include diff --git a/src/SoundActivatedRecord.cpp b/src/SoundActivatedRecord.cpp index 957f6ac83..b8bb8d0c2 100644 --- a/src/SoundActivatedRecord.cpp +++ b/src/SoundActivatedRecord.cpp @@ -18,7 +18,7 @@ *//********************************************************************/ -#include "Audacity.h" + #include "SoundActivatedRecord.h" #include "ShuttleGui.h" diff --git a/src/SpectrumAnalyst.cpp b/src/SpectrumAnalyst.cpp index 358a2c2c4..529724ef3 100644 --- a/src/SpectrumAnalyst.cpp +++ b/src/SpectrumAnalyst.cpp @@ -23,7 +23,7 @@ and in the spectrogram spectral selection. */ -#include "Audacity.h" + #include "SpectrumAnalyst.h" #include "FFT.h" diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp index 0456a0ec5..cb597ca2e 100644 --- a/src/SplashDialog.cpp +++ b/src/SplashDialog.cpp @@ -20,7 +20,7 @@ most commonly asked questions about Audacity. *//********************************************************************/ -#include "Audacity.h" + #include "SplashDialog.h" diff --git a/src/Tags.cpp b/src/Tags.cpp index 24df24d48..e7ee73eca 100644 --- a/src/Tags.cpp +++ b/src/Tags.cpp @@ -30,7 +30,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "Tags.h" // For compilers that support precompilation, includes "wx/wx.h". diff --git a/src/Tags.h b/src/Tags.h index 2210dc0e1..a803344bc 100644 --- a/src/Tags.h +++ b/src/Tags.h @@ -29,7 +29,7 @@ #ifndef __AUDACITY_TAGS__ #define __AUDACITY_TAGS__ -#include "Audacity.h" + #include "xml/XMLTagHandler.h" diff --git a/src/TempDirectory.h b/src/TempDirectory.h index a6c67dda6..7d583e20c 100644 --- a/src/TempDirectory.h +++ b/src/TempDirectory.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_TEMP_DIRECTORY__ #define __AUDACITY_TEMP_DIRECTORY__ -#include "Audacity.h" + #include "audacity/Types.h" class wxWindow; diff --git a/src/Theme.cpp b/src/Theme.cpp index 6a4a21193..146137f07 100644 --- a/src/Theme.cpp +++ b/src/Theme.cpp @@ -59,7 +59,7 @@ can't be. *//*****************************************************************/ -#include "Audacity.h" + #include "Theme.h" diff --git a/src/Theme.h b/src/Theme.h index ea5ab07b2..f863e9f95 100644 --- a/src/Theme.h +++ b/src/Theme.h @@ -14,7 +14,7 @@ #ifndef __AUDACITY_THEME__ #define __AUDACITY_THEME__ -#include "Audacity.h" + #include #include diff --git a/src/TimeDialog.cpp b/src/TimeDialog.cpp index 56c83e5d2..582dbf50b 100644 --- a/src/TimeDialog.cpp +++ b/src/TimeDialog.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "TimeDialog.h" #include diff --git a/src/TimeTrack.cpp b/src/TimeTrack.cpp index 2c9d6a683..61ae17110 100644 --- a/src/TimeTrack.cpp +++ b/src/TimeTrack.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "TimeTrack.h" diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index 1b7443b24..5da326810 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -18,7 +18,7 @@ *//*******************************************************************/ -#include "Audacity.h" + #include "TimerRecordDialog.h" #include "FileNames.h" diff --git a/src/Track.cpp b/src/Track.cpp index 50da913a3..01c7f4723 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -21,7 +21,7 @@ and TimeTrack. *//*******************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "Track.h" diff --git a/src/Track.h b/src/Track.h index a0ccc20f4..7c5a15754 100644 --- a/src/Track.h +++ b/src/Track.h @@ -12,7 +12,7 @@ #ifndef __AUDACITY_TRACK__ #define __AUDACITY_TRACK__ -#include "Audacity.h" // for USE_* macros + diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index 273b3279d..14f7699b0 100644 --- a/src/TrackArtist.cpp +++ b/src/TrackArtist.cpp @@ -38,7 +38,7 @@ audio tracks. *//*******************************************************************/ -#include "Audacity.h" // for USE_* macros and HAVE_ALLOCA_H + #include "TrackArtist.h" diff --git a/src/TrackArtist.h b/src/TrackArtist.h index c38d62907..8ecb7d809 100644 --- a/src/TrackArtist.h +++ b/src/TrackArtist.h @@ -18,7 +18,7 @@ #ifndef __AUDACITY_TRACKARTIST__ #define __AUDACITY_TRACKARTIST__ -#include "Audacity.h" // for USE_* macros + #include // member variable diff --git a/src/TrackInfo.cpp b/src/TrackInfo.cpp index 993e93bcb..972de730a 100644 --- a/src/TrackInfo.cpp +++ b/src/TrackInfo.cpp @@ -25,7 +25,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "Audacity.h" + #include "TrackInfo.h" diff --git a/src/TrackInfo.h b/src/TrackInfo.h index af861d232..aca577e2b 100644 --- a/src/TrackInfo.h +++ b/src/TrackInfo.h @@ -11,7 +11,7 @@ Paul Licameli split from TrackPanel.cpp #ifndef __AUDACITY_TRACK_INFO__ #define __AUDACITY_TRACK_INFO__ -#include "Audacity.h" + #include diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 28ae542ed..f5f1452ef 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -43,7 +43,7 @@ is time to refresh some aspect of the screen. *//*****************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "TrackPanel.h" diff --git a/src/TrackPanel.h b/src/TrackPanel.h index 381b85acb..db5e90611 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_TRACK_PANEL__ #define __AUDACITY_TRACK_PANEL__ -#include "Audacity.h" // for USE_* macros + #include diff --git a/src/TrackPanelAx.cpp b/src/TrackPanelAx.cpp index 3a15a64c0..e5d1ba93e 100644 --- a/src/TrackPanelAx.cpp +++ b/src/TrackPanelAx.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "Audacity.h" // for USE_* macros + #include "TrackPanelAx.h" // For compilers that support precompilation, includes "wx/wx.h". diff --git a/src/TrackPanelAx.h b/src/TrackPanelAx.h index b7e37fdd1..53824c120 100644 --- a/src/TrackPanelAx.h +++ b/src/TrackPanelAx.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_TRACK_PANEL_ACCESSIBILITY__ #define __AUDACITY_TRACK_PANEL_ACCESSIBILITY__ -#include "Audacity.h" + #include #include diff --git a/src/TrackPanelCell.h b/src/TrackPanelCell.h index 46540cbc8..eee46533a 100644 --- a/src/TrackPanelCell.h +++ b/src/TrackPanelCell.h @@ -11,7 +11,7 @@ Paul Licameli #ifndef __AUDACITY_TRACK_PANEL_CELL__ #define __AUDACITY_TRACK_PANEL_CELL__ -#include "Audacity.h" + #include "MemoryX.h" #include "TrackPanelDrawable.h" // to inherit diff --git a/src/TrackPanelDrawable.h b/src/TrackPanelDrawable.h index f6f19c2d5..520af9108 100644 --- a/src/TrackPanelDrawable.h +++ b/src/TrackPanelDrawable.h @@ -11,7 +11,7 @@ Paul Licameli #ifndef __AUDACITY_TRACK_PANEL_DRAWABLE__ #define __AUDACITY_TRACK_PANEL_DRAWABLE__ -#include "Audacity.h" + #include // for wxRect diff --git a/src/TrackPanelListener.h b/src/TrackPanelListener.h index 007bbc5e8..d601fbab4 100644 --- a/src/TrackPanelListener.h +++ b/src/TrackPanelListener.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_TRACK_PANEL_LISTENER__ #define __AUDACITY_TRACK_PANEL_LISTENER__ -#include "Audacity.h" + enum class UndoPush : unsigned char; diff --git a/src/TrackPanelResizeHandle.cpp b/src/TrackPanelResizeHandle.cpp index 8e94cb1b9..c340dc6b3 100644 --- a/src/TrackPanelResizeHandle.cpp +++ b/src/TrackPanelResizeHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "Audacity.h" + #include "TrackPanelResizeHandle.h" #include diff --git a/src/TrackPanelResizerCell.cpp b/src/TrackPanelResizerCell.cpp index d04ae6479..d1afb14b3 100644 --- a/src/TrackPanelResizerCell.cpp +++ b/src/TrackPanelResizerCell.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "Audacity.h" + #include "TrackPanelResizerCell.h" #include "AColor.h" diff --git a/src/UIHandle.cpp b/src/UIHandle.cpp index 72ec38576..19382228f 100644 --- a/src/UIHandle.cpp +++ b/src/UIHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli **********************************************************************/ -#include "Audacity.h" + #include "UIHandle.h" #include "RefreshCode.h" diff --git a/src/UndoManager.cpp b/src/UndoManager.cpp index a5cc5abf6..3c0f94088 100644 --- a/src/UndoManager.cpp +++ b/src/UndoManager.cpp @@ -20,7 +20,7 @@ UndoManager *//*******************************************************************/ -#include "Audacity.h" + #include "UndoManager.h" #include diff --git a/src/UserException.cpp b/src/UserException.cpp index f8e9edda8..05cb506fa 100644 --- a/src/UserException.cpp +++ b/src/UserException.cpp @@ -6,7 +6,7 @@ */ -#include "Audacity.h" + #include "UserException.h" UserException::~UserException() diff --git a/src/VoiceKey.cpp b/src/VoiceKey.cpp index b96046f30..17db53c69 100644 --- a/src/VoiceKey.cpp +++ b/src/VoiceKey.cpp @@ -18,7 +18,7 @@ or "OFF" point *//*******************************************************************/ -#include "Audacity.h" + #include "VoiceKey.h" #include diff --git a/src/WaveClip.h b/src/WaveClip.h index 85d036338..f99576105 100644 --- a/src/WaveClip.h +++ b/src/WaveClip.h @@ -12,7 +12,7 @@ #ifndef __AUDACITY_WAVECLIP__ #define __AUDACITY_WAVECLIP__ -#include "Audacity.h" + #include "SampleFormat.h" #include "xml/XMLTagHandler.h" diff --git a/src/WrappedType.cpp b/src/WrappedType.cpp index e44b3460a..407ce8232 100644 --- a/src/WrappedType.cpp +++ b/src/WrappedType.cpp @@ -25,7 +25,7 @@ *//**********************************************************************/ -#include "Audacity.h" + #include "WrappedType.h" #include diff --git a/src/WrappedType.h b/src/WrappedType.h index 9d407bff8..5d9f5834e 100644 --- a/src/WrappedType.h +++ b/src/WrappedType.h @@ -12,7 +12,7 @@ #ifndef __WRAPPED_TYPE__ #define __WRAPPED_TYPE__ -#include "Audacity.h" + enum teWrappedType { diff --git a/src/ZoomInfo.cpp b/src/ZoomInfo.cpp index f0a88c9eb..bc2028238 100644 --- a/src/ZoomInfo.cpp +++ b/src/ZoomInfo.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "Audacity.h" + #include "ZoomInfo.h" diff --git a/src/commands/AppCommandEvent.h b/src/commands/AppCommandEvent.h index 0c6f213bd..e8cfd9dac 100644 --- a/src/commands/AppCommandEvent.h +++ b/src/commands/AppCommandEvent.h @@ -16,7 +16,7 @@ #ifndef __APPCOMMANDEVENT__ #define __APPCOMMANDEVENT__ -#include "../Audacity.h" + #include // to declare custom event types #include "../MemoryX.h" diff --git a/src/commands/AudacityCommand.cpp b/src/commands/AudacityCommand.cpp index 7ac482d24..aca71e9c7 100644 --- a/src/commands/AudacityCommand.cpp +++ b/src/commands/AudacityCommand.cpp @@ -19,7 +19,7 @@ ShuttleGui. *//*******************************************************************/ -#include "../Audacity.h" + #include "AudacityCommand.h" #include "CommandContext.h" diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h index 7feb73144..bbf47ccb4 100644 --- a/src/commands/AudacityCommand.h +++ b/src/commands/AudacityCommand.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_COMMAND__ #define __AUDACITY_COMMAND__ -#include "../Audacity.h" + #include diff --git a/src/commands/BatchEvalCommand.cpp b/src/commands/BatchEvalCommand.cpp index 1cb9cbfbb..c3b62e612 100644 --- a/src/commands/BatchEvalCommand.cpp +++ b/src/commands/BatchEvalCommand.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "BatchEvalCommand.h" #include "CommandContext.h" diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp index c6fb5c30c..d65ee17ee 100644 --- a/src/commands/Command.cpp +++ b/src/commands/Command.cpp @@ -75,7 +75,7 @@ classes derived from it. *//*******************************************************************/ -#include "../Audacity.h" + #include "Command.h" #include diff --git a/src/commands/CommandBuilder.cpp b/src/commands/CommandBuilder.cpp index 5477a1b8b..74d7e8ad4 100644 --- a/src/commands/CommandBuilder.cpp +++ b/src/commands/CommandBuilder.cpp @@ -21,7 +21,7 @@ system by constructing BatchCommandEval objects. *//*******************************************************************/ -#include "../Audacity.h" + #include "CommandBuilder.h" #include "CommandDirectory.h" diff --git a/src/commands/CommandContext.cpp b/src/commands/CommandContext.cpp index 979543707..d3c666a5f 100644 --- a/src/commands/CommandContext.cpp +++ b/src/commands/CommandContext.cpp @@ -20,7 +20,7 @@ messaging from a command back to its invoker. *//*******************************************************************/ -#include "../Audacity.h" + #include "CommandContext.h" #include diff --git a/src/commands/CommandDirectory.cpp b/src/commands/CommandDirectory.cpp index ba75042a4..877301a01 100644 --- a/src/commands/CommandDirectory.cpp +++ b/src/commands/CommandDirectory.cpp @@ -14,7 +14,7 @@ functions to look up a command by name. *//*******************************************************************/ -#include "../Audacity.h" + #include "CommandDirectory.h" std::unique_ptr CommandDirectory::mInstance; diff --git a/src/commands/CommandHandler.cpp b/src/commands/CommandHandler.cpp index 47975bcec..173eeeaa4 100644 --- a/src/commands/CommandHandler.cpp +++ b/src/commands/CommandHandler.cpp @@ -16,7 +16,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "CommandHandler.h" #include diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index 1b1d837b6..18cd0041d 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -75,7 +75,7 @@ CommandManager. It holds the callback for one command. *//******************************************************************/ -#include "../Audacity.h" + #include "CommandManager.h" diff --git a/src/commands/CommandSignature.cpp b/src/commands/CommandSignature.cpp index 455f0d030..3434a5af7 100644 --- a/src/commands/CommandSignature.cpp +++ b/src/commands/CommandSignature.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "CommandSignature.h" CommandSignature::~CommandSignature() diff --git a/src/commands/CommandTargets.cpp b/src/commands/CommandTargets.cpp index 7703da53e..d296a8181 100644 --- a/src/commands/CommandTargets.cpp +++ b/src/commands/CommandTargets.cpp @@ -21,7 +21,7 @@ capture the more lengthy output from some commands. *//*******************************************************************/ -#include "../Audacity.h" + #include "CommandTargets.h" #include diff --git a/src/commands/CommandType.cpp b/src/commands/CommandType.cpp index 9f7b2012a..e50d9f0e1 100644 --- a/src/commands/CommandType.cpp +++ b/src/commands/CommandType.cpp @@ -17,7 +17,7 @@ Also acts as a factory. *//*******************************************************************/ -#include "../Audacity.h" + #include "CommandType.h" #include diff --git a/src/commands/CompareAudioCommand.cpp b/src/commands/CompareAudioCommand.cpp index 035ea2033..1cd893975 100644 --- a/src/commands/CompareAudioCommand.cpp +++ b/src/commands/CompareAudioCommand.cpp @@ -18,7 +18,7 @@ threshold of difference in two selected tracks *//*******************************************************************/ -#include "../Audacity.h" + #include "CompareAudioCommand.h" #include "LoadCommands.h" diff --git a/src/commands/Demo.cpp b/src/commands/Demo.cpp index 5e9e8d302..2e97c3d6b 100644 --- a/src/commands/Demo.cpp +++ b/src/commands/Demo.cpp @@ -19,7 +19,7 @@ parameters. It is for development purposes. *//*******************************************************************/ -#include "../Audacity.h" + #include "Demo.h" #include "LoadCommands.h" diff --git a/src/commands/DragCommand.cpp b/src/commands/DragCommand.cpp index eb24049a1..91f243193 100644 --- a/src/commands/DragCommand.cpp +++ b/src/commands/DragCommand.cpp @@ -16,7 +16,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "DragCommand.h" #include "LoadCommands.h" diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp index 97cde6d32..080422a88 100644 --- a/src/commands/GetInfoCommand.cpp +++ b/src/commands/GetInfoCommand.cpp @@ -20,7 +20,7 @@ This class now lists *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "GetInfoCommand.h" #include "LoadCommands.h" diff --git a/src/commands/GetTrackInfoCommand.cpp b/src/commands/GetTrackInfoCommand.cpp index ae73fbeba..a8fb2abaa 100644 --- a/src/commands/GetTrackInfoCommand.cpp +++ b/src/commands/GetTrackInfoCommand.cpp @@ -16,7 +16,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "GetTrackInfoCommand.h" #include "LoadCommands.h" diff --git a/src/commands/HelpCommand.cpp b/src/commands/HelpCommand.cpp index 2c2f5929f..fd5974b27 100644 --- a/src/commands/HelpCommand.cpp +++ b/src/commands/HelpCommand.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "HelpCommand.h" #include "../Shuttle.h" diff --git a/src/commands/ImportExportCommands.cpp b/src/commands/ImportExportCommands.cpp index 9e7a4e216..d01829d8c 100644 --- a/src/commands/ImportExportCommands.cpp +++ b/src/commands/ImportExportCommands.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "ImportExportCommands.h" #include "LoadCommands.h" diff --git a/src/commands/Keyboard.cpp b/src/commands/Keyboard.cpp index ebb8f1f15..3cba3e451 100644 --- a/src/commands/Keyboard.cpp +++ b/src/commands/Keyboard.cpp @@ -9,7 +9,7 @@ **********************************************************************/ -#include "../Audacity.h" + #include "Keyboard.h" #include diff --git a/src/commands/LoadCommands.cpp b/src/commands/LoadCommands.cpp index 83b7fda9f..544245473 100644 --- a/src/commands/LoadCommands.cpp +++ b/src/commands/LoadCommands.cpp @@ -13,7 +13,7 @@ modelled on BuiltinEffectsModule *****************************************************************************/ -#include "../Audacity.h" + #include "LoadCommands.h" #include "AudacityCommand.h" diff --git a/src/commands/MessageCommand.cpp b/src/commands/MessageCommand.cpp index 89c4f6f2b..ff8efe547 100644 --- a/src/commands/MessageCommand.cpp +++ b/src/commands/MessageCommand.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "MessageCommand.h" #include "LoadCommands.h" diff --git a/src/commands/OpenSaveCommands.cpp b/src/commands/OpenSaveCommands.cpp index c76e7eeb6..9219ea6a5 100644 --- a/src/commands/OpenSaveCommands.cpp +++ b/src/commands/OpenSaveCommands.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "OpenSaveCommands.h" #include "LoadCommands.h" diff --git a/src/commands/PreferenceCommands.cpp b/src/commands/PreferenceCommands.cpp index 7e19f6de8..a5ecc4727 100644 --- a/src/commands/PreferenceCommands.cpp +++ b/src/commands/PreferenceCommands.cpp @@ -15,7 +15,7 @@ SetPreferenceCommand classes *//*******************************************************************/ -#include "../Audacity.h" + #include "PreferenceCommands.h" #include "LoadCommands.h" diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp index a68f89b8f..4e2a5e942 100644 --- a/src/commands/ScreenshotCommand.cpp +++ b/src/commands/ScreenshotCommand.cpp @@ -17,7 +17,7 @@ small calculations of rectangles. *//*******************************************************************/ -#include "../Audacity.h" + #include "ScreenshotCommand.h" #include diff --git a/src/commands/ScriptCommandRelay.h b/src/commands/ScriptCommandRelay.h index e542c71e1..eeb9de5e3 100644 --- a/src/commands/ScriptCommandRelay.h +++ b/src/commands/ScriptCommandRelay.h @@ -16,7 +16,7 @@ #ifndef __SCRIPT_COMMAND_RELAY__ #define __SCRIPT_COMMAND_RELAY__ -#include "../Audacity.h" + #include "../MemoryX.h" diff --git a/src/commands/SelectCommand.cpp b/src/commands/SelectCommand.cpp index e78908220..9aa107e04 100644 --- a/src/commands/SelectCommand.cpp +++ b/src/commands/SelectCommand.cpp @@ -29,7 +29,7 @@ explicitly code all three. *//*******************************************************************/ -#include "../Audacity.h" + #include "SelectCommand.h" #include diff --git a/src/commands/SetClipCommand.cpp b/src/commands/SetClipCommand.cpp index 29f779343..5b0911b8e 100644 --- a/src/commands/SetClipCommand.cpp +++ b/src/commands/SetClipCommand.cpp @@ -16,7 +16,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "SetClipCommand.h" #include "LoadCommands.h" diff --git a/src/commands/SetEnvelopeCommand.cpp b/src/commands/SetEnvelopeCommand.cpp index b0e79c019..e9c56b2f7 100644 --- a/src/commands/SetEnvelopeCommand.cpp +++ b/src/commands/SetEnvelopeCommand.cpp @@ -16,7 +16,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "SetEnvelopeCommand.h" #include "LoadCommands.h" diff --git a/src/commands/SetLabelCommand.cpp b/src/commands/SetLabelCommand.cpp index 474e249d4..3623df679 100644 --- a/src/commands/SetLabelCommand.cpp +++ b/src/commands/SetLabelCommand.cpp @@ -16,7 +16,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "SetLabelCommand.h" #include "LoadCommands.h" diff --git a/src/commands/SetProjectCommand.cpp b/src/commands/SetProjectCommand.cpp index 046a3957c..28989627e 100644 --- a/src/commands/SetProjectCommand.cpp +++ b/src/commands/SetProjectCommand.cpp @@ -17,7 +17,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "SetProjectCommand.h" #include "LoadCommands.h" diff --git a/src/commands/SetTrackInfoCommand.cpp b/src/commands/SetTrackInfoCommand.cpp index 40db0ba48..510cd8dab 100644 --- a/src/commands/SetTrackInfoCommand.cpp +++ b/src/commands/SetTrackInfoCommand.cpp @@ -33,7 +33,7 @@ SetTrackAudioCommand and SetTrackVisualsCommand. *//*******************************************************************/ -#include "../Audacity.h" + #include "SetTrackInfoCommand.h" #include "LoadCommands.h" diff --git a/src/effects/Amplify.cpp b/src/effects/Amplify.cpp index b487b3215..6866141ce 100644 --- a/src/effects/Amplify.cpp +++ b/src/effects/Amplify.cpp @@ -18,7 +18,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Amplify.h" #include "LoadEffects.h" diff --git a/src/effects/AutoDuck.cpp b/src/effects/AutoDuck.cpp index d94915cf2..572b3b230 100644 --- a/src/effects/AutoDuck.cpp +++ b/src/effects/AutoDuck.cpp @@ -16,7 +16,7 @@ *******************************************************************/ -#include "../Audacity.h" + #include "AutoDuck.h" #include "LoadEffects.h" diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp index efb052e75..1f3384a94 100644 --- a/src/effects/BassTreble.cpp +++ b/src/effects/BassTreble.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "BassTreble.h" #include "LoadEffects.h" diff --git a/src/effects/Biquad.cpp b/src/effects/Biquad.cpp index 16a4c6005..b4a996801 100644 --- a/src/effects/Biquad.cpp +++ b/src/effects/Biquad.cpp @@ -10,7 +10,7 @@ Max Maisel ***********************************************************************/ #include "Biquad.h" -#include "Audacity.h" + #include #define square(a) ((a)*(a)) diff --git a/src/effects/ChangePitch.cpp b/src/effects/ChangePitch.cpp index a78236cba..802a94dd9 100644 --- a/src/effects/ChangePitch.cpp +++ b/src/effects/ChangePitch.cpp @@ -15,7 +15,7 @@ the pitch without changing the tempo. *//*******************************************************************/ -#include "../Audacity.h" // for USE_SOUNDTOUCH + #if USE_SOUNDTOUCH #include "ChangePitch.h" diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h index 1363e363e..34f9ccdc0 100644 --- a/src/effects/ChangePitch.h +++ b/src/effects/ChangePitch.h @@ -15,7 +15,7 @@ the pitch without changing the tempo. *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #if USE_SOUNDTOUCH #ifndef __AUDACITY_EFFECT_CHANGEPITCH__ diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index 196bbf57a..0acdf869a 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "ChangeSpeed.h" #include "LoadEffects.h" diff --git a/src/effects/ChangeTempo.cpp b/src/effects/ChangeTempo.cpp index 883dd5931..d400dafc1 100644 --- a/src/effects/ChangeTempo.cpp +++ b/src/effects/ChangeTempo.cpp @@ -15,7 +15,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_SOUNDTOUCH + #if USE_SOUNDTOUCH #include "ChangeTempo.h" diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h index b51751b14..5706b4bde 100644 --- a/src/effects/ChangeTempo.h +++ b/src/effects/ChangeTempo.h @@ -11,7 +11,7 @@ **********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #if USE_SOUNDTOUCH #ifndef __AUDACITY_EFFECT_CHANGETEMPO__ diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp index 88ef47f3e..2f8daa13e 100644 --- a/src/effects/ClickRemoval.cpp +++ b/src/effects/ClickRemoval.cpp @@ -24,7 +24,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "ClickRemoval.h" #include "LoadEffects.h" diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp index 5f09943ce..45ce2cc14 100644 --- a/src/effects/Compressor.cpp +++ b/src/effects/Compressor.cpp @@ -24,7 +24,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Compressor.h" #include "LoadEffects.h" diff --git a/src/effects/Contrast.cpp b/src/effects/Contrast.cpp index aa472ab5e..a32a46c7b 100644 --- a/src/effects/Contrast.cpp +++ b/src/effects/Contrast.cpp @@ -9,7 +9,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Contrast.h" #include "../CommonCommandFlags.h" diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp index bb4d187f6..97d9e2e65 100644 --- a/src/effects/Distortion.cpp +++ b/src/effects/Distortion.cpp @@ -16,7 +16,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Distortion.h" #include "LoadEffects.h" diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index dbab079bc..537be390b 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "DtmfGen.h" #include "LoadEffects.h" diff --git a/src/effects/Echo.cpp b/src/effects/Echo.cpp index a9cbaa7d1..13b98f195 100644 --- a/src/effects/Echo.cpp +++ b/src/effects/Echo.cpp @@ -19,7 +19,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Echo.h" #include "LoadEffects.h" diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index 4f8c1e2b1..7cf856a3c 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -15,7 +15,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Effect.h" #include "TimeWarper.h" diff --git a/src/effects/Effect.h b/src/effects/Effect.h index a22bce3ac..ed73e5566 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -12,7 +12,7 @@ #ifndef __AUDACITY_EFFECT__ #define __AUDACITY_EFFECT__ -#include "../Audacity.h" + #include #include diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp index cefe6e1a0..e983cb6e4 100644 --- a/src/effects/EffectManager.cpp +++ b/src/effects/EffectManager.cpp @@ -18,7 +18,7 @@ effects. *//*******************************************************************/ -#include "../Audacity.h" + #include "EffectManager.h" #include "Effect.h" diff --git a/src/effects/EffectUI.cpp b/src/effects/EffectUI.cpp index bcbf1871b..2d2651f8d 100644 --- a/src/effects/EffectUI.cpp +++ b/src/effects/EffectUI.cpp @@ -11,7 +11,7 @@ **********************************************************************/ -#include "../Audacity.h" + #include "EffectUI.h" #include "Effect.h" diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 9f6d0868d..29cef142d 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -52,7 +52,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Equalization.h" #include "LoadEffects.h" diff --git a/src/effects/Equalization48x.cpp b/src/effects/Equalization48x.cpp index b8da8e731..493fba52b 100644 --- a/src/effects/Equalization48x.cpp +++ b/src/effects/Equalization48x.cpp @@ -13,7 +13,7 @@ *//****************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "Equalization48x.h" #ifdef EXPERIMENTAL_EQ_SSE_THREADED diff --git a/src/effects/Fade.cpp b/src/effects/Fade.cpp index bdfc7688f..38a48fb11 100644 --- a/src/effects/Fade.cpp +++ b/src/effects/Fade.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Fade.h" #include diff --git a/src/effects/FindClipping.cpp b/src/effects/FindClipping.cpp index 1a02f5232..b3dab31fc 100644 --- a/src/effects/FindClipping.cpp +++ b/src/effects/FindClipping.cpp @@ -19,7 +19,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "FindClipping.h" #include "LoadEffects.h" diff --git a/src/effects/Invert.cpp b/src/effects/Invert.cpp index bb566bbf3..a66eed76b 100644 --- a/src/effects/Invert.cpp +++ b/src/effects/Invert.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Invert.h" #include diff --git a/src/effects/LoadEffects.cpp b/src/effects/LoadEffects.cpp index 8eb5a6974..b9dfdd037 100644 --- a/src/effects/LoadEffects.cpp +++ b/src/effects/LoadEffects.cpp @@ -11,7 +11,7 @@ \brief Internal module to auto register all built in effects. *****************************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "LoadEffects.h" #include "../Prefs.h" diff --git a/src/effects/Loudness.cpp b/src/effects/Loudness.cpp index 932dd6b63..de40c05ff 100644 --- a/src/effects/Loudness.cpp +++ b/src/effects/Loudness.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for rint from configwin.h + #include "Loudness.h" #include diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index fdf4ce665..33c337f39 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Noise.h" #include "LoadEffects.h" diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp index 2ce45a53a..64aa2ab7d 100644 --- a/src/effects/NoiseReduction.cpp +++ b/src/effects/NoiseReduction.cpp @@ -36,7 +36,7 @@ *//****************************************************************//** */ -#include "../Audacity.h" + #include "NoiseReduction.h" #include "LoadEffects.h" diff --git a/src/effects/NoiseRemoval.cpp b/src/effects/NoiseRemoval.cpp index 756ceac63..49146427b 100644 --- a/src/effects/NoiseRemoval.cpp +++ b/src/effects/NoiseRemoval.cpp @@ -38,7 +38,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "NoiseRemoval.h" #if !defined(EXPERIMENTAL_NOISE_REDUCTION) diff --git a/src/effects/NoiseRemoval.h b/src/effects/NoiseRemoval.h index 80f5a4f56..5ee2d523a 100644 --- a/src/effects/NoiseRemoval.h +++ b/src/effects/NoiseRemoval.h @@ -12,7 +12,7 @@ #ifndef __AUDACITY_EFFECT_NOISE_REMOVAL__ #define __AUDACITY_EFFECT_NOISE_REMOVAL__ -#include "../Audacity.h" + #if !defined(EXPERIMENTAL_NOISE_REDUCTION) diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp index 591a3f1c9..2bce11cae 100644 --- a/src/effects/Normalize.cpp +++ b/src/effects/Normalize.cpp @@ -15,7 +15,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for rint from configwin.h + #include "Normalize.h" #include "LoadEffects.h" diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index 3ddda7c6c..28687fd78 100644 --- a/src/effects/Paulstretch.cpp +++ b/src/effects/Paulstretch.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Paulstretch.h" #include "LoadEffects.h" diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp index 2e94ac221..498bde218 100644 --- a/src/effects/Phaser.cpp +++ b/src/effects/Phaser.cpp @@ -19,7 +19,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Phaser.h" #include "LoadEffects.h" diff --git a/src/effects/RealtimeEffectManager.cpp b/src/effects/RealtimeEffectManager.cpp index 3ceeb41c0..8fccb4764 100644 --- a/src/effects/RealtimeEffectManager.cpp +++ b/src/effects/RealtimeEffectManager.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "../Audacity.h" + #include "RealtimeEffectManager.h" #include "audacity/EffectInterface.h" diff --git a/src/effects/Repair.cpp b/src/effects/Repair.cpp index 2fb8749a3..e1c516fd6 100644 --- a/src/effects/Repair.cpp +++ b/src/effects/Repair.cpp @@ -21,7 +21,7 @@ the audio, rather than actually finding the clicks. *//*******************************************************************/ -#include "../Audacity.h" + #include "Repair.h" #include diff --git a/src/effects/Repeat.cpp b/src/effects/Repeat.cpp index ebe217b3d..51fd793cd 100644 --- a/src/effects/Repeat.cpp +++ b/src/effects/Repeat.cpp @@ -20,7 +20,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Repeat.h" diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp index aacb64d96..cfe0adc42 100644 --- a/src/effects/Reverb.cpp +++ b/src/effects/Reverb.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Reverb.h" #include "LoadEffects.h" diff --git a/src/effects/Reverse.cpp b/src/effects/Reverse.cpp index d8cccbe90..f97c5e998 100644 --- a/src/effects/Reverse.cpp +++ b/src/effects/Reverse.cpp @@ -14,7 +14,7 @@ *//********************************************************************/ -#include "../Audacity.h" + #include "Reverse.h" #include "LoadEffects.h" diff --git a/src/effects/SBSMSEffect.cpp b/src/effects/SBSMSEffect.cpp index 1bc47ee0e..3f4948aa6 100644 --- a/src/effects/SBSMSEffect.cpp +++ b/src/effects/SBSMSEffect.cpp @@ -11,7 +11,7 @@ effect that uses SBSMS to do its processing (TimeScale) **********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #if USE_SBSMS #include "SBSMSEffect.h" diff --git a/src/effects/SBSMSEffect.h b/src/effects/SBSMSEffect.h index 8ec97664c..c32dceb03 100644 --- a/src/effects/SBSMSEffect.h +++ b/src/effects/SBSMSEffect.h @@ -14,7 +14,7 @@ #ifndef __AUDACITY_EFFECT_SBSMS__ #define __AUDACITY_EFFECT_SBSMS__ -#include "../Audacity.h" // for USE_* macros + #if USE_SBSMS diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index 935f29445..4b21083e7 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -32,7 +32,7 @@ a graph for EffectScienFilter. *//*******************************************************************/ -#include "../Audacity.h" + #include "ScienFilter.h" #include "LoadEffects.h" diff --git a/src/effects/ScoreAlignDialog.cpp b/src/effects/ScoreAlignDialog.cpp index 4c096ce27..aa98491a7 100644 --- a/src/effects/ScoreAlignDialog.cpp +++ b/src/effects/ScoreAlignDialog.cpp @@ -16,7 +16,7 @@ It \TODO: description *//*******************************************************************/ -#include "../Audacity.h" + #include "ScoreAlignDialog.h" #ifdef EXPERIMENTAL_SCOREALIGN diff --git a/src/effects/Silence.cpp b/src/effects/Silence.cpp index dc0cf0d0e..a5191c585 100644 --- a/src/effects/Silence.cpp +++ b/src/effects/Silence.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Silence.h" #include "LoadEffects.h" diff --git a/src/effects/SimpleMono.cpp b/src/effects/SimpleMono.cpp index 4d902486f..7faf3b721 100644 --- a/src/effects/SimpleMono.cpp +++ b/src/effects/SimpleMono.cpp @@ -19,7 +19,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "SimpleMono.h" #include "../WaveTrack.h" diff --git a/src/effects/SoundTouchEffect.cpp b/src/effects/SoundTouchEffect.cpp index ac79d1761..db3e2c5fb 100644 --- a/src/effects/SoundTouchEffect.cpp +++ b/src/effects/SoundTouchEffect.cpp @@ -12,7 +12,7 @@ effect that uses SoundTouch to do its processing (ChangeTempo **********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #if USE_SOUNDTOUCH #include "SoundTouchEffect.h" diff --git a/src/effects/SoundTouchEffect.h b/src/effects/SoundTouchEffect.h index 8dc4d6c7f..81be775c2 100644 --- a/src/effects/SoundTouchEffect.h +++ b/src/effects/SoundTouchEffect.h @@ -12,7 +12,7 @@ **********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #if USE_SOUNDTOUCH diff --git a/src/effects/StereoToMono.cpp b/src/effects/StereoToMono.cpp index 58800617b..bbfb138cd 100644 --- a/src/effects/StereoToMono.cpp +++ b/src/effects/StereoToMono.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "StereoToMono.h" #include "LoadEffects.h" diff --git a/src/effects/TimeScale.cpp b/src/effects/TimeScale.cpp index d639dca78..04e1fe074 100644 --- a/src/effects/TimeScale.cpp +++ b/src/effects/TimeScale.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_SBSMS + #if USE_SBSMS #include "TimeScale.h" diff --git a/src/effects/TimeScale.h b/src/effects/TimeScale.h index 855bbf445..389fff71f 100644 --- a/src/effects/TimeScale.h +++ b/src/effects/TimeScale.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_EFFECT_TIMESCALE__ #define __AUDACITY_EFFECT_TIMESCALE__ -#include "../Audacity.h" // for USE_* macros + #if USE_SBSMS diff --git a/src/effects/TimeWarper.cpp b/src/effects/TimeWarper.cpp index aa07b58ef..ced77d845 100644 --- a/src/effects/TimeWarper.cpp +++ b/src/effects/TimeWarper.cpp @@ -15,7 +15,7 @@ Geometric TimeWarper classes *//*******************************************************************/ -#include "../Audacity.h" + #include "TimeWarper.h" #include diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp index be0dbeb3f..288913d0c 100644 --- a/src/effects/ToneGen.cpp +++ b/src/effects/ToneGen.cpp @@ -18,7 +18,7 @@ frequency changes smoothly during the tone. *//*******************************************************************/ -#include "../Audacity.h" + #include "ToneGen.h" #include "LoadEffects.h" diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index 1d8d525d7..b05a7ae97 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -15,7 +15,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "TruncSilence.h" #include "LoadEffects.h" diff --git a/src/effects/TwoPassSimpleMono.cpp b/src/effects/TwoPassSimpleMono.cpp index b3fdd614c..97294850b 100644 --- a/src/effects/TwoPassSimpleMono.cpp +++ b/src/effects/TwoPassSimpleMono.cpp @@ -18,7 +18,7 @@ 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 98e537998..cb8aafa30 100644 --- a/src/effects/VST/VSTControlOSX.mm +++ b/src/effects/VST/VSTControlOSX.mm @@ -21,7 +21,7 @@ **********************************************************************/ -#include "../../Audacity.h" + #include "VSTControlOSX.h" #include "../../MemoryX.h" diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index 5e6d8829e..e542c4f13 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -24,7 +24,7 @@ // WARNING: This is NOT 64-bit safe // ******************************************************************* -#include "../../Audacity.h" // for USE_* macros + #include "VSTEffect.h" #include "../../widgets/ProgressDialog.h" diff --git a/src/effects/VST/VSTEffect.h b/src/effects/VST/VSTEffect.h index 25b6e400d..17d10e9ff 100644 --- a/src/effects/VST/VSTEffect.h +++ b/src/effects/VST/VSTEffect.h @@ -8,7 +8,7 @@ **********************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #if USE_VST diff --git a/src/effects/Wahwah.cpp b/src/effects/Wahwah.cpp index df129e075..cf037f442 100644 --- a/src/effects/Wahwah.cpp +++ b/src/effects/Wahwah.cpp @@ -18,7 +18,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Wahwah.h" #include "LoadEffects.h" diff --git a/src/effects/audiounits/AUControl.mm b/src/effects/audiounits/AUControl.mm index 17fb3c4c9..1d831c86b 100644 --- a/src/effects/audiounits/AUControl.mm +++ b/src/effects/audiounits/AUControl.mm @@ -21,7 +21,7 @@ **********************************************************************/ -#include "../../Audacity.h" + #include "AUControl.h" #include #include diff --git a/src/effects/audiounits/AudioUnitEffect.cpp b/src/effects/audiounits/AudioUnitEffect.cpp index 723eb9d12..6773bf2b3 100644 --- a/src/effects/audiounits/AudioUnitEffect.cpp +++ b/src/effects/audiounits/AudioUnitEffect.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #if USE_AUDIO_UNITS #include "AudioUnitEffect.h" diff --git a/src/effects/audiounits/AudioUnitEffect.h b/src/effects/audiounits/AudioUnitEffect.h index d1bd7206e..ffb224c26 100644 --- a/src/effects/audiounits/AudioUnitEffect.h +++ b/src/effects/audiounits/AudioUnitEffect.h @@ -10,7 +10,7 @@ **********************************************************************/ #ifndef AUDACITY_AUDIOUNIT_EFFECT_H -#include "../../Audacity.h" // for USE_* macros + #if USE_AUDIO_UNITS diff --git a/src/effects/ladspa/LadspaEffect.cpp b/src/effects/ladspa/LadspaEffect.cpp index 1580a8e98..3119b6c90 100644 --- a/src/effects/ladspa/LadspaEffect.cpp +++ b/src/effects/ladspa/LadspaEffect.cpp @@ -22,7 +22,7 @@ effects from this one class. *//*******************************************************************/ -#include "../../Audacity.h" + #include "LadspaEffect.h" // This class's header file #include diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index 6654e5130..da2909bc4 100755 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -9,7 +9,7 @@ **********************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #if defined(USE_LV2) diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h index 70b53a7f0..be249f191 100755 --- a/src/effects/lv2/LV2Effect.h +++ b/src/effects/lv2/LV2Effect.h @@ -9,7 +9,7 @@ *********************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #if USE_LV2 diff --git a/src/effects/lv2/LoadLV2.cpp b/src/effects/lv2/LoadLV2.cpp index 070d76817..8168c4eb0 100755 --- a/src/effects/lv2/LoadLV2.cpp +++ b/src/effects/lv2/LoadLV2.cpp @@ -14,7 +14,7 @@ Functions that find and load all LV2 plugins on the system. *//*******************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #if defined(USE_LV2) diff --git a/src/effects/nyquist/LoadNyquist.cpp b/src/effects/nyquist/LoadNyquist.cpp index b2cb7bb95..0a10e7f2c 100644 --- a/src/effects/nyquist/LoadNyquist.cpp +++ b/src/effects/nyquist/LoadNyquist.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "../../Audacity.h" + #include "LoadNyquist.h" diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index e95004416..46ab203a5 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -24,7 +24,7 @@ effects from this one class. *//*******************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #include "Nyquist.h" #include diff --git a/src/effects/vamp/LoadVamp.cpp b/src/effects/vamp/LoadVamp.cpp index a03e90aee..1ae11b550 100644 --- a/src/effects/vamp/LoadVamp.cpp +++ b/src/effects/vamp/LoadVamp.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #if defined(USE_VAMP) #include "LoadVamp.h" diff --git a/src/effects/vamp/LoadVamp.h b/src/effects/vamp/LoadVamp.h index 00c8bfc5a..f8da2ec1d 100644 --- a/src/effects/vamp/LoadVamp.h +++ b/src/effects/vamp/LoadVamp.h @@ -8,7 +8,7 @@ **********************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #if defined(USE_VAMP) diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp index 5e3a67a9c..9125f5625 100644 --- a/src/effects/vamp/VampEffect.cpp +++ b/src/effects/vamp/VampEffect.cpp @@ -11,7 +11,7 @@ **********************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #if defined(USE_VAMP) #include "VampEffect.h" diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h index c521b7795..2555b0da6 100644 --- a/src/effects/vamp/VampEffect.h +++ b/src/effects/vamp/VampEffect.h @@ -11,7 +11,7 @@ **********************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #if defined(USE_VAMP) diff --git a/src/export/Export.cpp b/src/export/Export.cpp index 08c07eacb..e3f953745 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -28,7 +28,7 @@ *//********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "Export.h" #include diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp index 3d48ce6f5..976a885a9 100644 --- a/src/export/ExportCL.cpp +++ b/src/export/ExportCL.cpp @@ -11,7 +11,7 @@ **********************************************************************/ -#include "../Audacity.h" + #include "../ProjectSettings.h" diff --git a/src/export/ExportFFmpeg.cpp b/src/export/ExportFFmpeg.cpp index c0c73c401..3ee77ff0c 100644 --- a/src/export/ExportFFmpeg.cpp +++ b/src/export/ExportFFmpeg.cpp @@ -19,9 +19,9 @@ function. *//*******************************************************************/ -#include "../Audacity.h" // keep ffmpeg before wx because they interact // for USE_* macros -#include "../FFmpeg.h" // and Audacity.h before FFmpeg for config*.h + +#include "../FFmpeg.h" #include #include diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp index 5596b7a44..1f861be2f 100644 --- a/src/export/ExportFFmpegDialogs.cpp +++ b/src/export/ExportFFmpegDialogs.cpp @@ -41,10 +41,10 @@ *//*******************************************************************/ -#include "../Audacity.h" // keep ffmpeg before wx because they interact // for USE_* macros + #include "ExportFFmpegDialogs.h" -#include "../FFmpeg.h" // and Audacity.h before FFmpeg for config*.h +#include "../FFmpeg.h" #include #include diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h index cef88b212..aac0551a9 100644 --- a/src/export/ExportFFmpegDialogs.h +++ b/src/export/ExportFFmpegDialogs.h @@ -11,11 +11,11 @@ LRN #if !defined(__EXPORT_FFMPEG_DIALOGS_H__) #define __EXPORT_FFMPEG_DIALOGS_H__ -#include "../Audacity.h" // keep ffmpeg before wx because they interact // for USE_* macros + #if defined(USE_FFMPEG) -#include "../FFmpeg.h" // and Audacity.h before FFmpeg for config*.h +#include "../FFmpeg.h" #include "../xml/XMLFileReader.h" #include "../FileNames.h" diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp index e471537b2..f7197d3ad 100644 --- a/src/export/ExportFLAC.cpp +++ b/src/export/ExportFLAC.cpp @@ -18,7 +18,7 @@ and libvorbis examples, Monty **********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #ifdef USE_LIBFLAC diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp index 9770781c7..74935d400 100644 --- a/src/export/ExportMP2.cpp +++ b/src/export/ExportMP2.cpp @@ -32,7 +32,7 @@ */ -#include "../Audacity.h"// for USE_* macros + #ifdef USE_LIBTWOLAME diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp index 1c3f9ee4f..ce9f11ea8 100644 --- a/src/export/ExportMP3.cpp +++ b/src/export/ExportMP3.cpp @@ -59,7 +59,7 @@ *//********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "ExportMP3.h" #include diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index 8734d2499..d70250dab 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -15,7 +15,7 @@ *//********************************************************************/ -#include "../Audacity.h" + #include "ExportMultiple.h" #include diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp index 520c06c41..c14ed4b47 100644 --- a/src/export/ExportOGG.cpp +++ b/src/export/ExportOGG.cpp @@ -15,7 +15,7 @@ **********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #ifdef USE_LIBVORBIS diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp index 97ab8ee9c..529bf3245 100644 --- a/src/export/ExportPCM.cpp +++ b/src/export/ExportPCM.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include diff --git a/src/float_cast.h b/src/float_cast.h index 935cc2595..798a36342 100644 --- a/src/float_cast.h +++ b/src/float_cast.h @@ -35,7 +35,7 @@ ** long int lrint (double x) ; */ -#include "Audacity.h" // for HAVE_LRINT, HAVE_LRINTF + /* The presence of the required functions are detected during the configure ** process and the values HAVE_LRINT and HAVE_LRINTF are set accordingly in diff --git a/src/import/Import.cpp b/src/import/Import.cpp index 43eebb1a4..38aebaac8 100644 --- a/src/import/Import.cpp +++ b/src/import/Import.cpp @@ -35,7 +35,7 @@ ImportLOF.cpp, and ImportAUP.cpp. -#include "../Audacity.h" // for USE_* macros + #include "Import.h" #include "ImportPlugin.h" diff --git a/src/import/ImportAUP.cpp b/src/import/ImportAUP.cpp index 93e83d541..0484c7a6c 100644 --- a/src/import/ImportAUP.cpp +++ b/src/import/ImportAUP.cpp @@ -17,7 +17,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "Import.h" #include "ImportPlugin.h" diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp index 40256a0e0..8f68f12fe 100644 --- a/src/import/ImportFFmpeg.cpp +++ b/src/import/ImportFFmpeg.cpp @@ -20,7 +20,7 @@ Licensed under the GNU General Public License v2 or later *//*******************************************************************/ -#include "../Audacity.h" // needed before FFmpeg.h // for USE_* macros + // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp index ffbf7372e..359c23257 100644 --- a/src/import/ImportFLAC.cpp +++ b/src/import/ImportFLAC.cpp @@ -22,7 +22,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/import/ImportLOF.cpp b/src/import/ImportLOF.cpp index 52fdd039c..f0909d0da 100644 --- a/src/import/ImportLOF.cpp +++ b/src/import/ImportLOF.cpp @@ -69,7 +69,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include #include diff --git a/src/import/ImportMIDI.cpp b/src/import/ImportMIDI.cpp index 2ee40c479..d8523a33d 100644 --- a/src/import/ImportMIDI.cpp +++ b/src/import/ImportMIDI.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "ImportMIDI.h" #include diff --git a/src/import/ImportMIDI.h b/src/import/ImportMIDI.h index 1cafd1f06..3f99edaf0 100644 --- a/src/import/ImportMIDI.h +++ b/src/import/ImportMIDI.h @@ -18,7 +18,7 @@ into a NoteTrack. #ifndef _IMPORT_MIDI_ #define _IMPORT_MIDI_ -#include "../Audacity.h" // for USE_* macros + #include "audacity/Types.h" #if defined(USE_MIDI) diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp index 2b67093c3..14dfc3b25 100644 --- a/src/import/ImportMP3.cpp +++ b/src/import/ImportMP3.cpp @@ -26,7 +26,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include diff --git a/src/import/ImportOGG.cpp b/src/import/ImportOGG.cpp index e34bb9b33..c9db94c1d 100644 --- a/src/import/ImportOGG.cpp +++ b/src/import/ImportOGG.cpp @@ -28,7 +28,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp index f6fec4477..4daa57b95 100644 --- a/src/import/ImportPCM.cpp +++ b/src/import/ImportPCM.cpp @@ -19,7 +19,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "Import.h" #include "../Tags.h" diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h index cc72de3dd..03f2e5978 100644 --- a/src/import/ImportPlugin.h +++ b/src/import/ImportPlugin.h @@ -45,7 +45,7 @@ but little else. #ifndef __AUDACITY_IMPORTER__ #define __AUDACITY_IMPORTER__ -#include "../Audacity.h" + #include "audacity/Types.h" #include "../Internat.h" diff --git a/src/import/ImportRaw.cpp b/src/import/ImportRaw.cpp index d4e8dc5ff..cc2ba6a6c 100644 --- a/src/import/ImportRaw.cpp +++ b/src/import/ImportRaw.cpp @@ -21,7 +21,7 @@ and sample size to help you importing data of an unknown format. *//*******************************************************************/ -#include "../Audacity.h" + #include "ImportRaw.h" #include "ImportPlugin.h" diff --git a/src/import/RawAudioGuess.cpp b/src/import/RawAudioGuess.cpp index 4bb87b3d7..dd840f2be 100644 --- a/src/import/RawAudioGuess.cpp +++ b/src/import/RawAudioGuess.cpp @@ -13,7 +13,7 @@ **********************************************************************/ -#include "../Audacity.h" + #include "RawAudioGuess.h" #include "../AudacityException.h" diff --git a/src/menus/EditMenus.cpp b/src/menus/EditMenus.cpp index 75c7d8795..eea01d4c1 100644 --- a/src/menus/EditMenus.cpp +++ b/src/menus/EditMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" // for USE_* macros + #include "../AdornedRulerPanel.h" #include "../Clipboard.h" #include "../CommonCommandFlags.h" diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp index 68b661540..b36c10fa3 100644 --- a/src/menus/FileMenus.cpp +++ b/src/menus/FileMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" // for USE_* macros + #include "../CommonCommandFlags.h" #include "../FileNames.h" diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp index 9b03b69fc..89dd6e902 100644 --- a/src/menus/HelpMenus.cpp +++ b/src/menus/HelpMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" + #include #include diff --git a/src/menus/NavigationMenus.cpp b/src/menus/NavigationMenus.cpp index 3a4850b5b..84bc0d97e 100644 --- a/src/menus/NavigationMenus.cpp +++ b/src/menus/NavigationMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" + #include "../CommonCommandFlags.h" #include "../Prefs.h" diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp index 6814ab4b9..eb455834a 100644 --- a/src/menus/PluginMenus.cpp +++ b/src/menus/PluginMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" + #include "../AudioIO.h" #include "../BatchProcessDialog.h" diff --git a/src/menus/SelectMenus.cpp b/src/menus/SelectMenus.cpp index 06fda3132..4ee711a26 100644 --- a/src/menus/SelectMenus.cpp +++ b/src/menus/SelectMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" + #include "../AdornedRulerPanel.h" #include "../AudioIO.h" diff --git a/src/menus/ToolbarMenus.cpp b/src/menus/ToolbarMenus.cpp index 69c926c1e..baa42aa63 100644 --- a/src/menus/ToolbarMenus.cpp +++ b/src/menus/ToolbarMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" + #include "../Menus.h" #include "../ProjectSettings.h" diff --git a/src/menus/TrackMenus.cpp b/src/menus/TrackMenus.cpp index 232a98d52..6d5de00c2 100644 --- a/src/menus/TrackMenus.cpp +++ b/src/menus/TrackMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" + #include "../CommonCommandFlags.h" #include "../LabelTrack.h" diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp index 6da7ddd54..64f08aa7f 100644 --- a/src/menus/TransportMenus.cpp +++ b/src/menus/TransportMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" + #include "../AdornedRulerPanel.h" #include "../AudioIO.h" diff --git a/src/menus/ViewMenus.cpp b/src/menus/ViewMenus.cpp index d9b5e2298..f8801e500 100644 --- a/src/menus/ViewMenus.cpp +++ b/src/menus/ViewMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" + #include "../CommonCommandFlags.h" #include "../Menus.h" diff --git a/src/menus/WindowMenus.cpp b/src/menus/WindowMenus.cpp index c0d750884..c71ed0138 100644 --- a/src/menus/WindowMenus.cpp +++ b/src/menus/WindowMenus.cpp @@ -1,4 +1,4 @@ -#include "../Audacity.h" + #include "../commands/CommandManager.h" diff --git a/src/prefs/BatchPrefs.cpp b/src/prefs/BatchPrefs.cpp index e0dc54880..93debc574 100644 --- a/src/prefs/BatchPrefs.cpp +++ b/src/prefs/BatchPrefs.cpp @@ -14,7 +14,7 @@ setting used in debugging batch (aka macros) processing. *//*******************************************************************/ -#include "../Audacity.h" + #include "BatchPrefs.h" #include diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp index c2ed9dfa2..6d260cace 100644 --- a/src/prefs/DevicePrefs.cpp +++ b/src/prefs/DevicePrefs.cpp @@ -22,7 +22,7 @@ other settings. *//********************************************************************/ -#include "../Audacity.h" + #include "DevicePrefs.h" #include "RecordingPrefs.h" diff --git a/src/prefs/DirectoriesPrefs.cpp b/src/prefs/DirectoriesPrefs.cpp index 379e35a09..b63fd3156 100644 --- a/src/prefs/DirectoriesPrefs.cpp +++ b/src/prefs/DirectoriesPrefs.cpp @@ -15,7 +15,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "DirectoriesPrefs.h" #include diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp index 032140690..10dd31234 100644 --- a/src/prefs/EffectsPrefs.cpp +++ b/src/prefs/EffectsPrefs.cpp @@ -17,7 +17,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "EffectsPrefs.h" #include diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp index a4cbea96b..b2898d400 100644 --- a/src/prefs/ExtImportPrefs.cpp +++ b/src/prefs/ExtImportPrefs.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "ExtImportPrefs.h" #include diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp index 5b027ddcf..b815b095b 100644 --- a/src/prefs/GUIPrefs.cpp +++ b/src/prefs/GUIPrefs.cpp @@ -17,7 +17,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "GUIPrefs.h" #include diff --git a/src/prefs/ImportExportPrefs.cpp b/src/prefs/ImportExportPrefs.cpp index 24e0ee017..86b12b3b1 100644 --- a/src/prefs/ImportExportPrefs.cpp +++ b/src/prefs/ImportExportPrefs.cpp @@ -15,7 +15,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "ImportExportPrefs.h" #include diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index 8dcc7964e..1d1def9a3 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -19,7 +19,7 @@ KeyConfigPrefs and MousePrefs use. *//*********************************************************************/ -#include "../Audacity.h" + #include "KeyConfigPrefs.h" diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp index 68fd07205..b185b6cc5 100644 --- a/src/prefs/LibraryPrefs.cpp +++ b/src/prefs/LibraryPrefs.cpp @@ -16,7 +16,7 @@ MP3 and FFmpeg encoding libraries. *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "LibraryPrefs.h" #include diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index 249cd38aa..1d0730168 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -23,7 +23,7 @@ other settings. *//********************************************************************/ -#include "../Audacity.h" + #include "MidiIOPrefs.h" #ifdef EXPERIMENTAL_MIDI_OUT diff --git a/src/prefs/ModulePrefs.cpp b/src/prefs/ModulePrefs.cpp index a79fd48fa..00d7104a8 100644 --- a/src/prefs/ModulePrefs.cpp +++ b/src/prefs/ModulePrefs.cpp @@ -15,7 +15,7 @@ with names like mnod-script-pipe that add NEW features. *//*******************************************************************/ -#include "../Audacity.h" + #include "ModulePrefs.h" diff --git a/src/prefs/MousePrefs.cpp b/src/prefs/MousePrefs.cpp index 81d0dcbc0..b7b079caf 100644 --- a/src/prefs/MousePrefs.cpp +++ b/src/prefs/MousePrefs.cpp @@ -32,7 +32,7 @@ *//********************************************************************/ -#include "../Audacity.h" + #include "MousePrefs.h" #include diff --git a/src/prefs/PlaybackPrefs.cpp b/src/prefs/PlaybackPrefs.cpp index 29cbe0bca..2af064d32 100644 --- a/src/prefs/PlaybackPrefs.cpp +++ b/src/prefs/PlaybackPrefs.cpp @@ -18,7 +18,7 @@ *//********************************************************************/ -#include "../Audacity.h" + #include "PlaybackPrefs.h" #include diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp index adb85ecba..5db3d0fdb 100644 --- a/src/prefs/PrefsDialog.cpp +++ b/src/prefs/PrefsDialog.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "PrefsDialog.h" #include diff --git a/src/prefs/QualityPrefs.cpp b/src/prefs/QualityPrefs.cpp index adaeae624..baa04af7a 100644 --- a/src/prefs/QualityPrefs.cpp +++ b/src/prefs/QualityPrefs.cpp @@ -15,7 +15,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "QualityPrefs.h" #include diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index 0794acf29..77dccc81d 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -18,7 +18,7 @@ *//********************************************************************/ -#include "../Audacity.h" + #include "RecordingPrefs.h" #include diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h index 61b7d8523..2135f0f0e 100644 --- a/src/prefs/RecordingPrefs.h +++ b/src/prefs/RecordingPrefs.h @@ -12,7 +12,7 @@ #ifndef __AUDACITY_RECORDING_PREFS__ #define __AUDACITY_RECORDING_PREFS__ -#include "../Audacity.h" + #include diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp index e535f3732..3b992609a 100644 --- a/src/prefs/SpectrogramSettings.cpp +++ b/src/prefs/SpectrogramSettings.cpp @@ -13,7 +13,7 @@ Paul Licameli *//*******************************************************************/ -#include "../Audacity.h" + #include "SpectrogramSettings.h" #include "../NumberScale.h" diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp index ee701244b..2f6a9143c 100644 --- a/src/prefs/SpectrumPrefs.cpp +++ b/src/prefs/SpectrumPrefs.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "SpectrumPrefs.h" #include diff --git a/src/prefs/ThemePrefs.cpp b/src/prefs/ThemePrefs.cpp index f9b23155a..5ccb2a678 100644 --- a/src/prefs/ThemePrefs.cpp +++ b/src/prefs/ThemePrefs.cpp @@ -28,7 +28,7 @@ Provides: *//********************************************************************/ -#include "../Audacity.h" + #include "ThemePrefs.h" #include diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp index 3a9f35b7e..153c92c7c 100644 --- a/src/prefs/TracksBehaviorsPrefs.cpp +++ b/src/prefs/TracksBehaviorsPrefs.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "TracksBehaviorsPrefs.h" #include "../Prefs.h" diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index c310d9d58..f65fcd0a4 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -17,7 +17,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "TracksPrefs.h" //#include diff --git a/src/prefs/WarningsPrefs.cpp b/src/prefs/WarningsPrefs.cpp index 0c9db3c0d..450af98ca 100644 --- a/src/prefs/WarningsPrefs.cpp +++ b/src/prefs/WarningsPrefs.cpp @@ -17,7 +17,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "WarningsPrefs.h" #include diff --git a/src/prefs/WaveformPrefs.cpp b/src/prefs/WaveformPrefs.cpp index dbc3f9be9..395b18b24 100644 --- a/src/prefs/WaveformPrefs.cpp +++ b/src/prefs/WaveformPrefs.cpp @@ -13,7 +13,7 @@ Paul Licameli *//*******************************************************************/ -#include "../Audacity.h" + #include "WaveformPrefs.h" #include "GUIPrefs.h" diff --git a/src/prefs/WaveformSettings.cpp b/src/prefs/WaveformSettings.cpp index e79318807..6018a42cc 100644 --- a/src/prefs/WaveformSettings.cpp +++ b/src/prefs/WaveformSettings.cpp @@ -13,7 +13,7 @@ Paul Licameli *//*******************************************************************/ -#include "../Audacity.h" + #include "WaveformSettings.h" #include "GUISettings.h" diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp index 9880f281e..bd2c38ddc 100644 --- a/src/toolbars/ControlToolBar.cpp +++ b/src/toolbars/ControlToolBar.cpp @@ -30,7 +30,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "ControlToolBar.h" #include diff --git a/src/toolbars/DeviceToolBar.cpp b/src/toolbars/DeviceToolBar.cpp index ce56e8cfa..8bd9c543a 100644 --- a/src/toolbars/DeviceToolBar.cpp +++ b/src/toolbars/DeviceToolBar.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "DeviceToolBar.h" #include "ToolManager.h" diff --git a/src/toolbars/EditToolBar.cpp b/src/toolbars/EditToolBar.cpp index 5bf259cb8..08f158c24 100644 --- a/src/toolbars/EditToolBar.cpp +++ b/src/toolbars/EditToolBar.cpp @@ -30,7 +30,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "EditToolBar.h" // For compilers that support precompilation, includes "wx/wx.h". diff --git a/src/toolbars/MeterToolBar.cpp b/src/toolbars/MeterToolBar.cpp index 5248fbf05..20d965c13 100644 --- a/src/toolbars/MeterToolBar.cpp +++ b/src/toolbars/MeterToolBar.cpp @@ -17,7 +17,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "MeterToolBar.h" // For compilers that support precompilation, includes "wx/wx.h". diff --git a/src/toolbars/MixerToolBar.cpp b/src/toolbars/MixerToolBar.cpp index 85879ed8f..8f9c234a4 100644 --- a/src/toolbars/MixerToolBar.cpp +++ b/src/toolbars/MixerToolBar.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "MixerToolBar.h" #include "ToolManager.h" diff --git a/src/toolbars/ScrubbingToolBar.cpp b/src/toolbars/ScrubbingToolBar.cpp index 1705a3e0a..5fe9ec61d 100644 --- a/src/toolbars/ScrubbingToolBar.cpp +++ b/src/toolbars/ScrubbingToolBar.cpp @@ -13,7 +13,7 @@ // Much of this is imitative of EditToolBar. Should there be a common base // class? -#include "../Audacity.h" + #include "ScrubbingToolBar.h" #include "ToolManager.h" diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp index a7de3659d..6406c8f40 100644 --- a/src/toolbars/SelectionBar.cpp +++ b/src/toolbars/SelectionBar.cpp @@ -26,7 +26,7 @@ with changes in the SelectionBar. *//*******************************************************************/ -#include "../Audacity.h" + #include "SelectionBar.h" #include "SelectionBarListener.h" diff --git a/src/toolbars/SpectralSelectionBar.cpp b/src/toolbars/SpectralSelectionBar.cpp index 213157654..40b8e80a3 100644 --- a/src/toolbars/SpectralSelectionBar.cpp +++ b/src/toolbars/SpectralSelectionBar.cpp @@ -26,7 +26,7 @@ with changes in the SpectralSelectionBar. *//*******************************************************************/ -#include "../Audacity.h" + #include "SpectralSelectionBar.h" #include "SpectralSelectionBarListener.h" diff --git a/src/toolbars/SpectralSelectionBarListener.h b/src/toolbars/SpectralSelectionBarListener.h index 82bee722d..55eb055a7 100644 --- a/src/toolbars/SpectralSelectionBarListener.h +++ b/src/toolbars/SpectralSelectionBarListener.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_SPECTRAL_SELECTION_BAR_LISTENER__ #define __AUDACITY_SPECTRAL_SELECTION_BAR_LISTENER__ -#include "../Audacity.h" + #include "audacity/Types.h" class AUDACITY_DLL_API SpectralSelectionBarListener /* not final */ { diff --git a/src/toolbars/TimeToolBar.cpp b/src/toolbars/TimeToolBar.cpp index d8449dec6..59401d884 100644 --- a/src/toolbars/TimeToolBar.cpp +++ b/src/toolbars/TimeToolBar.cpp @@ -11,7 +11,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp index 817fcd9d9..067ad590f 100644 --- a/src/toolbars/ToolBar.cpp +++ b/src/toolbars/ToolBar.cpp @@ -24,7 +24,7 @@ in which buttons can be placed. *//**********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "ToolBar.h" // For compilers that support precompilation, includes "wx/wx.h". diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp index 6ae1df4dd..705bf874d 100644 --- a/src/toolbars/ToolDock.cpp +++ b/src/toolbars/ToolDock.cpp @@ -21,7 +21,7 @@ *//**********************************************************************/ -#include "../Audacity.h" + #include "ToolDock.h" #include diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp index deed6fa56..a4516a10a 100644 --- a/src/toolbars/ToolManager.cpp +++ b/src/toolbars/ToolManager.cpp @@ -24,7 +24,7 @@ *//**********************************************************************/ -#include "../Audacity.h" + #include "ToolManager.h" #include "../commands/CommandContext.h" diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp index 81fa0c63c..87738418c 100644 --- a/src/toolbars/ToolsToolBar.cpp +++ b/src/toolbars/ToolsToolBar.cpp @@ -30,7 +30,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "ToolsToolBar.h" #include "ToolManager.h" diff --git a/src/toolbars/TranscriptionToolBar.cpp b/src/toolbars/TranscriptionToolBar.cpp index bcd01b0fe..28b2f8521 100644 --- a/src/toolbars/TranscriptionToolBar.cpp +++ b/src/toolbars/TranscriptionToolBar.cpp @@ -14,7 +14,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "TranscriptionToolBar.h" #include "ToolManager.h" diff --git a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp index fde9640fd..d2b59e42a 100644 --- a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../Audacity.h" + #include "LabelDefaultClickHandle.h" #include "LabelTrackView.h" diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp index 6b1406146..1c474a5dd 100644 --- a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../Audacity.h" + #include "LabelGlyphHandle.h" #include "LabelTrackView.h" diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.cpp b/src/tracks/labeltrack/ui/LabelTextHandle.cpp index db2972d64..6d17eea50 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelTextHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../Audacity.h" + #include "LabelTextHandle.h" #include "LabelTrackView.h" diff --git a/src/tracks/labeltrack/ui/LabelTrackControls.cpp b/src/tracks/labeltrack/ui/LabelTrackControls.cpp index fec23f55d..3d5d07bf5 100644 --- a/src/tracks/labeltrack/ui/LabelTrackControls.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackControls.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../Audacity.h" + #include "LabelTrackControls.h" #include "LabelTrackView.h" diff --git a/src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp b/src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp index 39688a190..e745e2dd4 100644 --- a/src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../Audacity.h" + #include "LabelTrackVRulerControls.h" #include "../../../HitTestResult.h" diff --git a/src/tracks/labeltrack/ui/LabelTrackView.cpp b/src/tracks/labeltrack/ui/LabelTrackView.cpp index dacf7644e..b4452dbf2 100644 --- a/src/tracks/labeltrack/ui/LabelTrackView.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackView.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../Audacity.h" + #include "LabelTrackView.h" #include "LabelTrackVRulerControls.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp index 5778e951d..2dba1a564 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" // for USE_* macros + #ifdef USE_MIDI #include "NoteTrackButtonHandle.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp index a94f30e10..5fb42897c 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" // for USE_* macros + #ifdef USE_MIDI #include "NoteTrackControls.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h index 24051a530..8b75716ba 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h @@ -20,7 +20,7 @@ class SoloButtonHandle; class NoteTrackButtonHandle; class VelocitySliderHandle; -#include "../../../../Audacity.h" + using NoteTrackControlsBase = #ifdef EXPERIMENTAL_MIDI_OUT diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp index 5239b2e6d..e9bb73de9 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "../../../../Audacity.h" + #include "NoteTrackSliderHandles.h" #ifdef EXPERIMENTAL_MIDI_OUT diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp index f10453401..700a9c91a 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" // for USE_* macros + #ifdef USE_MIDI #include "NoteTrackVRulerControls.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp index 7954e0369..4af3819d9 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" // for USE_* macros + #ifdef USE_MIDI #include "NoteTrackVZoomHandle.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp index aeac09fb0..062d63d74 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" // for USE_* macros + #include "NoteTrackView.h" #ifdef USE_MIDI diff --git a/src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp b/src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp index c6cc58a69..f8eb74c46 100644 --- a/src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" // for USE_* macros + #ifdef USE_MIDI #include "../lib-src/header-substitutes/allegro.h" diff --git a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp index 6d3cdedab..543330529 100644 --- a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp +++ b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../Audacity.h" + #include "PlayableTrackButtonHandles.h" #include "PlayableTrackControls.h" diff --git a/src/tracks/playabletrack/ui/PlayableTrackControls.cpp b/src/tracks/playabletrack/ui/PlayableTrackControls.cpp index 2b0bc053b..62df97070 100644 --- a/src/tracks/playabletrack/ui/PlayableTrackControls.cpp +++ b/src/tracks/playabletrack/ui/PlayableTrackControls.cpp @@ -10,7 +10,7 @@ Paul Licameli split from TrackInfo.cpp #include "PlayableTrackControls.h" -#include "../../../Audacity.h" + #include "PlayableTrackButtonHandles.h" #include "../../../AColor.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp index a62fd7bb2..defb4e86f 100644 --- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" + #include "CutlineHandle.h" #include "../../../../HitTestResult.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp index 1c395b543..1c7e64dc8 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" + #include "SampleHandle.h" #include diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp index b407e6ef8..000ff2daa 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from WaveTrackVZoomHandle.cpp **********************************************************************/ -#include "../../../../Audacity.h" + #include "SpectrumVZoomHandle.h" #include "WaveTrackVZoomHandle.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp b/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp index e8aebfe5b..bb0204d61 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp @@ -8,7 +8,7 @@ Paul Licameli split from WaveTrackView.cpp **********************************************************************/ -#include "../../../../Audacity.h" + #include "SpectrumView.h" #include "SpectrumVRulerControls.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp index a41adf8a2..af2bc13ab 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" + #include "WaveTrackControls.h" #include "../../ui/PlayableTrackButtonHandles.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp index c6eff3ef4..cb4e003e8 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" + #include "WaveTrackSliderHandles.h" #include "WaveTrackControls.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp index d555197e9..32f9c66e3 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" + #include "WaveTrackVRulerControls.h" #include "../../../../RefreshCode.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp index e06922f12..4c3cbbae3 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../../Audacity.h" + #include "WaveTrackVZoomHandle.h" #include "../../../ui/TrackVRulerControls.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp index 00ddb1645..f581c4c8c 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from WaveTrackVZoomHandle.cpp **********************************************************************/ -#include "../../../../Audacity.h" + #include "WaveformVZoomHandle.h" #include "WaveTrackVZoomHandle.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp index d81ee8f38..68c0c0063 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp @@ -8,7 +8,7 @@ Paul Licameli split from WaveTrackView.cpp **********************************************************************/ -#include "../../../../Audacity.h" + #include "WaveformView.h" #include "WaveformVRulerControls.h" diff --git a/src/tracks/timetrack/ui/TimeTrackControls.cpp b/src/tracks/timetrack/ui/TimeTrackControls.cpp index fa4723778..dac2f980f 100644 --- a/src/tracks/timetrack/ui/TimeTrackControls.cpp +++ b/src/tracks/timetrack/ui/TimeTrackControls.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../Audacity.h" + #include "TimeTrackControls.h" #include "../../../HitTestResult.h" diff --git a/src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp b/src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp index 1191273eb..b0212f7eb 100644 --- a/src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp +++ b/src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../../Audacity.h" + #include "TimeTrackVRulerControls.h" #include "TimeTrackVZoomHandle.h" diff --git a/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp b/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp index b2bf98e82..74ee41777 100644 --- a/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp +++ b/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TimeTrackVZoomHandle.cpp **********************************************************************/ -#include "../../../Audacity.h" + #include "TimeTrackVZoomHandle.h" #include "TimeTrackVRulerControls.h" #include "TimeTrackControls.h" diff --git a/src/tracks/ui/BackgroundCell.cpp b/src/tracks/ui/BackgroundCell.cpp index a6a3234ee..7e8fa12c9 100644 --- a/src/tracks/ui/BackgroundCell.cpp +++ b/src/tracks/ui/BackgroundCell.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "BackgroundCell.h" #include "../../AColor.h" diff --git a/src/tracks/ui/ButtonHandle.cpp b/src/tracks/ui/ButtonHandle.cpp index e24726952..0c5cea27d 100644 --- a/src/tracks/ui/ButtonHandle.cpp +++ b/src/tracks/ui/ButtonHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli **********************************************************************/ -#include "../../Audacity.h" + #include "ButtonHandle.h" #include "../../HitTestResult.h" diff --git a/src/tracks/ui/CommonTrackPanelCell.h b/src/tracks/ui/CommonTrackPanelCell.h index b229a4c60..b38dcea4d 100644 --- a/src/tracks/ui/CommonTrackPanelCell.h +++ b/src/tracks/ui/CommonTrackPanelCell.h @@ -11,7 +11,7 @@ Paul Licameli split from TrackPanel.cpp #ifndef __AUDACITY_COMMON_TRACK_PANEL_CELL__ #define __AUDACITY_COMMON_TRACK_PANEL_CELL__ -#include "../../Audacity.h" + #include "../../TrackPanelCell.h" #include diff --git a/src/tracks/ui/EditCursorOverlay.cpp b/src/tracks/ui/EditCursorOverlay.cpp index dc7180090..1bb058e07 100644 --- a/src/tracks/ui/EditCursorOverlay.cpp +++ b/src/tracks/ui/EditCursorOverlay.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "EditCursorOverlay.h" #include "TrackView.h" diff --git a/src/tracks/ui/EnvelopeHandle.cpp b/src/tracks/ui/EnvelopeHandle.cpp index b907f2877..bd0154f3b 100644 --- a/src/tracks/ui/EnvelopeHandle.cpp +++ b/src/tracks/ui/EnvelopeHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "EnvelopeHandle.h" #include "TrackView.h" diff --git a/src/tracks/ui/PlayIndicatorOverlay.cpp b/src/tracks/ui/PlayIndicatorOverlay.cpp index e20ff4621..f808c54ce 100644 --- a/src/tracks/ui/PlayIndicatorOverlay.cpp +++ b/src/tracks/ui/PlayIndicatorOverlay.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "PlayIndicatorOverlay.h" #include "../../AColor.h" diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp index 78fb2b9dc..f5887d393 100644 --- a/src/tracks/ui/Scrubbing.cpp +++ b/src/tracks/ui/Scrubbing.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "Scrubbing.h" #include diff --git a/src/tracks/ui/Scrubbing.h b/src/tracks/ui/Scrubbing.h index 4da21e2a0..7563ba834 100644 --- a/src/tracks/ui/Scrubbing.h +++ b/src/tracks/ui/Scrubbing.h @@ -11,7 +11,7 @@ Paul Licameli split from TrackPanel.cpp #ifndef __AUDACITY_SCRUBBING__ #define __AUDACITY_SCRUBBING__ -#include "../../Audacity.h" + #include #include diff --git a/src/tracks/ui/SelectHandle.cpp b/src/tracks/ui/SelectHandle.cpp index 9f7c97de2..705e0845e 100644 --- a/src/tracks/ui/SelectHandle.cpp +++ b/src/tracks/ui/SelectHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "SelectHandle.h" #include "Scrubbing.h" diff --git a/src/tracks/ui/SliderHandle.cpp b/src/tracks/ui/SliderHandle.cpp index a433588c3..22458e771 100644 --- a/src/tracks/ui/SliderHandle.cpp +++ b/src/tracks/ui/SliderHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli **********************************************************************/ -#include "../../Audacity.h" + #include "SliderHandle.h" #include "../../widgets/ASlider.h" diff --git a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp index 1059796d7..084592cf3 100644 --- a/src/tracks/ui/TimeShiftHandle.cpp +++ b/src/tracks/ui/TimeShiftHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" // for USE_* macros + #include "TimeShiftHandle.h" #include "TrackView.h" diff --git a/src/tracks/ui/TrackButtonHandles.cpp b/src/tracks/ui/TrackButtonHandles.cpp index 28aa229cc..aeca01623 100644 --- a/src/tracks/ui/TrackButtonHandles.cpp +++ b/src/tracks/ui/TrackButtonHandles.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "TrackButtonHandles.h" #include "../../Project.h" diff --git a/src/tracks/ui/TrackControls.cpp b/src/tracks/ui/TrackControls.cpp index 5e4dee257..a338ead9b 100644 --- a/src/tracks/ui/TrackControls.cpp +++ b/src/tracks/ui/TrackControls.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "TrackControls.h" #include "../../Track.h" diff --git a/src/tracks/ui/TrackSelectHandle.cpp b/src/tracks/ui/TrackSelectHandle.cpp index 968b48b17..7dddc85c0 100644 --- a/src/tracks/ui/TrackSelectHandle.cpp +++ b/src/tracks/ui/TrackSelectHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "TrackSelectHandle.h" #include "TrackView.h" diff --git a/src/tracks/ui/TrackVRulerControls.cpp b/src/tracks/ui/TrackVRulerControls.cpp index b134fe5bd..f3e840ad2 100644 --- a/src/tracks/ui/TrackVRulerControls.cpp +++ b/src/tracks/ui/TrackVRulerControls.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "TrackVRulerControls.h" #include "TrackView.h" diff --git a/src/tracks/ui/ZoomHandle.cpp b/src/tracks/ui/ZoomHandle.cpp index 6b7d7e661..d5cd599ae 100644 --- a/src/tracks/ui/ZoomHandle.cpp +++ b/src/tracks/ui/ZoomHandle.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../../Audacity.h" + #include "ZoomHandle.h" #include diff --git a/src/widgets/AButton.cpp b/src/widgets/AButton.cpp index 77bc5199e..048bee74b 100644 --- a/src/widgets/AButton.cpp +++ b/src/widgets/AButton.cpp @@ -21,7 +21,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "AButton.h" #include "../AColor.h" diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp index bc2286a11..a00e95225 100644 --- a/src/widgets/ASlider.cpp +++ b/src/widgets/ASlider.cpp @@ -29,7 +29,7 @@ or ASlider. *//*******************************************************************/ -#include "../Audacity.h" + #include "ASlider.h" #include diff --git a/src/widgets/AttachableScrollBar.cpp b/src/widgets/AttachableScrollBar.cpp index 7a2b857fc..7d555f534 100644 --- a/src/widgets/AttachableScrollBar.cpp +++ b/src/widgets/AttachableScrollBar.cpp @@ -27,7 +27,7 @@ internally, not ints, allowing for (external) control of zooming. *//*******************************************************************/ -#include "../Audacity.h" + #include "AttachableScrollBar.h" #include diff --git a/src/widgets/BackedPanel.cpp b/src/widgets/BackedPanel.cpp index b32fce7a7..1a60aa637 100644 --- a/src/widgets/BackedPanel.cpp +++ b/src/widgets/BackedPanel.cpp @@ -6,7 +6,7 @@ // // -#include "../Audacity.h" + #include "BackedPanel.h" BackedPanel::BackedPanel(wxWindow * parent, wxWindowID id, diff --git a/src/widgets/ErrorDialog.cpp b/src/widgets/ErrorDialog.cpp index 0ef50d700..e34f1cd4e 100644 --- a/src/widgets/ErrorDialog.cpp +++ b/src/widgets/ErrorDialog.cpp @@ -14,7 +14,7 @@ *//********************************************************************/ -#include "../Audacity.h" + #include "ErrorDialog.h" #include diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h index e91c763f1..7657adf13 100644 --- a/src/widgets/ErrorDialog.h +++ b/src/widgets/ErrorDialog.h @@ -12,7 +12,7 @@ #ifndef __AUDACITY_ERRORDIALOG__ #define __AUDACITY_ERRORDIALOG__ -#include "../Audacity.h" + #include #include // to inherit diff --git a/src/widgets/FileConfig.cpp b/src/widgets/FileConfig.cpp index 51e383bd6..29f983667 100644 --- a/src/widgets/FileConfig.cpp +++ b/src/widgets/FileConfig.cpp @@ -8,7 +8,7 @@ **********************************************************************/ -#include "../Audacity.h" + #include diff --git a/src/widgets/FileHistory.cpp b/src/widgets/FileHistory.cpp index 5a82dee2b..997260d22 100644 --- a/src/widgets/FileHistory.cpp +++ b/src/widgets/FileHistory.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "FileHistory.h" #include diff --git a/src/widgets/Grabber.cpp b/src/widgets/Grabber.cpp index eb4a1801d..55ee97bd8 100644 --- a/src/widgets/Grabber.cpp +++ b/src/widgets/Grabber.cpp @@ -20,7 +20,7 @@ around to NEW positions. *//**********************************************************************/ -#include "../Audacity.h" + #include "Grabber.h" #include diff --git a/src/widgets/Grabber.h b/src/widgets/Grabber.h index b9503a7ef..af77b0551 100644 --- a/src/widgets/Grabber.h +++ b/src/widgets/Grabber.h @@ -29,7 +29,7 @@ flicker-free use. #ifndef __AUDACITY_WIDGETS_GRABBER__ #define __AUDACITY_WIDGETS_GRABBER__ -#include "../Audacity.h" + #include #include // to inherit diff --git a/src/widgets/Grid.cpp b/src/widgets/Grid.cpp index da3f6d4e8..ffbdf6182 100644 --- a/src/widgets/Grid.cpp +++ b/src/widgets/Grid.cpp @@ -13,7 +13,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "Grid.h" #include // for wxUSE_* macros diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp index fa274f217..6a91ac4d6 100644 --- a/src/widgets/HelpSystem.cpp +++ b/src/widgets/HelpSystem.cpp @@ -19,7 +19,7 @@ *//********************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "HelpSystem.h" #include // for wxUSE_* macros diff --git a/src/widgets/HelpSystem.h b/src/widgets/HelpSystem.h index 841e0663e..8e33b35a7 100644 --- a/src/widgets/HelpSystem.h +++ b/src/widgets/HelpSystem.h @@ -21,7 +21,7 @@ #ifndef __AUDACITY_HELPSYSTEM__ #define __AUDACITY_HELPSYSTEM__ -#include "../Audacity.h" + #include #include "wxPanelWrapper.h" // to inherit diff --git a/src/widgets/HtmlWindow.cpp b/src/widgets/HtmlWindow.cpp index 193dcc6db..c4076f437 100644 --- a/src/widgets/HtmlWindow.cpp +++ b/src/widgets/HtmlWindow.cpp @@ -19,7 +19,7 @@ *//**********************************************************************/ -#include "../Audacity.h" + #include "HtmlWindow.h" #include // for wxUSE_* macros diff --git a/src/widgets/HtmlWindow.h b/src/widgets/HtmlWindow.h index fdcc2a2d7..b85655934 100644 --- a/src/widgets/HtmlWindow.h +++ b/src/widgets/HtmlWindow.h @@ -23,7 +23,7 @@ around to NEW positions. #ifndef __AUDACITY_WIDGETS_HtmlWindow__ #define __AUDACITY_WIDGETS_HtmlWindow__ -#include "../Audacity.h" + #include // for wxUSE_* macros #include diff --git a/src/widgets/ImageRoll.cpp b/src/widgets/ImageRoll.cpp index 51fc685c5..932ed98b0 100644 --- a/src/widgets/ImageRoll.cpp +++ b/src/widgets/ImageRoll.cpp @@ -94,7 +94,7 @@ *//*******************************************************************/ -#include "../Audacity.h" + #include "ImageRoll.h" #include diff --git a/src/widgets/KeyView.cpp b/src/widgets/KeyView.cpp index f238a1001..e34a626d0 100644 --- a/src/widgets/KeyView.cpp +++ b/src/widgets/KeyView.cpp @@ -11,7 +11,7 @@ *//*********************************************************************/ -#include "../Audacity.h" + #include "KeyView.h" #include // for wxUSE_* macros diff --git a/src/widgets/KeyView.h b/src/widgets/KeyView.h index ce5d435fb..3fff8bdae 100644 --- a/src/widgets/KeyView.h +++ b/src/widgets/KeyView.h @@ -9,7 +9,7 @@ #ifndef __AUDACITY_WIDGETS_KEYVIEW__ #define __AUDACITY_WIDGETS_KEYVIEW__ -#include "../Audacity.h" + #include "audacity/Types.h" #include diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index 494d765fa..5fa1ef7ce 100644 --- a/src/widgets/Meter.cpp +++ b/src/widgets/Meter.cpp @@ -38,7 +38,7 @@ *//******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "Meter.h" #include diff --git a/src/widgets/MultiDialog.cpp b/src/widgets/MultiDialog.cpp index 151fd5b4c..68f55aed4 100644 --- a/src/widgets/MultiDialog.cpp +++ b/src/widgets/MultiDialog.cpp @@ -18,7 +18,7 @@ for each problem encountered, since there can be many orphans. *//*******************************************************************/ -#include "../Audacity.h" + #include "MultiDialog.h" #include "../ShuttleGui.h" diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp index bef3431d4..80944be91 100644 --- a/src/widgets/NumericTextCtrl.cpp +++ b/src/widgets/NumericTextCtrl.cpp @@ -165,7 +165,7 @@ different formats. **********************************************************************/ -#include "../Audacity.h" + #include "NumericTextCtrl.h" #include "audacity/Types.h" diff --git a/src/widgets/NumericTextCtrl.h b/src/widgets/NumericTextCtrl.h index dd4cd2b51..2f2c74ceb 100644 --- a/src/widgets/NumericTextCtrl.h +++ b/src/widgets/NumericTextCtrl.h @@ -15,7 +15,7 @@ #ifndef __AUDACITY_TIME_TEXT_CTRL__ #define __AUDACITY_TIME_TEXT_CTRL__ -#include "../Audacity.h" + #include "../MemoryX.h" #include "../../include/audacity/ComponentInterface.h" diff --git a/src/widgets/Overlay.h b/src/widgets/Overlay.h index 5d8ab79e4..000db0db0 100644 --- a/src/widgets/Overlay.h +++ b/src/widgets/Overlay.h @@ -9,7 +9,7 @@ #ifndef __AUDACITY_OVERLAY__ #define __AUDACITY_OVERLAY__ -#include "../Audacity.h" + #include diff --git a/src/widgets/OverlayPanel.cpp b/src/widgets/OverlayPanel.cpp index 298b18d57..5224098f2 100644 --- a/src/widgets/OverlayPanel.cpp +++ b/src/widgets/OverlayPanel.cpp @@ -6,7 +6,7 @@ // // -#include "../Audacity.h" + #include "OverlayPanel.h" #include "Overlay.h" diff --git a/src/widgets/PopupMenuTable.cpp b/src/widgets/PopupMenuTable.cpp index 988ab6a1b..6f5610e60 100644 --- a/src/widgets/PopupMenuTable.cpp +++ b/src/widgets/PopupMenuTable.cpp @@ -8,7 +8,7 @@ Paul Licameli split from TrackPanel.cpp **********************************************************************/ -#include "../Audacity.h" + #include "PopupMenuTable.h" PopupMenuTableEntry::~PopupMenuTableEntry() diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp index e7c6f5f08..a5064be23 100644 --- a/src/widgets/ProgressDialog.cpp +++ b/src/widgets/ProgressDialog.cpp @@ -26,7 +26,7 @@ *//**********************************************************************/ -#include "../Audacity.h" + #include "ProgressDialog.h" #include diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h index 7f45cc292..0ef53a83b 100644 --- a/src/widgets/ProgressDialog.h +++ b/src/widgets/ProgressDialog.h @@ -18,7 +18,7 @@ #ifndef __AUDACITY_WIDGETS_PROGRESSDIALOG__ #define __AUDACITY_WIDGETS_PROGRESSDIALOG__ -#include "../Audacity.h" + #include #include diff --git a/src/widgets/ReadOnlyText.h b/src/widgets/ReadOnlyText.h index 37e6fdd76..c6b97e5a3 100644 --- a/src/widgets/ReadOnlyText.h +++ b/src/widgets/ReadOnlyText.h @@ -9,7 +9,7 @@ #ifndef __AUDACITY_READONLYTEXT__ #define __AUDACITY_READONLYTEXT__ -#include "../Audacity.h" + #include diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp index 56207ea77..8dc4d0a65 100644 --- a/src/widgets/Ruler.cpp +++ b/src/widgets/Ruler.cpp @@ -54,7 +54,7 @@ array of Ruler::Label. *//******************************************************************/ -#include "../Audacity.h" + #include "Ruler.h" #include diff --git a/src/widgets/Warning.cpp b/src/widgets/Warning.cpp index 16308b44a..97171093c 100644 --- a/src/widgets/Warning.cpp +++ b/src/widgets/Warning.cpp @@ -16,7 +16,7 @@ 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 5587c8f87..b4ea50c2e 100644 --- a/src/widgets/Warning.h +++ b/src/widgets/Warning.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_WARNING__ #define __AUDACITY_WARNING__ -#include "../Audacity.h" + #include class wxString; diff --git a/src/widgets/numformatter.cpp b/src/widgets/numformatter.cpp index 68ce424e6..8cb2e49e8 100644 --- a/src/widgets/numformatter.cpp +++ b/src/widgets/numformatter.cpp @@ -15,7 +15,7 @@ // headers // ---------------------------------------------------------------------------- -#include "../Audacity.h" + #include "numformatter.h" // For compilers that support precompilation, includes "wx.h". diff --git a/src/widgets/valnum.cpp b/src/widgets/valnum.cpp index 857ab8651..d427540e5 100644 --- a/src/widgets/valnum.cpp +++ b/src/widgets/valnum.cpp @@ -19,7 +19,7 @@ // headers // ---------------------------------------------------------------------------- -#include "../Audacity.h" + #include "valnum.h" // For compilers that support precompilation, includes "wx.h". diff --git a/src/widgets/wxPanelWrapper.cpp b/src/widgets/wxPanelWrapper.cpp index d3b77638d..8661b6ff6 100644 --- a/src/widgets/wxPanelWrapper.cpp +++ b/src/widgets/wxPanelWrapper.cpp @@ -6,7 +6,7 @@ // // -#include "../Audacity.h" + #include "wxPanelWrapper.h" #include diff --git a/src/widgets/wxTextCtrlWrapper.h b/src/widgets/wxTextCtrlWrapper.h index 4dec434ec..66495d525 100644 --- a/src/widgets/wxTextCtrlWrapper.h +++ b/src/widgets/wxTextCtrlWrapper.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_WXTEXTCTRLWRAPPER__ #define __AUDACITY_WXTEXTCTRLWRAPPER__ -#include "../Audacity.h" + #include diff --git a/src/xml/XMLFileReader.h b/src/xml/XMLFileReader.h index 258adb2b0..7babdd6bc 100644 --- a/src/xml/XMLFileReader.h +++ b/src/xml/XMLFileReader.h @@ -8,7 +8,7 @@ **********************************************************************/ -#include "../Audacity.h" + #include struct XML_ParserStruct; diff --git a/src/xml/XMLTagHandler.cpp b/src/xml/XMLTagHandler.cpp index 63502cf0a..33a1cafd6 100644 --- a/src/xml/XMLTagHandler.cpp +++ b/src/xml/XMLTagHandler.cpp @@ -21,7 +21,7 @@ *//*******************************************************************/ -#include "../Audacity.h" // for USE_* macros + #include "XMLTagHandler.h" #ifdef _WIN32 diff --git a/src/xml/XMLTagHandler.h b/src/xml/XMLTagHandler.h index 59dbcbc07..c7a1246af 100644 --- a/src/xml/XMLTagHandler.h +++ b/src/xml/XMLTagHandler.h @@ -18,7 +18,7 @@ #ifndef __AUDACITY_XML_TAG_HANDLER__ #define __AUDACITY_XML_TAG_HANDLER__ -#include "../Audacity.h" // for USE_* macros + #include diff --git a/src/xml/XMLWriter.cpp b/src/xml/XMLWriter.cpp index 9bf1a9281..a80c7c10f 100644 --- a/src/xml/XMLWriter.cpp +++ b/src/xml/XMLWriter.cpp @@ -24,7 +24,7 @@ the general functionality for creating XML in UTF8 encoding. *//*******************************************************************/ -#include "../Audacity.h" + #include "XMLWriter.h" #include diff --git a/win/audacity.rc b/win/audacity.rc index 2e3e4f4aa..6e0041b7e 100644 --- a/win/audacity.rc +++ b/win/audacity.rc @@ -1,5 +1,3 @@ -#include "Audacity.h" - #ifdef EXPERIMENTAL_DA AudacityLogo ICON "darkaudacity.ico" #else