Updated the format of the header include guard macros.

modules/juce_audio_basics/buffers/juce_AudioDataConverters.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
-#define __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
+#ifndef JUCE_AUDIODATACONVERTERS_H_INCLUDED
+#define JUCE_AUDIODATACONVERTERS_H_INCLUDED
 
 
 //==============================================================================
@@ -688,4 +688,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
+#endif   // JUCE_AUDIODATACONVERTERS_H_INCLUDED

modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOSAMPLEBUFFER_JUCEHEADER__
-#define __JUCE_AUDIOSAMPLEBUFFER_JUCEHEADER__
+#ifndef JUCE_AUDIOSAMPLEBUFFER_H_INCLUDED
+#define JUCE_AUDIOSAMPLEBUFFER_H_INCLUDED
 
 
 //==============================================================================
@@ -443,4 +443,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOSAMPLEBUFFER_JUCEHEADER__
+#endif   // JUCE_AUDIOSAMPLEBUFFER_H_INCLUDED

modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FLOATVECTOROPERATIONS_JUCEHEADER__
-#define __JUCE_FLOATVECTOROPERATIONS_JUCEHEADER__
+#ifndef JUCE_FLOATVECTOROPERATIONS_H_INCLUDED
+#define JUCE_FLOATVECTOROPERATIONS_H_INCLUDED
 
 
 //==============================================================================
@@ -76,4 +76,4 @@ public:
 };
 
 
-#endif   // __JUCE_FLOATVECTOROPERATIONS_JUCEHEADER__
+#endif   // JUCE_FLOATVECTOROPERATIONS_H_INCLUDED

modules/juce_audio_basics/effects/juce_Decibels.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DECIBELS_JUCEHEADER__
-#define __JUCE_DECIBELS_JUCEHEADER__
+#ifndef JUCE_DECIBELS_H_INCLUDED
+#define JUCE_DECIBELS_H_INCLUDED
 
 //==============================================================================
 /**
@@ -100,4 +100,4 @@ private:
 };
 
 
-#endif   // __JUCE_DECIBELS_JUCEHEADER__
+#endif   // JUCE_DECIBELS_H_INCLUDED

modules/juce_audio_basics/effects/juce_IIRFilter.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IIRFILTER_JUCEHEADER__
-#define __JUCE_IIRFILTER_JUCEHEADER__
+#ifndef JUCE_IIRFILTER_H_INCLUDED
+#define JUCE_IIRFILTER_H_INCLUDED
 
 class IIRFilter;
 
@@ -169,4 +169,4 @@ protected:
 };
 
 
-#endif   // __JUCE_IIRFILTER_JUCEHEADER__
+#endif   // JUCE_IIRFILTER_H_INCLUDED

modules/juce_audio_basics/effects/juce_LagrangeInterpolator.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LAGRANGEINTERPOLATOR_JUCEHEADER__
-#define __JUCE_LAGRANGEINTERPOLATOR_JUCEHEADER__
+#ifndef JUCE_LAGRANGEINTERPOLATOR_H_INCLUDED
+#define JUCE_LAGRANGEINTERPOLATOR_H_INCLUDED
 
 //==============================================================================
 /**
@@ -90,4 +90,4 @@ private:
 };
 
 
-#endif   // __JUCE_LAGRANGEINTERPOLATOR_JUCEHEADER__
+#endif   // JUCE_LAGRANGEINTERPOLATOR_H_INCLUDED

modules/juce_audio_basics/effects/juce_Reverb.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_REVERB_JUCEHEADER__
-#define __JUCE_REVERB_JUCEHEADER__
+#ifndef JUCE_REVERB_H_INCLUDED
+#define JUCE_REVERB_H_INCLUDED
 
 
 //==============================================================================
@@ -320,4 +320,4 @@ private:
 };
 
 
-#endif   // __JUCE_REVERB_JUCEHEADER__
+#endif   // JUCE_REVERB_H_INCLUDED

modules/juce_audio_basics/juce_audio_basics.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_BASICS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_AUDIO_BASICS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_audio_basics/juce_audio_basics.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_BASICS_JUCEHEADER__
-#define __JUCE_AUDIO_BASICS_JUCEHEADER__
+#ifndef JUCE_AUDIO_BASICS_H_INCLUDED
+#define JUCE_AUDIO_BASICS_H_INCLUDED
 
 #include "../juce_core/juce_core.h"
 
@@ -32,74 +32,30 @@ namespace juce
 {
 
 // START_AUTOINCLUDE buffers, effects, midi, sources, synthesisers
-#ifndef __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
- #include "buffers/juce_AudioDataConverters.h"
-#endif
-#ifndef __JUCE_AUDIOSAMPLEBUFFER_JUCEHEADER__
- #include "buffers/juce_AudioSampleBuffer.h"
-#endif
-#ifndef __JUCE_FLOATVECTOROPERATIONS_JUCEHEADER__
- #include "buffers/juce_FloatVectorOperations.h"
-#endif
-#ifndef __JUCE_DECIBELS_JUCEHEADER__
- #include "effects/juce_Decibels.h"
-#endif
-#ifndef __JUCE_IIRFILTER_JUCEHEADER__
- #include "effects/juce_IIRFilter.h"
-#endif
-#ifndef __JUCE_LAGRANGEINTERPOLATOR_JUCEHEADER__
- #include "effects/juce_LagrangeInterpolator.h"
-#endif
-#ifndef __JUCE_REVERB_JUCEHEADER__
- #include "effects/juce_Reverb.h"
-#endif
-#ifndef __JUCE_MIDIBUFFER_JUCEHEADER__
- #include "midi/juce_MidiBuffer.h"
-#endif
-#ifndef __JUCE_MIDIFILE_JUCEHEADER__
- #include "midi/juce_MidiFile.h"
-#endif
-#ifndef __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
- #include "midi/juce_MidiKeyboardState.h"
-#endif
-#ifndef __JUCE_MIDIMESSAGE_JUCEHEADER__
- #include "midi/juce_MidiMessage.h"
-#endif
-#ifndef __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
- #include "midi/juce_MidiMessageSequence.h"
-#endif
-#ifndef __JUCE_AUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_AudioSource.h"
-#endif
-#ifndef __JUCE_BUFFERINGAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_BufferingAudioSource.h"
-#endif
-#ifndef __JUCE_CHANNELREMAPPINGAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_ChannelRemappingAudioSource.h"
-#endif
-#ifndef __JUCE_IIRFILTERAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_IIRFilterAudioSource.h"
-#endif
-#ifndef __JUCE_MIXERAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_MixerAudioSource.h"
-#endif
-#ifndef __JUCE_POSITIONABLEAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_PositionableAudioSource.h"
-#endif
-#ifndef __JUCE_RESAMPLINGAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_ResamplingAudioSource.h"
-#endif
-#ifndef __JUCE_REVERBAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_ReverbAudioSource.h"
-#endif
-#ifndef __JUCE_TONEGENERATORAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_ToneGeneratorAudioSource.h"
-#endif
-#ifndef __JUCE_SYNTHESISER_JUCEHEADER__
- #include "synthesisers/juce_Synthesiser.h"
-#endif
+#include "buffers/juce_AudioDataConverters.h"
+#include "buffers/juce_AudioSampleBuffer.h"
+#include "buffers/juce_FloatVectorOperations.h"
+#include "effects/juce_Decibels.h"
+#include "effects/juce_IIRFilter.h"
+#include "effects/juce_LagrangeInterpolator.h"
+#include "effects/juce_Reverb.h"
+#include "midi/juce_MidiBuffer.h"
+#include "midi/juce_MidiFile.h"
+#include "midi/juce_MidiKeyboardState.h"
+#include "midi/juce_MidiMessage.h"
+#include "midi/juce_MidiMessageSequence.h"
+#include "sources/juce_AudioSource.h"
+#include "sources/juce_BufferingAudioSource.h"
+#include "sources/juce_ChannelRemappingAudioSource.h"
+#include "sources/juce_IIRFilterAudioSource.h"
+#include "sources/juce_MixerAudioSource.h"
+#include "sources/juce_PositionableAudioSource.h"
+#include "sources/juce_ResamplingAudioSource.h"
+#include "sources/juce_ReverbAudioSource.h"
+#include "sources/juce_ToneGeneratorAudioSource.h"
+#include "synthesisers/juce_Synthesiser.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_AUDIO_BASICS_JUCEHEADER__
+#endif   // JUCE_AUDIO_BASICS_H_INCLUDED

modules/juce_audio_basics/midi/juce_MidiBuffer.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIBUFFER_JUCEHEADER__
-#define __JUCE_MIDIBUFFER_JUCEHEADER__
+#ifndef JUCE_MIDIBUFFER_H_INCLUDED
+#define JUCE_MIDIBUFFER_H_INCLUDED
 
 #include "juce_MidiMessage.h"
 
@@ -237,4 +237,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIBUFFER_JUCEHEADER__
+#endif   // JUCE_MIDIBUFFER_H_INCLUDED

modules/juce_audio_basics/midi/juce_MidiFile.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIFILE_JUCEHEADER__
-#define __JUCE_MIDIFILE_JUCEHEADER__
+#ifndef JUCE_MIDIFILE_H_INCLUDED
+#define JUCE_MIDIFILE_H_INCLUDED
 
 #include "juce_MidiMessageSequence.h"
 
@@ -183,4 +183,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIFILE_JUCEHEADER__
+#endif   // JUCE_MIDIFILE_H_INCLUDED

modules/juce_audio_basics/midi/juce_MidiKeyboardState.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
-#define __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
+#ifndef JUCE_MIDIKEYBOARDSTATE_H_INCLUDED
+#define JUCE_MIDIKEYBOARDSTATE_H_INCLUDED
 
 #include "juce_MidiBuffer.h"
 class MidiKeyboardState;
@@ -203,4 +203,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
+#endif   // JUCE_MIDIKEYBOARDSTATE_H_INCLUDED

modules/juce_audio_basics/midi/juce_MidiMessage.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIMESSAGE_JUCEHEADER__
-#define __JUCE_MIDIMESSAGE_JUCEHEADER__
+#ifndef JUCE_MIDIMESSAGE_H_INCLUDED
+#define JUCE_MIDIMESSAGE_H_INCLUDED
 
 
 //==============================================================================
@@ -936,4 +936,4 @@ private:
     bool usesAllocatedData() const noexcept;
 };
 
-#endif   // __JUCE_MIDIMESSAGE_JUCEHEADER__
+#endif   // JUCE_MIDIMESSAGE_H_INCLUDED

modules/juce_audio_basics/midi/juce_MidiMessageSequence.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
-#define __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
+#ifndef JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
+#define JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
 
 #include "juce_MidiMessage.h"
 
@@ -277,4 +277,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
+#endif   // JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED

modules/juce_audio_basics/sources/juce_AudioSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOSOURCE_JUCEHEADER__
-#define __JUCE_AUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_AUDIOSOURCE_H_INCLUDED
+#define JUCE_AUDIOSOURCE_H_INCLUDED
 
 #include "../buffers/juce_AudioSampleBuffer.h"
 
@@ -180,4 +180,4 @@ public:
 };
 
 
-#endif   // __JUCE_AUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_AUDIOSOURCE_H_INCLUDED

modules/juce_audio_basics/sources/juce_BufferingAudioSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BUFFERINGAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_BUFFERINGAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_BUFFERINGAUDIOSOURCE_H_INCLUDED
+#define JUCE_BUFFERINGAUDIOSOURCE_H_INCLUDED
 
 #include "juce_PositionableAudioSource.h"
 
@@ -110,4 +110,4 @@ private:
 };
 
 
-#endif   // __JUCE_BUFFERINGAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_BUFFERINGAUDIOSOURCE_H_INCLUDED

modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHANNELREMAPPINGAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_CHANNELREMAPPINGAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_CHANNELREMAPPINGAUDIOSOURCE_H_INCLUDED
+#define JUCE_CHANNELREMAPPINGAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 
@@ -145,4 +145,4 @@ private:
 };
 
 
-#endif   // __JUCE_CHANNELREMAPPINGAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_CHANNELREMAPPINGAUDIOSOURCE_H_INCLUDED

modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IIRFILTERAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_IIRFILTERAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_IIRFILTERAUDIOSOURCE_H_INCLUDED
+#define JUCE_IIRFILTERAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 #include "../effects/juce_IIRFilter.h"
@@ -70,4 +70,4 @@ private:
 };
 
 
-#endif   // __JUCE_IIRFILTERAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_IIRFILTERAUDIOSOURCE_H_INCLUDED

modules/juce_audio_basics/sources/juce_MixerAudioSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIXERAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_MIXERAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_MIXERAUDIOSOURCE_H_INCLUDED
+#define JUCE_MIXERAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 
@@ -100,4 +100,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIXERAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_MIXERAUDIOSOURCE_H_INCLUDED

modules/juce_audio_basics/sources/juce_PositionableAudioSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_POSITIONABLEAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_POSITIONABLEAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_POSITIONABLEAUDIOSOURCE_H_INCLUDED
+#define JUCE_POSITIONABLEAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 
@@ -77,4 +77,4 @@ public:
 };
 
 
-#endif   // __JUCE_POSITIONABLEAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_POSITIONABLEAUDIOSOURCE_H_INCLUDED

modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RESAMPLINGAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_RESAMPLINGAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_RESAMPLINGAUDIOSOURCE_H_INCLUDED
+#define JUCE_RESAMPLINGAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 
@@ -102,4 +102,4 @@ private:
 };
 
 
-#endif   // __JUCE_RESAMPLINGAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_RESAMPLINGAUDIOSOURCE_H_INCLUDED

modules/juce_audio_basics/sources/juce_ReverbAudioSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_REVERBAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_REVERBAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_REVERBAUDIOSOURCE_H_INCLUDED
+#define JUCE_REVERBAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 #include "../effects/juce_Reverb.h"
@@ -76,4 +76,4 @@ private:
 };
 
 
-#endif   // __JUCE_REVERBAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_REVERBAUDIOSOURCE_H_INCLUDED

modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TONEGENERATORAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_TONEGENERATORAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_TONEGENERATORAUDIOSOURCE_H_INCLUDED
+#define JUCE_TONEGENERATORAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 
@@ -72,4 +72,4 @@ private:
 };
 
 
-#endif   // __JUCE_TONEGENERATORAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_TONEGENERATORAUDIOSOURCE_H_INCLUDED

modules/juce_audio_basics/synthesisers/juce_Synthesiser.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SYNTHESISER_JUCEHEADER__
-#define __JUCE_SYNTHESISER_JUCEHEADER__
+#ifndef JUCE_SYNTHESISER_H_INCLUDED
+#define JUCE_SYNTHESISER_H_INCLUDED
 
 #include "../buffers/juce_AudioSampleBuffer.h"
 #include "../midi/juce_MidiBuffer.h"
@@ -490,4 +490,4 @@ private:
 };
 
 
-#endif   // __JUCE_SYNTHESISER_JUCEHEADER__
+#endif   // JUCE_SYNTHESISER_H_INCLUDED

modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOCDBURNER_JUCEHEADER__
-#define __JUCE_AUDIOCDBURNER_JUCEHEADER__
+#ifndef JUCE_AUDIOCDBURNER_H_INCLUDED
+#define JUCE_AUDIOCDBURNER_H_INCLUDED
 
 #if JUCE_USE_CDBURNER || DOXYGEN
 
@@ -166,4 +166,4 @@ private:
 
 
 #endif
-#endif   // __JUCE_AUDIOCDBURNER_JUCEHEADER__
+#endif   // JUCE_AUDIOCDBURNER_H_INCLUDED

modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOCDREADER_JUCEHEADER__
-#define __JUCE_AUDIOCDREADER_JUCEHEADER__
+#ifndef JUCE_AUDIOCDREADER_H_INCLUDED
+#define JUCE_AUDIOCDREADER_H_INCLUDED
 
 #if JUCE_USE_CDREADER || DOXYGEN
 
@@ -171,4 +171,4 @@ private:
 };
 
 #endif
-#endif   // __JUCE_AUDIOCDREADER_JUCEHEADER__
+#endif   // JUCE_AUDIOCDREADER_H_INCLUDED

modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__
-#define __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__
+#ifndef JUCE_AUDIODEVICEMANAGER_H_INCLUDED
+#define JUCE_AUDIODEVICEMANAGER_H_INCLUDED
 
 #include "juce_AudioIODeviceType.h"
 #include "../midi_io/juce_MidiInput.h"
@@ -511,4 +511,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioDeviceManager)
 };
 
-#endif   // __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__
+#endif   // JUCE_AUDIODEVICEMANAGER_H_INCLUDED

modules/juce_audio_devices/audio_io/juce_AudioIODevice.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOIODEVICE_JUCEHEADER__
-#define __JUCE_AUDIOIODEVICE_JUCEHEADER__
+#ifndef JUCE_AUDIOIODEVICE_H_INCLUDED
+#define JUCE_AUDIOIODEVICE_H_INCLUDED
 
 class AudioIODevice;
 
@@ -329,4 +329,4 @@ protected:
 };
 
 
-#endif   // __JUCE_AUDIOIODEVICE_JUCEHEADER__
+#endif   // JUCE_AUDIOIODEVICE_H_INCLUDED

modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
-#define __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
+#ifndef JUCE_AUDIOIODEVICETYPE_H_INCLUDED
+#define JUCE_AUDIOIODEVICETYPE_H_INCLUDED
 
 #include "juce_AudioIODevice.h"
 class AudioDeviceManager;
@@ -182,4 +182,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
+#endif   // JUCE_AUDIOIODEVICETYPE_H_INCLUDED

modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SYSTEMAUDIOVOLUME_JUCEHEADER__
-#define __JUCE_SYSTEMAUDIOVOLUME_JUCEHEADER__
+#ifndef JUCE_SYSTEMAUDIOVOLUME_H_INCLUDED
+#define JUCE_SYSTEMAUDIOVOLUME_H_INCLUDED
 
 //==============================================================================
 /**
@@ -57,4 +57,4 @@ private:
 };
 
 
-#endif   // __JUCE_SYSTEMAUDIOVOLUME_JUCEHEADER__
+#endif   // JUCE_SYSTEMAUDIOVOLUME_H_INCLUDED

modules/juce_audio_devices/juce_audio_devices.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_DEVICES_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_AUDIO_DEVICES_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_audio_devices/juce_audio_devices.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_DEVICES_JUCEHEADER__
-#define __JUCE_AUDIO_DEVICES_JUCEHEADER__
+#ifndef JUCE_AUDIO_DEVICES_H_INCLUDED
+#define JUCE_AUDIO_DEVICES_H_INCLUDED
 
 #include "../juce_events/juce_events.h"
 #include "../juce_audio_basics/juce_audio_basics.h"
@@ -101,41 +101,19 @@ namespace juce
 {
 
 // START_AUTOINCLUDE audio_io, midi_io, sources, audio_cd
-#ifndef __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__
- #include "audio_io/juce_AudioDeviceManager.h"
-#endif
-#ifndef __JUCE_AUDIOIODEVICE_JUCEHEADER__
- #include "audio_io/juce_AudioIODevice.h"
-#endif
-#ifndef __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
- #include "audio_io/juce_AudioIODeviceType.h"
-#endif
-#ifndef __JUCE_SYSTEMAUDIOVOLUME_JUCEHEADER__
- #include "audio_io/juce_SystemAudioVolume.h"
-#endif
-#ifndef __JUCE_MIDIINPUT_JUCEHEADER__
- #include "midi_io/juce_MidiInput.h"
-#endif
-#ifndef __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
- #include "midi_io/juce_MidiMessageCollector.h"
-#endif
-#ifndef __JUCE_MIDIOUTPUT_JUCEHEADER__
- #include "midi_io/juce_MidiOutput.h"
-#endif
-#ifndef __JUCE_AUDIOSOURCEPLAYER_JUCEHEADER__
- #include "sources/juce_AudioSourcePlayer.h"
-#endif
-#ifndef __JUCE_AUDIOTRANSPORTSOURCE_JUCEHEADER__
- #include "sources/juce_AudioTransportSource.h"
-#endif
-#ifndef __JUCE_AUDIOCDBURNER_JUCEHEADER__
- #include "audio_cd/juce_AudioCDBurner.h"
-#endif
-#ifndef __JUCE_AUDIOCDREADER_JUCEHEADER__
- #include "audio_cd/juce_AudioCDReader.h"
-#endif
+#include "audio_io/juce_AudioDeviceManager.h"
+#include "audio_io/juce_AudioIODevice.h"
+#include "audio_io/juce_AudioIODeviceType.h"
+#include "audio_io/juce_SystemAudioVolume.h"
+#include "midi_io/juce_MidiInput.h"
+#include "midi_io/juce_MidiMessageCollector.h"
+#include "midi_io/juce_MidiOutput.h"
+#include "sources/juce_AudioSourcePlayer.h"
+#include "sources/juce_AudioTransportSource.h"
+#include "audio_cd/juce_AudioCDBurner.h"
+#include "audio_cd/juce_AudioCDReader.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_AUDIO_DEVICES_JUCEHEADER__
+#endif   // JUCE_AUDIO_DEVICES_H_INCLUDED

modules/juce_audio_devices/midi_io/juce_MidiInput.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIINPUT_JUCEHEADER__
-#define __JUCE_MIDIINPUT_JUCEHEADER__
+#ifndef JUCE_MIDIINPUT_H_INCLUDED
+#define JUCE_MIDIINPUT_H_INCLUDED
 
 class MidiInput;
 
@@ -179,4 +179,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIINPUT_JUCEHEADER__
+#endif   // JUCE_MIDIINPUT_H_INCLUDED

modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
-#define __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
+#ifndef JUCE_MIDIMESSAGECOLLECTOR_H_INCLUDED
+#define JUCE_MIDIMESSAGECOLLECTOR_H_INCLUDED
 
 #include "juce_MidiInput.h"
 
@@ -103,4 +103,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
+#endif   // JUCE_MIDIMESSAGECOLLECTOR_H_INCLUDED

modules/juce_audio_devices/midi_io/juce_MidiOutput.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIOUTPUT_JUCEHEADER__
-#define __JUCE_MIDIOUTPUT_JUCEHEADER__
+#ifndef JUCE_MIDIOUTPUT_H_INCLUDED
+#define JUCE_MIDIOUTPUT_H_INCLUDED
 
 
 //==============================================================================
@@ -144,4 +144,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIOUTPUT_JUCEHEADER__
+#endif   // JUCE_MIDIOUTPUT_H_INCLUDED

modules/juce_audio_devices/native/juce_MidiDataConcatenator.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIDATACONCATENATOR_JUCEHEADER__
-#define __JUCE_MIDIDATACONCATENATOR_JUCEHEADER__
+#ifndef JUCE_MIDIDATACONCATENATOR_H_INCLUDED
+#define JUCE_MIDIDATACONCATENATOR_H_INCLUDED
 
 //==============================================================================
 /**
@@ -172,4 +172,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE (MidiDataConcatenator)
 };
 
-#endif   // __JUCE_MIDIDATACONCATENATOR_JUCEHEADER__
+#endif   // JUCE_MIDIDATACONCATENATOR_H_INCLUDED

modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOSOURCEPLAYER_JUCEHEADER__
-#define __JUCE_AUDIOSOURCEPLAYER_JUCEHEADER__
+#ifndef JUCE_AUDIOSOURCEPLAYER_H_INCLUDED
+#define JUCE_AUDIOSOURCEPLAYER_H_INCLUDED
 
 
 //==============================================================================
@@ -113,4 +113,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOSOURCEPLAYER_JUCEHEADER__
+#endif   // JUCE_AUDIOSOURCEPLAYER_H_INCLUDED

modules/juce_audio_devices/sources/juce_AudioTransportSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOTRANSPORTSOURCE_JUCEHEADER__
-#define __JUCE_AUDIOTRANSPORTSOURCE_JUCEHEADER__
+#ifndef JUCE_AUDIOTRANSPORTSOURCE_H_INCLUDED
+#define JUCE_AUDIOTRANSPORTSOURCE_H_INCLUDED
 
 
 //==============================================================================
@@ -183,4 +183,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOTRANSPORTSOURCE_JUCEHEADER__
+#endif   // JUCE_AUDIOTRANSPORTSOURCE_H_INCLUDED

modules/juce_audio_formats/format/juce_AudioFormat.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOFORMAT_JUCEHEADER__
-#define __JUCE_AUDIOFORMAT_JUCEHEADER__
+#ifndef JUCE_AUDIOFORMAT_H_INCLUDED
+#define JUCE_AUDIOFORMAT_H_INCLUDED
 
 #include "juce_AudioFormatReader.h"
 #include "juce_AudioFormatWriter.h"
@@ -175,4 +175,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOFORMAT_JUCEHEADER__
+#endif   // JUCE_AUDIOFORMAT_H_INCLUDED

modules/juce_audio_formats/format/juce_AudioFormatManager.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOFORMATMANAGER_JUCEHEADER__
-#define __JUCE_AUDIOFORMATMANAGER_JUCEHEADER__
+#ifndef JUCE_AUDIOFORMATMANAGER_H_INCLUDED
+#define JUCE_AUDIOFORMATMANAGER_H_INCLUDED
 
 #include "juce_AudioFormat.h"
 
@@ -142,4 +142,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOFORMATMANAGER_JUCEHEADER__
+#endif   // JUCE_AUDIOFORMATMANAGER_H_INCLUDED

modules/juce_audio_formats/format/juce_AudioFormatReader.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOFORMATREADER_JUCEHEADER__
-#define __JUCE_AUDIOFORMATREADER_JUCEHEADER__
+#ifndef JUCE_AUDIOFORMATREADER_H_INCLUDED
+#define JUCE_AUDIOFORMATREADER_H_INCLUDED
 
 class AudioFormat;
 
@@ -283,4 +283,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOFORMATREADER_JUCEHEADER__
+#endif   // JUCE_AUDIOFORMATREADER_H_INCLUDED

modules/juce_audio_formats/format/juce_AudioFormatReaderSource.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOFORMATREADERSOURCE_JUCEHEADER__
-#define __JUCE_AUDIOFORMATREADERSOURCE_JUCEHEADER__
+#ifndef JUCE_AUDIOFORMATREADERSOURCE_H_INCLUDED
+#define JUCE_AUDIOFORMATREADERSOURCE_H_INCLUDED
 
 
 //==============================================================================
@@ -97,4 +97,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOFORMATREADERSOURCE_JUCEHEADER__
+#endif   // JUCE_AUDIOFORMATREADERSOURCE_H_INCLUDED

modules/juce_audio_formats/format/juce_AudioFormatWriter.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOFORMATWRITER_JUCEHEADER__
-#define __JUCE_AUDIOFORMATWRITER_JUCEHEADER__
+#ifndef JUCE_AUDIOFORMATWRITER_H_INCLUDED
+#define JUCE_AUDIOFORMATWRITER_H_INCLUDED
 
 #include "juce_AudioFormatReader.h"
 
@@ -258,4 +258,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioFormatWriter)
 };
 
-#endif   // __JUCE_AUDIOFORMATWRITER_JUCEHEADER__
+#endif   // JUCE_AUDIOFORMATWRITER_H_INCLUDED

modules/juce_audio_formats/format/juce_AudioSubsectionReader.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOSUBSECTIONREADER_JUCEHEADER__
-#define __JUCE_AUDIOSUBSECTIONREADER_JUCEHEADER__
+#ifndef JUCE_AUDIOSUBSECTIONREADER_H_INCLUDED
+#define JUCE_AUDIOSUBSECTIONREADER_H_INCLUDED
 
 #include "juce_AudioFormatReader.h"
 
@@ -86,4 +86,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioSubsectionReader)
 };
 
-#endif   // __JUCE_AUDIOSUBSECTIONREADER_JUCEHEADER__
+#endif   // JUCE_AUDIOSUBSECTIONREADER_H_INCLUDED

modules/juce_audio_formats/format/juce_BufferingAudioFormatReader.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BUFFERINGAUDIOFORMATREADER_JUCEHEADER__
-#define __JUCE_BUFFERINGAUDIOFORMATREADER_JUCEHEADER__
+#ifndef JUCE_BUFFERINGAUDIOFORMATREADER_H_INCLUDED
+#define JUCE_BUFFERINGAUDIOFORMATREADER_H_INCLUDED
 
 //==============================================================================
 /**
@@ -90,4 +90,4 @@ private:
 };
 
 
-#endif   // __JUCE_BUFFERINGAUDIOFORMATREADER_JUCEHEADER__
+#endif   // JUCE_BUFFERINGAUDIOFORMATREADER_H_INCLUDED

modules/juce_audio_formats/format/juce_MemoryMappedAudioFormatReader.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MEMORYMAPPEDAUDIOFORMATREADER_JUCEHEADER__
-#define __JUCE_MEMORYMAPPEDAUDIOFORMATREADER_JUCEHEADER__
+#ifndef JUCE_MEMORYMAPPEDAUDIOFORMATREADER_H_INCLUDED
+#define JUCE_MEMORYMAPPEDAUDIOFORMATREADER_H_INCLUDED
 
 //==============================================================================
 /**
@@ -102,4 +102,4 @@ protected:
 };
 
 
-#endif   // __JUCE_MEMORYMAPPEDAUDIOFORMATREADER_JUCEHEADER__
+#endif   // JUCE_MEMORYMAPPEDAUDIOFORMATREADER_H_INCLUDED

modules/juce_audio_formats/juce_audio_formats.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_FORMATS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_AUDIO_FORMATS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_audio_formats/juce_audio_formats.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_FORMATS_JUCEHEADER__
-#define __JUCE_AUDIO_FORMATS_JUCEHEADER__
+#ifndef JUCE_AUDIO_FORMATS_H_INCLUDED
+#define JUCE_AUDIO_FORMATS_H_INCLUDED
 
 #include "../juce_audio_basics/juce_audio_basics.h"
 
@@ -86,30 +86,14 @@ namespace juce
 {
 
 // START_AUTOINCLUDE format, codecs, sampler
-#ifndef __JUCE_AUDIOFORMAT_JUCEHEADER__
- #include "format/juce_AudioFormat.h"
-#endif
-#ifndef __JUCE_AUDIOFORMATMANAGER_JUCEHEADER__
- #include "format/juce_AudioFormatManager.h"
-#endif
-#ifndef __JUCE_AUDIOFORMATREADER_JUCEHEADER__
- #include "format/juce_AudioFormatReader.h"
-#endif
-#ifndef __JUCE_AUDIOFORMATREADERSOURCE_JUCEHEADER__
- #include "format/juce_AudioFormatReaderSource.h"
-#endif
-#ifndef __JUCE_AUDIOFORMATWRITER_JUCEHEADER__
- #include "format/juce_AudioFormatWriter.h"
-#endif
-#ifndef __JUCE_AUDIOSUBSECTIONREADER_JUCEHEADER__
- #include "format/juce_AudioSubsectionReader.h"
-#endif
-#ifndef __JUCE_BUFFERINGAUDIOFORMATREADER_JUCEHEADER__
- #include "format/juce_BufferingAudioFormatReader.h"
-#endif
-#ifndef __JUCE_MEMORYMAPPEDAUDIOFORMATREADER_JUCEHEADER__
- #include "format/juce_MemoryMappedAudioFormatReader.h"
-#endif
+#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"
@@ -119,11 +103,9 @@ namespace juce
 #include "codecs/juce_QuickTimeAudioFormat.h"
 #include "codecs/juce_WavAudioFormat.h"
 #include "codecs/juce_WindowsMediaAudioFormat.h"
-#ifndef __JUCE_SAMPLER_JUCEHEADER__
- #include "sampler/juce_Sampler.h"
-#endif
+#include "sampler/juce_Sampler.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_AUDIO_FORMATS_JUCEHEADER__
+#endif   // JUCE_AUDIO_FORMATS_H_INCLUDED

modules/juce_audio_formats/sampler/juce_Sampler.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SAMPLER_JUCEHEADER__
-#define __JUCE_SAMPLER_JUCEHEADER__
+#ifndef JUCE_SAMPLER_H_INCLUDED
+#define JUCE_SAMPLER_H_INCLUDED
 
 
 //==============================================================================
@@ -150,4 +150,4 @@ private:
 };
 
 
-#endif   // __JUCE_SAMPLER_JUCEHEADER__
+#endif   // JUCE_SAMPLER_H_INCLUDED

modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RTAS_DIGICODE_HEADER_JUCEHEADER__
-#define __JUCE_RTAS_DIGICODE_HEADER_JUCEHEADER__
+#ifndef JUCE_RTAS_DIGICODE_HEADER_H_INCLUDED
+#define JUCE_RTAS_DIGICODE_HEADER_H_INCLUDED
 
 #if JucePlugin_Build_RTAS
 
@@ -70,4 +70,4 @@
 #endif
 #endif
 
-#endif   // __JUCE_RTAS_DIGICODE_HEADER_JUCEHEADER__
+#endif   // JUCE_RTAS_DIGICODE_HEADER_H_INCLUDED

modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_STANDALONEFILTERWINDOW_JUCEHEADER__
-#define __JUCE_STANDALONEFILTERWINDOW_JUCEHEADER__
+#ifndef JUCE_STANDALONEFILTERWINDOW_H_INCLUDED
+#define JUCE_STANDALONEFILTERWINDOW_H_INCLUDED
 
 extern AudioProcessor* JUCE_CALLTYPE createPluginFilter();
 
@@ -301,4 +301,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (StandaloneFilterWindow)
 };
 
-#endif   // __JUCE_STANDALONEFILTERWINDOW_JUCEHEADER__
+#endif   // JUCE_STANDALONEFILTERWINDOW_H_INCLUDED

modules/juce_audio_plugin_client/juce_audio_plugin_client.h

@@ -22,12 +22,12 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_PLUGIN_CLIENT_JUCEHEADER__
-#define __JUCE_AUDIO_PLUGIN_CLIENT_JUCEHEADER__
+#ifndef JUCE_AUDIO_PLUGIN_CLIENT_H_INCLUDED
+#define JUCE_AUDIO_PLUGIN_CLIENT_H_INCLUDED
 
 #include "../juce_gui_basics/juce_gui_basics.h"
 #include "../juce_audio_basics/juce_audio_basics.h"
 #include "../juce_audio_processors/juce_audio_processors.h"
 #include "utility/juce_CheckSettingMacros.h"
 
-#endif   // __JUCE_AUDIO_PLUGIN_CLIENT_JUCEHEADER__
+#endif   // JUCE_AUDIO_PLUGIN_CLIENT_H_INCLUDED

modules/juce_audio_plugin_client/utility/juce_CarbonVisibility.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CARBONVISIBILITY_JUCEHEADER__
-#define __JUCE_CARBONVISIBILITY_JUCEHEADER__
+#ifndef JUCE_CARBONVISIBILITY_H_INCLUDED
+#define JUCE_CARBONVISIBILITY_H_INCLUDED
 
 //==============================================================================
 #if JUCE_SUPPORT_CARBON && JUCE_MAC_WINDOW_VISIBITY_BODGE
@@ -76,4 +76,4 @@ static void removeWindowHidingHooks (Component* comp)
  static void removeWindowHidingHooks (void*) {}
 #endif
 
-#endif   // __JUCE_CARBONVISIBILITY_JUCEHEADER__
+#endif   // JUCE_CARBONVISIBILITY_H_INCLUDED

modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FAKEMOUSEMOVEGENERATOR_JUCEHEADER__
-#define __JUCE_FAKEMOUSEMOVEGENERATOR_JUCEHEADER__
+#ifndef JUCE_FAKEMOUSEMOVEGENERATOR_H_INCLUDED
+#define JUCE_FAKEMOUSEMOVEGENERATOR_H_INCLUDED
 
 #if JUCE_MAC && JUCE_SUPPORT_CARBON
 
@@ -63,4 +63,4 @@ private:
 struct FakeMouseMoveGenerator {};
 #endif
 
-#endif   // __JUCE_FAKEMOUSEMOVEGENERATOR_JUCEHEADER__
+#endif   // JUCE_FAKEMOUSEMOVEGENERATOR_H_INCLUDED

modules/juce_audio_processors/format/juce_AudioPluginFormat.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPLUGINFORMAT_JUCEHEADER__
-#define __JUCE_AUDIOPLUGINFORMAT_JUCEHEADER__
+#ifndef JUCE_AUDIOPLUGINFORMAT_H_INCLUDED
+#define JUCE_AUDIOPLUGINFORMAT_H_INCLUDED
 
 #include "../processors/juce_AudioPluginInstance.h"
 class PluginDescription;
@@ -110,4 +110,4 @@ protected:
 };
 
 
-#endif   // __JUCE_AUDIOPLUGINFORMAT_JUCEHEADER__
+#endif   // JUCE_AUDIOPLUGINFORMAT_H_INCLUDED

modules/juce_audio_processors/format/juce_AudioPluginFormatManager.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPLUGINFORMATMANAGER_JUCEHEADER__
-#define __JUCE_AUDIOPLUGINFORMATMANAGER_JUCEHEADER__
+#ifndef JUCE_AUDIOPLUGINFORMATMANAGER_H_INCLUDED
+#define JUCE_AUDIOPLUGINFORMATMANAGER_H_INCLUDED
 
 #include "juce_AudioPluginFormat.h"
 
@@ -96,4 +96,4 @@ private:
 
 
 
-#endif   // __JUCE_AUDIOPLUGINFORMATMANAGER_JUCEHEADER__
+#endif   // JUCE_AUDIOPLUGINFORMATMANAGER_H_INCLUDED

modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
-#define __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
+#ifndef JUCE_AUDIOUNITPLUGINFORMAT_H_INCLUDED
+#define JUCE_AUDIOUNITPLUGINFORMAT_H_INCLUDED
 
 #include "../format/juce_AudioPluginFormat.h"
 
@@ -59,4 +59,4 @@ private:
 
 #endif
 
-#endif   // __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
+#endif   // JUCE_AUDIOUNITPLUGINFORMAT_H_INCLUDED

modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LADSPAPLUGINFORMAT_JUCEHEADER__
-#define __JUCE_LADSPAPLUGINFORMAT_JUCEHEADER__
+#ifndef JUCE_LADSPAPLUGINFORMAT_H_INCLUDED
+#define JUCE_LADSPAPLUGINFORMAT_H_INCLUDED
 
 #include "../format/juce_AudioPluginFormat.h"
 
@@ -61,4 +61,4 @@ private:
 
 #endif
 
-#endif   // __JUCE_LADSPAPLUGINFORMAT_JUCEHEADER__
+#endif   // JUCE_LADSPAPLUGINFORMAT_H_INCLUDED

modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h

@@ -24,8 +24,8 @@
 
 #ifdef __aeffect__
 
-#ifndef __JUCE_VSTMIDIEVENTLIST_JUCEHEADER__
-#define __JUCE_VSTMIDIEVENTLIST_JUCEHEADER__
+#ifndef JUCE_VSTMIDIEVENTLIST_H_INCLUDED
+#define JUCE_VSTMIDIEVENTLIST_H_INCLUDED
 
 
 //==============================================================================
@@ -185,5 +185,5 @@ private:
 };
 
 
-#endif   // __JUCE_VSTMIDIEVENTLIST_JUCEHEADER__
-#endif   // __JUCE_VSTMIDIEVENTLIST_JUCEHEADER__
+#endif   // JUCE_VSTMIDIEVENTLIST_H_INCLUDED
+#endif

modules/juce_audio_processors/format_types/juce_VSTPluginFormat.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_VSTPLUGINFORMAT_JUCEHEADER__
-#define __JUCE_VSTPLUGINFORMAT_JUCEHEADER__
+#ifndef JUCE_VSTPLUGINFORMAT_H_INCLUDED
+#define JUCE_VSTPLUGINFORMAT_H_INCLUDED
 
 #include "../format/juce_AudioPluginFormat.h"
 
@@ -99,4 +99,4 @@ private:
 
 
 #endif
-#endif   // __JUCE_VSTPLUGINFORMAT_JUCEHEADER__
+#endif   // JUCE_VSTPLUGINFORMAT_H_INCLUDED

modules/juce_audio_processors/juce_audio_processors.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_PROCESSORS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_AUDIO_PROCESSORS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_audio_processors/juce_audio_processors.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_PROCESSORS_JUCEHEADER__
-#define __JUCE_AUDIO_PROCESSORS_JUCEHEADER__
+#ifndef JUCE_AUDIO_PROCESSORS_H_INCLUDED
+#define JUCE_AUDIO_PROCESSORS_H_INCLUDED
 
 #include "../juce_gui_basics/juce_gui_basics.h"
 #include "../juce_audio_basics/juce_audio_basics.h"
@@ -65,57 +65,25 @@ namespace juce
 {
 
 // START_AUTOINCLUDE processors, format, format_types, scanning
-#ifndef __JUCE_AUDIOPLAYHEAD_JUCEHEADER__
- #include "processors/juce_AudioPlayHead.h"
-#endif
-#ifndef __JUCE_AUDIOPLUGININSTANCE_JUCEHEADER__
- #include "processors/juce_AudioPluginInstance.h"
-#endif
-#ifndef __JUCE_AUDIOPROCESSOR_JUCEHEADER__
- #include "processors/juce_AudioProcessor.h"
-#endif
-#ifndef __JUCE_AUDIOPROCESSOREDITOR_JUCEHEADER__
- #include "processors/juce_AudioProcessorEditor.h"
-#endif
-#ifndef __JUCE_AUDIOPROCESSORGRAPH_JUCEHEADER__
- #include "processors/juce_AudioProcessorGraph.h"
-#endif
-#ifndef __JUCE_AUDIOPROCESSORLISTENER_JUCEHEADER__
- #include "processors/juce_AudioProcessorListener.h"
-#endif
-#ifndef __JUCE_GENERICAUDIOPROCESSOREDITOR_JUCEHEADER__
- #include "processors/juce_GenericAudioProcessorEditor.h"
-#endif
-#ifndef __JUCE_PLUGINDESCRIPTION_JUCEHEADER__
- #include "processors/juce_PluginDescription.h"
-#endif
-#ifndef __JUCE_AUDIOPLUGINFORMAT_JUCEHEADER__
- #include "format/juce_AudioPluginFormat.h"
-#endif
-#ifndef __JUCE_AUDIOPLUGINFORMATMANAGER_JUCEHEADER__
- #include "format/juce_AudioPluginFormatManager.h"
-#endif
-#ifndef __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
- #include "format_types/juce_AudioUnitPluginFormat.h"
-#endif
-#ifndef __JUCE_LADSPAPLUGINFORMAT_JUCEHEADER__
- #include "format_types/juce_LADSPAPluginFormat.h"
-#endif
+#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_PluginDescription.h"
+#include "format/juce_AudioPluginFormat.h"
+#include "format/juce_AudioPluginFormatManager.h"
+#include "format_types/juce_AudioUnitPluginFormat.h"
+#include "format_types/juce_LADSPAPluginFormat.h"
 #include "format_types/juce_VSTMidiEventList.h"
-#ifndef __JUCE_VSTPLUGINFORMAT_JUCEHEADER__
- #include "format_types/juce_VSTPluginFormat.h"
-#endif
-#ifndef __JUCE_KNOWNPLUGINLIST_JUCEHEADER__
- #include "scanning/juce_KnownPluginList.h"
-#endif
-#ifndef __JUCE_PLUGINDIRECTORYSCANNER_JUCEHEADER__
- #include "scanning/juce_PluginDirectoryScanner.h"
-#endif
-#ifndef __JUCE_PLUGINLISTCOMPONENT_JUCEHEADER__
- #include "scanning/juce_PluginListComponent.h"
-#endif
+#include "format_types/juce_VSTPluginFormat.h"
+#include "scanning/juce_KnownPluginList.h"
+#include "scanning/juce_PluginDirectoryScanner.h"
+#include "scanning/juce_PluginListComponent.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_AUDIO_PROCESSORS_JUCEHEADER__
+#endif   // JUCE_AUDIO_PROCESSORS_H_INCLUDED

modules/juce_audio_processors/processors/juce_AudioPlayHead.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPLAYHEAD_JUCEHEADER__
-#define __JUCE_AUDIOPLAYHEAD_JUCEHEADER__
+#ifndef JUCE_AUDIOPLAYHEAD_H_INCLUDED
+#define JUCE_AUDIOPLAYHEAD_H_INCLUDED
 
 
 //==============================================================================
@@ -137,4 +137,4 @@ public:
 };
 
 
-#endif   // __JUCE_AUDIOPLAYHEAD_JUCEHEADER__
+#endif   // JUCE_AUDIOPLAYHEAD_H_INCLUDED

modules/juce_audio_processors/processors/juce_AudioPluginInstance.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPLUGININSTANCE_JUCEHEADER__
-#define __JUCE_AUDIOPLUGININSTANCE_JUCEHEADER__
+#ifndef JUCE_AUDIOPLUGININSTANCE_H_INCLUDED
+#define JUCE_AUDIOPLUGININSTANCE_H_INCLUDED
 
 #include "../processors/juce_AudioProcessor.h"
 #include "juce_PluginDescription.h"
@@ -72,4 +72,4 @@ protected:
 };
 
 
-#endif   // __JUCE_AUDIOPLUGININSTANCE_JUCEHEADER__
+#endif   // JUCE_AUDIOPLUGININSTANCE_H_INCLUDED

modules/juce_audio_processors/processors/juce_AudioProcessor.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPROCESSOR_JUCEHEADER__
-#define __JUCE_AUDIOPROCESSOR_JUCEHEADER__
+#ifndef JUCE_AUDIOPROCESSOR_H_INCLUDED
+#define JUCE_AUDIOPROCESSOR_H_INCLUDED
 
 #include "juce_AudioProcessorEditor.h"
 #include "juce_AudioProcessorListener.h"
@@ -641,4 +641,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOPROCESSOR_JUCEHEADER__
+#endif   // JUCE_AUDIOPROCESSOR_H_INCLUDED

modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPROCESSOREDITOR_JUCEHEADER__
-#define __JUCE_AUDIOPROCESSOREDITOR_JUCEHEADER__
+#ifndef JUCE_AUDIOPROCESSOREDITOR_H_INCLUDED
+#define JUCE_AUDIOPROCESSOREDITOR_H_INCLUDED
 
 class AudioProcessor;
 
@@ -63,4 +63,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOPROCESSOREDITOR_JUCEHEADER__
+#endif   // JUCE_AUDIOPROCESSOREDITOR_H_INCLUDED

modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPROCESSORGRAPH_JUCEHEADER__
-#define __JUCE_AUDIOPROCESSORGRAPH_JUCEHEADER__
+#ifndef JUCE_AUDIOPROCESSORGRAPH_H_INCLUDED
+#define JUCE_AUDIOPROCESSORGRAPH_H_INCLUDED
 
 #include "juce_AudioProcessor.h"
 #include "../format/juce_AudioPluginFormatManager.h"
@@ -414,4 +414,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOPROCESSORGRAPH_JUCEHEADER__
+#endif   // JUCE_AUDIOPROCESSORGRAPH_H_INCLUDED

modules/juce_audio_processors/processors/juce_AudioProcessorListener.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPROCESSORLISTENER_JUCEHEADER__
-#define __JUCE_AUDIOPROCESSORLISTENER_JUCEHEADER__
+#ifndef JUCE_AUDIOPROCESSORLISTENER_H_INCLUDED
+#define JUCE_AUDIOPROCESSORLISTENER_H_INCLUDED
 
 class AudioProcessor;
 
@@ -104,4 +104,4 @@ public:
                                                           int parameterIndex);
 };
 
-#endif   // __JUCE_AUDIOPROCESSORLISTENER_JUCEHEADER__
+#endif   // JUCE_AUDIOPROCESSORLISTENER_H_INCLUDED

modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GENERICAUDIOPROCESSOREDITOR_JUCEHEADER__
-#define __JUCE_GENERICAUDIOPROCESSOREDITOR_JUCEHEADER__
+#ifndef JUCE_GENERICAUDIOPROCESSOREDITOR_H_INCLUDED
+#define JUCE_GENERICAUDIOPROCESSOREDITOR_H_INCLUDED
 
 #include "juce_AudioProcessorEditor.h"
 
@@ -57,4 +57,4 @@ private:
 };
 
 
-#endif   // __JUCE_GENERICAUDIOPROCESSOREDITOR_JUCEHEADER__
+#endif   // JUCE_GENERICAUDIOPROCESSOREDITOR_H_INCLUDED

modules/juce_audio_processors/processors/juce_PluginDescription.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PLUGINDESCRIPTION_JUCEHEADER__
-#define __JUCE_PLUGINDESCRIPTION_JUCEHEADER__
+#ifndef JUCE_PLUGINDESCRIPTION_H_INCLUDED
+#define JUCE_PLUGINDESCRIPTION_H_INCLUDED
 
 
 //==============================================================================
@@ -139,4 +139,4 @@ private:
 };
 
 
-#endif   // __JUCE_PLUGINDESCRIPTION_JUCEHEADER__
+#endif   // JUCE_PLUGINDESCRIPTION_H_INCLUDED

modules/juce_audio_processors/scanning/juce_KnownPluginList.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_KNOWNPLUGINLIST_JUCEHEADER__
-#define __JUCE_KNOWNPLUGINLIST_JUCEHEADER__
+#ifndef JUCE_KNOWNPLUGINLIST_H_INCLUDED
+#define JUCE_KNOWNPLUGINLIST_H_INCLUDED
 
 #include "../processors/juce_PluginDescription.h"
 #include "../format/juce_AudioPluginFormat.h"
@@ -207,4 +207,4 @@ private:
 };
 
 
-#endif   // __JUCE_KNOWNPLUGINLIST_JUCEHEADER__
+#endif   // JUCE_KNOWNPLUGINLIST_H_INCLUDED

modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PLUGINDIRECTORYSCANNER_JUCEHEADER__
-#define __JUCE_PLUGINDIRECTORYSCANNER_JUCEHEADER__
+#ifndef JUCE_PLUGINDIRECTORYSCANNER_H_INCLUDED
+#define JUCE_PLUGINDIRECTORYSCANNER_H_INCLUDED
 
 #include "juce_KnownPluginList.h"
 #include "../format/juce_AudioPluginFormatManager.h"
@@ -127,4 +127,4 @@ private:
 };
 
 
-#endif   // __JUCE_PLUGINDIRECTORYSCANNER_JUCEHEADER__
+#endif   // JUCE_PLUGINDIRECTORYSCANNER_H_INCLUDED

modules/juce_audio_processors/scanning/juce_PluginListComponent.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PLUGINLISTCOMPONENT_JUCEHEADER__
-#define __JUCE_PLUGINLISTCOMPONENT_JUCEHEADER__
+#ifndef JUCE_PLUGINLISTCOMPONENT_H_INCLUDED
+#define JUCE_PLUGINLISTCOMPONENT_H_INCLUDED
 
 #include "juce_KnownPluginList.h"
 #include "../format/juce_AudioPluginFormat.h"
@@ -122,4 +122,4 @@ private:
 };
 
 
-#endif   // __JUCE_PLUGINLISTCOMPONENT_JUCEHEADER__
+#endif   // JUCE_PLUGINLISTCOMPONENT_H_INCLUDED

modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIODEVICESELECTORCOMPONENT_JUCEHEADER__
-#define __JUCE_AUDIODEVICESELECTORCOMPONENT_JUCEHEADER__
+#ifndef JUCE_AUDIODEVICESELECTORCOMPONENT_H_INCLUDED
+#define JUCE_AUDIODEVICESELECTORCOMPONENT_H_INCLUDED
 
 
 //==============================================================================
@@ -105,4 +105,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIODEVICESELECTORCOMPONENT_JUCEHEADER__
+#endif   // JUCE_AUDIODEVICESELECTORCOMPONENT_H_INCLUDED

modules/juce_audio_utils/gui/juce_AudioThumbnail.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOTHUMBNAIL_JUCEHEADER__
-#define __JUCE_AUDIOTHUMBNAIL_JUCEHEADER__
+#ifndef JUCE_AUDIOTHUMBNAIL_H_INCLUDED
+#define JUCE_AUDIOTHUMBNAIL_H_INCLUDED
 
 class AudioThumbnailCache;
 
@@ -226,4 +226,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOTHUMBNAIL_JUCEHEADER__
+#endif   // JUCE_AUDIOTHUMBNAIL_H_INCLUDED

modules/juce_audio_utils/gui/juce_AudioThumbnailBase.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOTHUMBNAILBASE_JUCEHEADER__
-#define __JUCE_AUDIOTHUMBNAILBASE_JUCEHEADER__
+#ifndef JUCE_AUDIOTHUMBNAILBASE_H_INCLUDED
+#define JUCE_AUDIOTHUMBNAILBASE_H_INCLUDED
 
 class AudioThumbnailCache;
 
@@ -152,4 +152,4 @@ public:
     virtual int64 getHashCode() const = 0;
 };
 
-#endif   // __JUCE_AUDIOTHUMBNAILBASE_JUCEHEADER__
+#endif   // JUCE_AUDIOTHUMBNAILBASE_H_INCLUDED

modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOTHUMBNAILCACHE_JUCEHEADER__
-#define __JUCE_AUDIOTHUMBNAILCACHE_JUCEHEADER__
+#ifndef JUCE_AUDIOTHUMBNAILCACHE_H_INCLUDED
+#define JUCE_AUDIOTHUMBNAILCACHE_H_INCLUDED
 
 #include "juce_AudioThumbnailBase.h"
 
@@ -117,4 +117,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOTHUMBNAILCACHE_JUCEHEADER__
+#endif   // JUCE_AUDIOTHUMBNAILCACHE_H_INCLUDED

modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIKEYBOARDCOMPONENT_JUCEHEADER__
-#define __JUCE_MIDIKEYBOARDCOMPONENT_JUCEHEADER__
+#ifndef JUCE_MIDIKEYBOARDCOMPONENT_H_INCLUDED
+#define JUCE_MIDIKEYBOARDCOMPONENT_H_INCLUDED
 
 
 //==============================================================================
@@ -408,4 +408,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIKEYBOARDCOMPONENT_JUCEHEADER__
+#endif   // JUCE_MIDIKEYBOARDCOMPONENT_H_INCLUDED

modules/juce_audio_utils/juce_audio_utils.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_UTILS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_AUDIO_UTILS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_audio_utils/juce_audio_utils.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_UTILS_JUCEHEADER__
-#define __JUCE_AUDIO_UTILS_JUCEHEADER__
+#ifndef JUCE_AUDIO_UTILS_H_INCLUDED
+#define JUCE_AUDIO_UTILS_H_INCLUDED
 
 #include "../juce_gui_basics/juce_gui_basics.h"
 #include "../juce_audio_devices/juce_audio_devices.h"
@@ -33,26 +33,12 @@
 //=============================================================================
 namespace juce
 {
-
-#ifndef __JUCE_AUDIODEVICESELECTORCOMPONENT_JUCEHEADER__
  #include "gui/juce_AudioDeviceSelectorComponent.h"
-#endif
-#ifndef __JUCE_AUDIOTHUMBNAILBASE_JUCEHEADER__
  #include "gui/juce_AudioThumbnailBase.h"
-#endif
-#ifndef __JUCE_AUDIOTHUMBNAIL_JUCEHEADER__
  #include "gui/juce_AudioThumbnail.h"
-#endif
-#ifndef __JUCE_AUDIOTHUMBNAILCACHE_JUCEHEADER__
  #include "gui/juce_AudioThumbnailCache.h"
-#endif
-#ifndef __JUCE_MIDIKEYBOARDCOMPONENT_JUCEHEADER__
  #include "gui/juce_MidiKeyboardComponent.h"
-#endif
-#ifndef __JUCE_AUDIOPROCESSORPLAYER_JUCEHEADER__
  #include "players/juce_AudioProcessorPlayer.h"
-#endif
-
 }
 
-#endif   // __JUCE_AUDIO_UTILS_JUCEHEADER__
+#endif   // JUCE_AUDIO_UTILS_H_INCLUDED

modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPROCESSORPLAYER_JUCEHEADER__
-#define __JUCE_AUDIOPROCESSORPLAYER_JUCEHEADER__
+#ifndef JUCE_AUDIOPROCESSORPLAYER_H_INCLUDED
+#define JUCE_AUDIOPROCESSORPLAYER_H_INCLUDED
 
 #include "../../juce_audio_processors/processors/juce_AudioProcessor.h"
 
@@ -101,4 +101,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOPROCESSORPLAYER_JUCEHEADER__
+#endif   // JUCE_AUDIOPROCESSORPLAYER_H_INCLUDED

modules/juce_box2d/juce_box2d.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_BOX2D_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_BOX2D_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_box2d/juce_box2d.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BOX2D_JUCEHEADER__
-#define __JUCE_BOX2D_JUCEHEADER__
+#ifndef JUCE_BOX2D_H_INCLUDED
+#define JUCE_BOX2D_H_INCLUDED
 
 //=============================================================================
 #include "../juce_graphics/juce_graphics.h"
@@ -35,4 +35,4 @@ namespace juce
   #include "utils/juce_Box2DRenderer.h"
 }
 
-#endif   // __JUCE_BOX2D_JUCEHEADER__
+#endif   // JUCE_BOX2D_H_INCLUDED

modules/juce_box2d/utils/juce_Box2DRenderer.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BOX2DRENDERER_JUCEHEADER__
-#define __JUCE_BOX2DRENDERER_JUCEHEADER__
+#ifndef JUCE_BOX2DRENDERER_H_INCLUDED
+#define JUCE_BOX2DRENDERER_H_INCLUDED
 
 //=============================================================================
 /** A simple implementation of the b2Draw class, used to draw a Box2D world.
@@ -74,4 +74,4 @@ protected:
 };
 
 
-#endif   // __JUCE_BOX2DRENDERER_JUCEHEADER__
+#endif   // JUCE_BOX2DRENDERER_H_INCLUDED

modules/juce_browser_plugin/juce_browser_plugin.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_BROWSER_PLUGIN_CLIENT_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_BROWSER_PLUGIN_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_browser_plugin/juce_browser_plugin.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BROWSER_PLUGIN_JUCEHEADER__
-#define __JUCE_BROWSER_PLUGIN_JUCEHEADER__
+#ifndef JUCE_BROWSER_PLUGIN_H_INCLUDED
+#define JUCE_BROWSER_PLUGIN_H_INCLUDED
 
 #include "../juce_gui_basics/juce_gui_basics.h"
 
@@ -143,4 +143,4 @@ namespace juce
 juce::BrowserPluginComponent* JUCE_CALLTYPE createBrowserPlugin();
 
 
-#endif   // __JUCE_BROWSER_PLUGIN_JUCEHEADER__
+#endif   // JUCE_BROWSER_PLUGIN_H_INCLUDED

modules/juce_browser_plugin/wrapper/juce_BrowserPluginComponent.h

@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BROWSERPLUGINCOMPONENT_JUCEHEADER__
-#define __JUCE_BROWSERPLUGINCOMPONENT_JUCEHEADER__
+#ifndef JUCE_BROWSERPLUGINCOMPONENT_H_INCLUDED
+#define JUCE_BROWSERPLUGINCOMPONENT_H_INCLUDED
 
 //==============================================================================
 /**
@@ -69,4 +69,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (BrowserPluginComponent)
 };
 
-#endif   // __JUCE_BROWSERPLUGINCOMPONENT_JUCEHEADER__
+#endif   // JUCE_BROWSERPLUGINCOMPONENT_H_INCLUDED

modules/juce_core/containers/juce_AbstractFifo.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ABSTRACTFIFO_JUCEHEADER__
-#define __JUCE_ABSTRACTFIFO_JUCEHEADER__
+#ifndef JUCE_ABSTRACTFIFO_H_INCLUDED
+#define JUCE_ABSTRACTFIFO_H_INCLUDED
 
 #include "../memory/juce_Atomic.h"
 
@@ -219,4 +219,4 @@ private:
 };
 
 
-#endif   // __JUCE_ABSTRACTFIFO_JUCEHEADER__
+#endif   // JUCE_ABSTRACTFIFO_H_INCLUDED

modules/juce_core/containers/juce_Array.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ARRAY_JUCEHEADER__
-#define __JUCE_ARRAY_JUCEHEADER__
+#ifndef JUCE_ARRAY_H_INCLUDED
+#define JUCE_ARRAY_H_INCLUDED
 
 #include "juce_ArrayAllocationBase.h"
 #include "juce_ElementComparator.h"
@@ -1057,4 +1057,4 @@ private:
 };
 
 
-#endif   // __JUCE_ARRAY_JUCEHEADER__
+#endif   // JUCE_ARRAY_H_INCLUDED

modules/juce_core/containers/juce_ArrayAllocationBase.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
-#define __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
+#ifndef JUCE_ARRAYALLOCATIONBASE_H_INCLUDED
+#define JUCE_ARRAYALLOCATIONBASE_H_INCLUDED
 
 #include "../memory/juce_HeapBlock.h"
 
@@ -137,4 +137,4 @@ private:
 };
 
 
-#endif   // __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
+#endif   // JUCE_ARRAYALLOCATIONBASE_H_INCLUDED

modules/juce_core/containers/juce_DynamicObject.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DYNAMICOBJECT_JUCEHEADER__
-#define __JUCE_DYNAMICOBJECT_JUCEHEADER__
+#ifndef JUCE_DYNAMICOBJECT_H_INCLUDED
+#define JUCE_DYNAMICOBJECT_H_INCLUDED
 
 #include "juce_NamedValueSet.h"
 #include "../memory/juce_ReferenceCountedObject.h"
@@ -123,4 +123,4 @@ private:
 
 
 
-#endif   // __JUCE_DYNAMICOBJECT_JUCEHEADER__
+#endif   // JUCE_DYNAMICOBJECT_H_INCLUDED

modules/juce_core/containers/juce_ElementComparator.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ELEMENTCOMPARATOR_JUCEHEADER__
-#define __JUCE_ELEMENTCOMPARATOR_JUCEHEADER__
+#ifndef JUCE_ELEMENTCOMPARATOR_H_INCLUDED
+#define JUCE_ELEMENTCOMPARATOR_H_INCLUDED
 
 
 //==============================================================================
@@ -276,4 +276,4 @@ public:
 };
 
 
-#endif   // __JUCE_ELEMENTCOMPARATOR_JUCEHEADER__
+#endif   // JUCE_ELEMENTCOMPARATOR_H_INCLUDED

modules/juce_core/containers/juce_HashMap.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_HASHMAP_JUCEHEADER__
-#define __JUCE_HASHMAP_JUCEHEADER__
+#ifndef JUCE_HASHMAP_H_INCLUDED
+#define JUCE_HASHMAP_H_INCLUDED
 
 #include "juce_OwnedArray.h"
 #include "juce_LinkedListPointer.h"
@@ -449,4 +449,4 @@ private:
 };
 
 
-#endif   // __JUCE_HASHMAP_JUCEHEADER__
+#endif   // JUCE_HASHMAP_H_INCLUDED

modules/juce_core/containers/juce_LinkedListPointer.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LINKEDLISTPOINTER_JUCEHEADER__
-#define __JUCE_LINKEDLISTPOINTER_JUCEHEADER__
+#ifndef JUCE_LINKEDLISTPOINTER_H_INCLUDED
+#define JUCE_LINKEDLISTPOINTER_H_INCLUDED
 
 
 //==============================================================================
@@ -368,4 +368,4 @@ private:
 };
 
 
-#endif   // __JUCE_LINKEDLISTPOINTER_JUCEHEADER__
+#endif   // JUCE_LINKEDLISTPOINTER_H_INCLUDED

modules/juce_core/containers/juce_NamedValueSet.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_NAMEDVALUESET_JUCEHEADER__
-#define __JUCE_NAMEDVALUESET_JUCEHEADER__
+#ifndef JUCE_NAMEDVALUESET_H_INCLUDED
+#define JUCE_NAMEDVALUESET_H_INCLUDED
 
 #include "juce_Variant.h"
 #include "../containers/juce_LinkedListPointer.h"
@@ -166,4 +166,4 @@ private:
 };
 
 
-#endif   // __JUCE_NAMEDVALUESET_JUCEHEADER__
+#endif   // JUCE_NAMEDVALUESET_H_INCLUDED

modules/juce_core/containers/juce_OwnedArray.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OWNEDARRAY_JUCEHEADER__
-#define __JUCE_OWNEDARRAY_JUCEHEADER__
+#ifndef JUCE_OWNEDARRAY_H_INCLUDED
+#define JUCE_OWNEDARRAY_H_INCLUDED
 
 #include "juce_ArrayAllocationBase.h"
 #include "juce_ElementComparator.h"
@@ -877,4 +877,4 @@ private:
 };
 
 
-#endif   // __JUCE_OWNEDARRAY_JUCEHEADER__
+#endif   // JUCE_OWNEDARRAY_H_INCLUDED

modules/juce_core/containers/juce_PropertySet.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PROPERTYSET_JUCEHEADER__
-#define __JUCE_PROPERTYSET_JUCEHEADER__
+#ifndef JUCE_PROPERTYSET_H_INCLUDED
+#define JUCE_PROPERTYSET_H_INCLUDED
 
 #include "../text/juce_StringPairArray.h"
 #include "../xml/juce_XmlElement.h"
@@ -216,4 +216,4 @@ private:
 };
 
 
-#endif   // __JUCE_PROPERTYSET_JUCEHEADER__
+#endif   // JUCE_PROPERTYSET_H_INCLUDED

modules/juce_core/containers/juce_ReferenceCountedArray.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_REFERENCECOUNTEDARRAY_JUCEHEADER__
-#define __JUCE_REFERENCECOUNTEDARRAY_JUCEHEADER__
+#ifndef JUCE_REFERENCECOUNTEDARRAY_H_INCLUDED
+#define JUCE_REFERENCECOUNTEDARRAY_H_INCLUDED
 
 #include "../memory/juce_ReferenceCountedObject.h"
 #include "juce_ArrayAllocationBase.h"
@@ -864,4 +864,4 @@ private:
 };
 
 
-#endif   // __JUCE_REFERENCECOUNTEDARRAY_JUCEHEADER__
+#endif   // JUCE_REFERENCECOUNTEDARRAY_H_INCLUDED

modules/juce_core/containers/juce_ScopedValueSetter.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SCOPEDVALUESETTER_JUCEHEADER__
-#define __JUCE_SCOPEDVALUESETTER_JUCEHEADER__
+#ifndef JUCE_SCOPEDVALUESETTER_H_INCLUDED
+#define JUCE_SCOPEDVALUESETTER_H_INCLUDED
 
 
 //==============================================================================
@@ -97,4 +97,4 @@ private:
 };
 
 
-#endif   // __JUCE_SCOPEDVALUESETTER_JUCEHEADER__
+#endif   // JUCE_SCOPEDVALUESETTER_H_INCLUDED

modules/juce_core/containers/juce_SortedSet.h

@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SORTEDSET_JUCEHEADER__
-#define __JUCE_SORTEDSET_JUCEHEADER__
+#ifndef JUCE_SORTEDSET_H_INCLUDED
+#define JUCE_SORTEDSET_H_INCLUDED
 
 #include "juce_ArrayAllocationBase.h"
 #include "../threads/juce_CriticalSection.h"
@@ -496,4 +496,4 @@ private:
   #pragma warning (pop)
 #endif
 
-#endif   // __JUCE_SORTEDSET_JUCEHEADER__
+#endif   // JUCE_SORTEDSET_H_INCLUDED