From 508e25afbbb893214a4e8423c31198db810e7f27 Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 29 Aug 2013 12:44:00 +0100 Subject: [PATCH] Cleared-out the last batch of unnecessary includes. --- .../audio_io/juce_AudioDeviceManager.h | 4 -- .../audio_io/juce_AudioIODeviceType.h | 3 -- .../audio_io/juce_SystemAudioVolume.h | 1 + .../juce_audio_devices/juce_audio_devices.h | 4 +- .../midi_io/juce_MidiMessageCollector.h | 2 - .../format/juce_AudioFormat.h | 3 -- .../format/juce_AudioFormatManager.h | 2 - .../format/juce_AudioFormatReader.h | 2 - .../juce_audio_formats/juce_audio_formats.h | 9 ++-- .../format/juce_AudioPluginFormat.h | 3 -- .../format/juce_AudioPluginFormatManager.h | 2 - .../format_types/juce_AudioUnitPluginFormat.h | 7 ---- .../format_types/juce_LADSPAPluginFormat.h | 7 ---- .../format_types/juce_VSTPluginFormat.h | 6 --- .../juce_audio_processors.h | 15 +++---- .../processors/juce_AudioPluginInstance.h | 3 -- .../processors/juce_AudioProcessor.h | 4 -- .../processors/juce_AudioProcessorEditor.h | 2 - .../processors/juce_AudioProcessorGraph.h | 4 -- .../processors/juce_AudioProcessorListener.h | 1 - .../juce_GenericAudioProcessorEditor.h | 2 - .../scanning/juce_KnownPluginList.h | 3 -- .../scanning/juce_PluginDirectoryScanner.h | 3 -- .../scanning/juce_PluginListComponent.h | 3 -- .../gui/juce_AudioThumbnail.h | 2 - .../gui/juce_AudioThumbnailCache.h | 2 - modules/juce_audio_utils/juce_audio_utils.h | 14 ++++--- .../players/juce_AudioProcessorPlayer.h | 2 - .../juce_core/containers/juce_AbstractFifo.h | 2 - modules/juce_core/containers/juce_SparseSet.h | 3 -- modules/juce_core/juce_core.h | 41 +++++++++++++++---- .../memory/juce_ReferenceCountedObject.h | 2 - .../juce_core/system/juce_StandardHeader.h | 16 -------- modules/juce_core/text/juce_String.h | 22 ---------- .../juce_core/threads/juce_CriticalSection.h | 2 - modules/juce_cryptography/juce_cryptography.h | 2 - modules/juce_video/juce_video.h | 2 - 37 files changed, 52 insertions(+), 155 deletions(-) diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h index e9d1bc8b8a..14432bd6c5 100644 --- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h +++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h @@ -25,10 +25,6 @@ #ifndef JUCE_AUDIODEVICEMANAGER_H_INCLUDED #define JUCE_AUDIODEVICEMANAGER_H_INCLUDED -#include "juce_AudioIODeviceType.h" -#include "../midi_io/juce_MidiInput.h" -#include "../midi_io/juce_MidiOutput.h" - //============================================================================== /** diff --git a/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h b/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h index 532304de2a..07e08860bf 100644 --- a/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h +++ b/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h @@ -25,9 +25,6 @@ #ifndef JUCE_AUDIOIODEVICETYPE_H_INCLUDED #define JUCE_AUDIOIODEVICETYPE_H_INCLUDED -#include "juce_AudioIODevice.h" -class AudioDeviceManager; - //============================================================================== /** diff --git a/modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h b/modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h index d777249d5a..689e1f2919 100644 --- a/modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h +++ b/modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h @@ -25,6 +25,7 @@ #ifndef JUCE_SYSTEMAUDIOVOLUME_H_INCLUDED #define JUCE_SYSTEMAUDIOVOLUME_H_INCLUDED + //============================================================================== /** Contains functions to control the system's master volume. diff --git a/modules/juce_audio_devices/juce_audio_devices.h b/modules/juce_audio_devices/juce_audio_devices.h index 91cd3fbf37..b8528d5bc3 100644 --- a/modules/juce_audio_devices/juce_audio_devices.h +++ b/modules/juce_audio_devices/juce_audio_devices.h @@ -100,8 +100,6 @@ namespace juce { -// START_AUTOINCLUDE audio_io, midi_io, sources, audio_cd -#include "audio_io/juce_AudioDeviceManager.h" #include "audio_io/juce_AudioIODevice.h" #include "audio_io/juce_AudioIODeviceType.h" #include "audio_io/juce_SystemAudioVolume.h" @@ -112,7 +110,7 @@ namespace juce #include "sources/juce_AudioTransportSource.h" #include "audio_cd/juce_AudioCDBurner.h" #include "audio_cd/juce_AudioCDReader.h" -// END_AUTOINCLUDE +#include "audio_io/juce_AudioDeviceManager.h" } diff --git a/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h b/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h index 4d8ac8fae7..5b1673779e 100644 --- a/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h +++ b/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h @@ -25,8 +25,6 @@ #ifndef JUCE_MIDIMESSAGECOLLECTOR_H_INCLUDED #define JUCE_MIDIMESSAGECOLLECTOR_H_INCLUDED -#include "juce_MidiInput.h" - //============================================================================== /** diff --git a/modules/juce_audio_formats/format/juce_AudioFormat.h b/modules/juce_audio_formats/format/juce_AudioFormat.h index fe308471bb..8be7567400 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormat.h +++ b/modules/juce_audio_formats/format/juce_AudioFormat.h @@ -25,9 +25,6 @@ #ifndef JUCE_AUDIOFORMAT_H_INCLUDED #define JUCE_AUDIOFORMAT_H_INCLUDED -#include "juce_AudioFormatReader.h" -#include "juce_AudioFormatWriter.h" -#include "juce_MemoryMappedAudioFormatReader.h" //============================================================================== /** diff --git a/modules/juce_audio_formats/format/juce_AudioFormatManager.h b/modules/juce_audio_formats/format/juce_AudioFormatManager.h index 3a9d58b086..f560347d62 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormatManager.h +++ b/modules/juce_audio_formats/format/juce_AudioFormatManager.h @@ -25,8 +25,6 @@ #ifndef JUCE_AUDIOFORMATMANAGER_H_INCLUDED #define JUCE_AUDIOFORMATMANAGER_H_INCLUDED -#include "juce_AudioFormat.h" - //============================================================================== /** diff --git a/modules/juce_audio_formats/format/juce_AudioFormatReader.h b/modules/juce_audio_formats/format/juce_AudioFormatReader.h index 4031c8cc45..d7cdd9c867 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormatReader.h +++ b/modules/juce_audio_formats/format/juce_AudioFormatReader.h @@ -25,8 +25,6 @@ #ifndef JUCE_AUDIOFORMATREADER_H_INCLUDED #define JUCE_AUDIOFORMATREADER_H_INCLUDED -class AudioFormat; - //============================================================================== /** diff --git a/modules/juce_audio_formats/juce_audio_formats.h b/modules/juce_audio_formats/juce_audio_formats.h index 40e979e142..c15194e464 100644 --- a/modules/juce_audio_formats/juce_audio_formats.h +++ b/modules/juce_audio_formats/juce_audio_formats.h @@ -85,15 +85,15 @@ namespace juce { -// START_AUTOINCLUDE format, codecs, sampler +class AudioFormat; +#include "format/juce_AudioFormatReader.h" +#include "format/juce_AudioFormatWriter.h" +#include "format/juce_MemoryMappedAudioFormatReader.h" #include "format/juce_AudioFormat.h" #include "format/juce_AudioFormatManager.h" -#include "format/juce_AudioFormatReader.h" #include "format/juce_AudioFormatReaderSource.h" -#include "format/juce_AudioFormatWriter.h" #include "format/juce_AudioSubsectionReader.h" #include "format/juce_BufferingAudioFormatReader.h" -#include "format/juce_MemoryMappedAudioFormatReader.h" #include "codecs/juce_AiffAudioFormat.h" #include "codecs/juce_CoreAudioFormat.h" #include "codecs/juce_FlacAudioFormat.h" @@ -104,7 +104,6 @@ namespace juce #include "codecs/juce_WavAudioFormat.h" #include "codecs/juce_WindowsMediaAudioFormat.h" #include "sampler/juce_Sampler.h" -// END_AUTOINCLUDE } diff --git a/modules/juce_audio_processors/format/juce_AudioPluginFormat.h b/modules/juce_audio_processors/format/juce_AudioPluginFormat.h index 478715a1f3..d28c20a61f 100644 --- a/modules/juce_audio_processors/format/juce_AudioPluginFormat.h +++ b/modules/juce_audio_processors/format/juce_AudioPluginFormat.h @@ -25,9 +25,6 @@ #ifndef JUCE_AUDIOPLUGINFORMAT_H_INCLUDED #define JUCE_AUDIOPLUGINFORMAT_H_INCLUDED -#include "../processors/juce_AudioPluginInstance.h" -class PluginDescription; - //============================================================================== /** diff --git a/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.h b/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.h index b62b2ef559..7d491cf61b 100644 --- a/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.h +++ b/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.h @@ -25,8 +25,6 @@ #ifndef JUCE_AUDIOPLUGINFORMATMANAGER_H_INCLUDED #define JUCE_AUDIOPLUGINFORMATMANAGER_H_INCLUDED -#include "juce_AudioPluginFormat.h" - //============================================================================== /** diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h index a7e57f74aa..24e37bea6f 100644 --- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h +++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h @@ -22,11 +22,6 @@ ============================================================================== */ -#ifndef JUCE_AUDIOUNITPLUGINFORMAT_H_INCLUDED -#define JUCE_AUDIOUNITPLUGINFORMAT_H_INCLUDED - -#include "../format/juce_AudioPluginFormat.h" - #if (JUCE_PLUGINHOST_AU && JUCE_MAC) || DOXYGEN //============================================================================== @@ -58,5 +53,3 @@ private: }; #endif - -#endif // JUCE_AUDIOUNITPLUGINFORMAT_H_INCLUDED diff --git a/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.h b/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.h index 99dbf53e9c..8d54a9fe27 100644 --- a/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.h +++ b/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.h @@ -22,11 +22,6 @@ ============================================================================== */ -#ifndef JUCE_LADSPAPLUGINFORMAT_H_INCLUDED -#define JUCE_LADSPAPLUGINFORMAT_H_INCLUDED - -#include "../format/juce_AudioPluginFormat.h" - #if (JUCE_PLUGINHOST_LADSPA && JUCE_LINUX) || DOXYGEN //============================================================================== @@ -60,5 +55,3 @@ private: #endif - -#endif // JUCE_LADSPAPLUGINFORMAT_H_INCLUDED diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.h b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.h index aeb838fefc..3103fb7738 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.h +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.h @@ -22,11 +22,6 @@ ============================================================================== */ -#ifndef JUCE_VSTPLUGINFORMAT_H_INCLUDED -#define JUCE_VSTPLUGINFORMAT_H_INCLUDED - -#include "../format/juce_AudioPluginFormat.h" - #if JUCE_PLUGINHOST_VST || DOXYGEN //============================================================================== @@ -109,4 +104,3 @@ private: #endif -#endif // JUCE_VSTPLUGINFORMAT_H_INCLUDED diff --git a/modules/juce_audio_processors/juce_audio_processors.h b/modules/juce_audio_processors/juce_audio_processors.h index 7efc3617c3..d91fed99ab 100644 --- a/modules/juce_audio_processors/juce_audio_processors.h +++ b/modules/juce_audio_processors/juce_audio_processors.h @@ -59,30 +59,27 @@ //============================================================================= //============================================================================= -#include "../juce_core/system/juce_StandardHeader.h" - namespace juce { -// START_AUTOINCLUDE processors, format, format_types, scanning +class AudioProcessor; #include "processors/juce_AudioPlayHead.h" -#include "processors/juce_AudioPluginInstance.h" -#include "processors/juce_AudioProcessor.h" #include "processors/juce_AudioProcessorEditor.h" -#include "processors/juce_AudioProcessorGraph.h" #include "processors/juce_AudioProcessorListener.h" -#include "processors/juce_GenericAudioProcessorEditor.h" +#include "processors/juce_AudioProcessor.h" #include "processors/juce_PluginDescription.h" +#include "processors/juce_AudioPluginInstance.h" +#include "processors/juce_AudioProcessorGraph.h" +#include "processors/juce_GenericAudioProcessorEditor.h" #include "format/juce_AudioPluginFormat.h" #include "format/juce_AudioPluginFormatManager.h" +#include "scanning/juce_KnownPluginList.h" #include "format_types/juce_AudioUnitPluginFormat.h" #include "format_types/juce_LADSPAPluginFormat.h" #include "format_types/juce_VSTMidiEventList.h" #include "format_types/juce_VSTPluginFormat.h" -#include "scanning/juce_KnownPluginList.h" #include "scanning/juce_PluginDirectoryScanner.h" #include "scanning/juce_PluginListComponent.h" -// END_AUTOINCLUDE } diff --git a/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h b/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h index b5e8466489..c4e67dbbdb 100644 --- a/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h +++ b/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h @@ -25,9 +25,6 @@ #ifndef JUCE_AUDIOPLUGININSTANCE_H_INCLUDED #define JUCE_AUDIOPLUGININSTANCE_H_INCLUDED -#include "../processors/juce_AudioProcessor.h" -#include "juce_PluginDescription.h" - //============================================================================== /** diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h index 160354272e..d526a2e5f3 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h +++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h @@ -25,10 +25,6 @@ #ifndef JUCE_AUDIOPROCESSOR_H_INCLUDED #define JUCE_AUDIOPROCESSOR_H_INCLUDED -#include "juce_AudioProcessorEditor.h" -#include "juce_AudioProcessorListener.h" -#include "juce_AudioPlayHead.h" - //============================================================================== /** diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h index 8064110dd0..3c811a254e 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h @@ -25,8 +25,6 @@ #ifndef JUCE_AUDIOPROCESSOREDITOR_H_INCLUDED #define JUCE_AUDIOPROCESSOREDITOR_H_INCLUDED -class AudioProcessor; - //============================================================================== /** diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h index c04017e17d..bf2267078f 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h @@ -25,10 +25,6 @@ #ifndef JUCE_AUDIOPROCESSORGRAPH_H_INCLUDED #define JUCE_AUDIOPROCESSORGRAPH_H_INCLUDED -#include "juce_AudioProcessor.h" -#include "../format/juce_AudioPluginFormatManager.h" -#include "../scanning/juce_KnownPluginList.h" - //============================================================================== /** diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorListener.h b/modules/juce_audio_processors/processors/juce_AudioProcessorListener.h index a7d019c098..d8ea93c994 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessorListener.h +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorListener.h @@ -25,7 +25,6 @@ #ifndef JUCE_AUDIOPROCESSORLISTENER_H_INCLUDED #define JUCE_AUDIOPROCESSORLISTENER_H_INCLUDED -class AudioProcessor; //============================================================================== /** diff --git a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h index 2506ac41d3..1189f8802c 100644 --- a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h +++ b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h @@ -25,8 +25,6 @@ #ifndef JUCE_GENERICAUDIOPROCESSOREDITOR_H_INCLUDED #define JUCE_GENERICAUDIOPROCESSOREDITOR_H_INCLUDED -#include "juce_AudioProcessorEditor.h" - //============================================================================== /** diff --git a/modules/juce_audio_processors/scanning/juce_KnownPluginList.h b/modules/juce_audio_processors/scanning/juce_KnownPluginList.h index db4966a3e6..b66c7d6ce6 100644 --- a/modules/juce_audio_processors/scanning/juce_KnownPluginList.h +++ b/modules/juce_audio_processors/scanning/juce_KnownPluginList.h @@ -25,9 +25,6 @@ #ifndef JUCE_KNOWNPLUGINLIST_H_INCLUDED #define JUCE_KNOWNPLUGINLIST_H_INCLUDED -#include "../processors/juce_PluginDescription.h" -#include "../format/juce_AudioPluginFormat.h" - //============================================================================== /** diff --git a/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.h b/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.h index e271e2eb99..762e742593 100644 --- a/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.h +++ b/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.h @@ -25,9 +25,6 @@ #ifndef JUCE_PLUGINDIRECTORYSCANNER_H_INCLUDED #define JUCE_PLUGINDIRECTORYSCANNER_H_INCLUDED -#include "juce_KnownPluginList.h" -#include "../format/juce_AudioPluginFormatManager.h" - //============================================================================== /** diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h index 2026323094..a3cf675b61 100644 --- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h +++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h @@ -25,9 +25,6 @@ #ifndef JUCE_PLUGINLISTCOMPONENT_H_INCLUDED #define JUCE_PLUGINLISTCOMPONENT_H_INCLUDED -#include "juce_KnownPluginList.h" -#include "../format/juce_AudioPluginFormat.h" - //============================================================================== /** diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnail.h b/modules/juce_audio_utils/gui/juce_AudioThumbnail.h index 6a8b323ed4..fd890a648d 100644 --- a/modules/juce_audio_utils/gui/juce_AudioThumbnail.h +++ b/modules/juce_audio_utils/gui/juce_AudioThumbnail.h @@ -25,8 +25,6 @@ #ifndef JUCE_AUDIOTHUMBNAIL_H_INCLUDED #define JUCE_AUDIOTHUMBNAIL_H_INCLUDED -class AudioThumbnailCache; - //============================================================================== /** diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h b/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h index e9a1a13b03..7a9a052b2f 100644 --- a/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h +++ b/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h @@ -25,8 +25,6 @@ #ifndef JUCE_AUDIOTHUMBNAILCACHE_H_INCLUDED #define JUCE_AUDIOTHUMBNAILCACHE_H_INCLUDED -#include "juce_AudioThumbnailBase.h" - //============================================================================== /** diff --git a/modules/juce_audio_utils/juce_audio_utils.h b/modules/juce_audio_utils/juce_audio_utils.h index 22b9496705..b5f38f8f42 100644 --- a/modules/juce_audio_utils/juce_audio_utils.h +++ b/modules/juce_audio_utils/juce_audio_utils.h @@ -33,12 +33,14 @@ //============================================================================= namespace juce { - #include "gui/juce_AudioDeviceSelectorComponent.h" - #include "gui/juce_AudioThumbnailBase.h" - #include "gui/juce_AudioThumbnail.h" - #include "gui/juce_AudioThumbnailCache.h" - #include "gui/juce_MidiKeyboardComponent.h" - #include "players/juce_AudioProcessorPlayer.h" + +#include "gui/juce_AudioDeviceSelectorComponent.h" +#include "gui/juce_AudioThumbnailBase.h" +#include "gui/juce_AudioThumbnail.h" +#include "gui/juce_AudioThumbnailCache.h" +#include "gui/juce_MidiKeyboardComponent.h" +#include "players/juce_AudioProcessorPlayer.h" + } #endif // JUCE_AUDIO_UTILS_H_INCLUDED diff --git a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h index fc11faaac2..df0600a828 100644 --- a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h +++ b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h @@ -25,8 +25,6 @@ #ifndef JUCE_AUDIOPROCESSORPLAYER_H_INCLUDED #define JUCE_AUDIOPROCESSORPLAYER_H_INCLUDED -#include "../../juce_audio_processors/processors/juce_AudioProcessor.h" - //============================================================================== /** diff --git a/modules/juce_core/containers/juce_AbstractFifo.h b/modules/juce_core/containers/juce_AbstractFifo.h index f656a107dc..02feac74e8 100644 --- a/modules/juce_core/containers/juce_AbstractFifo.h +++ b/modules/juce_core/containers/juce_AbstractFifo.h @@ -29,8 +29,6 @@ #ifndef JUCE_ABSTRACTFIFO_H_INCLUDED #define JUCE_ABSTRACTFIFO_H_INCLUDED -#include "../memory/juce_Atomic.h" - //============================================================================== /** diff --git a/modules/juce_core/containers/juce_SparseSet.h b/modules/juce_core/containers/juce_SparseSet.h index 5064ae0cc9..b0019523ef 100644 --- a/modules/juce_core/containers/juce_SparseSet.h +++ b/modules/juce_core/containers/juce_SparseSet.h @@ -29,9 +29,6 @@ #ifndef JUCE_SPARSESET_H_INCLUDED #define JUCE_SPARSESET_H_INCLUDED -#include "../maths/juce_Range.h" -#include "../threads/juce_CriticalSection.h" - //============================================================================== /** diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h index 3f25a431e5..582700dacb 100644 --- a/modules/juce_core/juce_core.h +++ b/modules/juce_core/juce_core.h @@ -125,6 +125,10 @@ //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1 #endif +#ifndef JUCE_STRING_UTF_TYPE + #define JUCE_STRING_UTF_TYPE 8 +#endif + //============================================================================= //============================================================================= #if JUCE_MSVC @@ -144,25 +148,50 @@ namespace juce class MemoryBlock; class File; class InputStream; +class OutputStream; class DynamicObject; class FileInputStream; class FileOutputStream; class XmlElement; class JSONFormatter; -#include "memory/juce_Atomic.h" +extern JUCE_API bool JUCE_CALLTYPE juce_isRunningUnderDebugger(); +extern JUCE_API void JUCE_CALLTYPE logAssertion (const char* file, int line) noexcept; + +#include "memory/juce_Memory.h" +#include "maths/juce_MathsFunctions.h" #include "memory/juce_ByteOrder.h" +#include "memory/juce_Atomic.h" +#include "text/juce_CharacterFunctions.h" + +#if JUCE_MSVC + #pragma warning (push) + #pragma warning (disable: 4514 4996) +#endif + +#include "text/juce_CharPointer_UTF8.h" +#include "text/juce_CharPointer_UTF16.h" +#include "text/juce_CharPointer_UTF32.h" +#include "text/juce_CharPointer_ASCII.h" + +#if JUCE_MSVC + #pragma warning (pop) +#endif + +#include "text/juce_String.h" +#include "logging/juce_Logger.h" +#include "memory/juce_LeakedObjectDetector.h" #include "memory/juce_ContainerDeletePolicy.h" #include "memory/juce_HeapBlock.h" -#include "memory/juce_LeakedObjectDetector.h" -#include "memory/juce_Memory.h" #include "memory/juce_MemoryBlock.h" #include "memory/juce_ReferenceCountedObject.h" #include "memory/juce_ScopedPointer.h" #include "memory/juce_OptionalScopedPointer.h" #include "memory/juce_Singleton.h" #include "memory/juce_WeakReference.h" +#include "threads/juce_ScopedLock.h" #include "threads/juce_CriticalSection.h" +#include "maths/juce_Range.h" #include "containers/juce_ElementComparator.h" #include "containers/juce_ArrayAllocationBase.h" #include "containers/juce_Array.h" @@ -202,26 +231,20 @@ class JSONFormatter; #include "files/juce_MemoryMappedFile.h" #include "files/juce_TemporaryFile.h" #include "streams/juce_FileInputSource.h" -#include "logging/juce_Logger.h" #include "logging/juce_FileLogger.h" #include "json/juce_JSON.h" #include "maths/juce_BigInteger.h" #include "maths/juce_Expression.h" -#include "maths/juce_MathsFunctions.h" #include "maths/juce_Random.h" -#include "maths/juce_Range.h" #include "misc/juce_Uuid.h" #include "misc/juce_WindowsRegistry.h" #include "system/juce_PlatformDefs.h" -#include "system/juce_StandardHeader.h" #include "system/juce_SystemStats.h" -#include "system/juce_TargetPlatform.h" #include "threads/juce_ChildProcess.h" #include "threads/juce_DynamicLibrary.h" #include "threads/juce_HighResolutionTimer.h" #include "threads/juce_InterProcessLock.h" #include "threads/juce_Process.h" -#include "threads/juce_ScopedLock.h" #include "threads/juce_SpinLock.h" #include "threads/juce_WaitableEvent.h" #include "threads/juce_Thread.h" diff --git a/modules/juce_core/memory/juce_ReferenceCountedObject.h b/modules/juce_core/memory/juce_ReferenceCountedObject.h index 751a45fee6..7cad884143 100644 --- a/modules/juce_core/memory/juce_ReferenceCountedObject.h +++ b/modules/juce_core/memory/juce_ReferenceCountedObject.h @@ -29,8 +29,6 @@ #ifndef JUCE_REFERENCECOUNTEDOBJECT_H_INCLUDED #define JUCE_REFERENCECOUNTEDOBJECT_H_INCLUDED -#include "juce_Atomic.h" - //============================================================================== /** diff --git a/modules/juce_core/system/juce_StandardHeader.h b/modules/juce_core/system/juce_StandardHeader.h index fe8642ed5b..103947fe3c 100644 --- a/modules/juce_core/system/juce_StandardHeader.h +++ b/modules/juce_core/system/juce_StandardHeader.h @@ -50,7 +50,6 @@ //============================================================================== -#include "juce_TargetPlatform.h" // (sets up the various JUCE_WINDOWS, JUCE_MAC, etc flags) #include "juce_PlatformDefs.h" //============================================================================== @@ -154,19 +153,4 @@ #define JUCE_NAMESPACE juce // This old macro is deprecated: you should just use the juce namespace directly. #endif -//============================================================================== -// Now include some common headers... -namespace juce -{ - extern JUCE_API bool JUCE_CALLTYPE juce_isRunningUnderDebugger(); - extern JUCE_API void JUCE_CALLTYPE logAssertion (const char* file, int line) noexcept; - - #include "../memory/juce_Memory.h" - #include "../maths/juce_MathsFunctions.h" - #include "../memory/juce_ByteOrder.h" - #include "../text/juce_String.h" - #include "../logging/juce_Logger.h" - #include "../memory/juce_LeakedObjectDetector.h" -} - #endif // JUCE_STANDARDHEADER_H_INCLUDED diff --git a/modules/juce_core/text/juce_String.h b/modules/juce_core/text/juce_String.h index e1012a5c80..79018a46cf 100644 --- a/modules/juce_core/text/juce_String.h +++ b/modules/juce_core/text/juce_String.h @@ -29,28 +29,6 @@ #ifndef JUCE_STRING_H_INCLUDED #define JUCE_STRING_H_INCLUDED -#include "juce_CharacterFunctions.h" - -#ifndef JUCE_STRING_UTF_TYPE - #define JUCE_STRING_UTF_TYPE 8 -#endif - -#if JUCE_MSVC - #pragma warning (push) - #pragma warning (disable: 4514 4996) -#endif - -#include "../memory/juce_Atomic.h" -#include "juce_CharPointer_UTF8.h" -#include "juce_CharPointer_UTF16.h" -#include "juce_CharPointer_UTF32.h" -#include "juce_CharPointer_ASCII.h" - -#if JUCE_MSVC - #pragma warning (pop) -#endif - -class OutputStream; //============================================================================== /** diff --git a/modules/juce_core/threads/juce_CriticalSection.h b/modules/juce_core/threads/juce_CriticalSection.h index 8677f4e71b..4228b2c9cf 100644 --- a/modules/juce_core/threads/juce_CriticalSection.h +++ b/modules/juce_core/threads/juce_CriticalSection.h @@ -29,8 +29,6 @@ #ifndef JUCE_CRITICALSECTION_H_INCLUDED #define JUCE_CRITICALSECTION_H_INCLUDED -#include "juce_ScopedLock.h" - //============================================================================== /** diff --git a/modules/juce_cryptography/juce_cryptography.h b/modules/juce_cryptography/juce_cryptography.h index 9eaa7fcdf1..5ab40809ff 100644 --- a/modules/juce_cryptography/juce_cryptography.h +++ b/modules/juce_cryptography/juce_cryptography.h @@ -31,13 +31,11 @@ namespace juce { -// START_AUTOINCLUDE encryption, hashing #include "encryption/juce_BlowFish.h" #include "encryption/juce_Primes.h" #include "encryption/juce_RSAKey.h" #include "hashing/juce_MD5.h" #include "hashing/juce_SHA256.h" -// END_AUTOINCLUDE } diff --git a/modules/juce_video/juce_video.h b/modules/juce_video/juce_video.h index 754d89d5d9..ae40b03616 100644 --- a/modules/juce_video/juce_video.h +++ b/modules/juce_video/juce_video.h @@ -73,11 +73,9 @@ namespace juce { -// START_AUTOINCLUDE playback, capture #include "playback/juce_DirectShowComponent.h" #include "playback/juce_QuickTimeMovieComponent.h" #include "capture/juce_CameraDevice.h" -// END_AUTOINCLUDE }