diff --git a/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj b/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj index 812d58527c..2aef5a94d1 100644 --- a/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj +++ b/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj @@ -2841,7 +2841,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; @@ -2877,7 +2877,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; @@ -2912,7 +2912,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST3.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; @@ -2948,7 +2948,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST3.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; @@ -2982,7 +2982,7 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AUv3_AppExtension.plist; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -3014,7 +3014,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AUv3_AppExtension.plist; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -3043,7 +3043,7 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-Standalone_Plugin.plist; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -3073,7 +3073,7 @@ "JucePlugin_Build_Standalone=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-Standalone_Plugin.plist; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -3103,7 +3103,7 @@ "JucePlugin_Build_Standalone=1", "JUCE_SHARED_CODE=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -3133,7 +3133,7 @@ "JUCE_SHARED_CODE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; diff --git a/examples/AUv3Synth/JuceLibraryCode/AppConfig.h b/examples/AUv3Synth/JuceLibraryCode/AppConfig.h index 8f7e328242..10e3156448 100644 --- a/examples/AUv3Synth/JuceLibraryCode/AppConfig.h +++ b/examples/AUv3Synth/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_NAPIAV__ -#define __JUCE_APPCONFIG_NAPIAV__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -213,7 +212,6 @@ //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - //============================================================================== // Audio plugin settings.. @@ -340,5 +338,3 @@ #ifndef JucePlugin_AAXDisableMultiMono #define JucePlugin_AAXDisableMultiMono 0 #endif - -#endif // __JUCE_APPCONFIG_NAPIAV__ diff --git a/examples/AUv3Synth/JuceLibraryCode/BinaryData.h b/examples/AUv3Synth/JuceLibraryCode/BinaryData.h index 0e1dcfe624..95ca67d52a 100644 --- a/examples/AUv3Synth/JuceLibraryCode/BinaryData.h +++ b/examples/AUv3Synth/JuceLibraryCode/BinaryData.h @@ -4,8 +4,7 @@ */ -#ifndef BINARYDATA_H_43410497_INCLUDED -#define BINARYDATA_H_43410497_INCLUDED +#pragma once namespace BinaryData { @@ -25,5 +24,3 @@ namespace BinaryData // return the corresponding data and its size (or a null pointer if the name isn't found). const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw(); } - -#endif diff --git a/examples/AUv3Synth/JuceLibraryCode/JuceHeader.h b/examples/AUv3Synth/JuceLibraryCode/JuceHeader.h index a77a04177a..c7bc5ae95a 100644 --- a/examples/AUv3Synth/JuceLibraryCode/JuceHeader.h +++ b/examples/AUv3Synth/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_NAPIAV__ -#define __APPHEADERFILE_NAPIAV__ +#pragma once #include "AppConfig.h" @@ -44,5 +43,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_NAPIAV__ diff --git a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h index e8404f1b89..1363e66e20 100644 --- a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_LRATE6__ -#define __JUCE_APPCONFIG_LRATE6__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -210,6 +209,3 @@ #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA #endif - - -#endif // __JUCE_APPCONFIG_LRATE6__ diff --git a/examples/AnimationAppExample/JuceLibraryCode/JuceHeader.h b/examples/AnimationAppExample/JuceLibraryCode/JuceHeader.h index 8c261857c7..9df3c076ba 100644 --- a/examples/AnimationAppExample/JuceLibraryCode/JuceHeader.h +++ b/examples/AnimationAppExample/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_LRATE6__ -#define __APPHEADERFILE_LRATE6__ +#pragma once #include "AppConfig.h" @@ -44,5 +43,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_LRATE6__ diff --git a/examples/AnimationAppExample/Source/MainComponent.cpp b/examples/AnimationAppExample/Source/MainComponent.cpp index 7de6d1535c..79c972410d 100644 --- a/examples/AnimationAppExample/Source/MainComponent.cpp +++ b/examples/AnimationAppExample/Source/MainComponent.cpp @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" @@ -82,6 +81,3 @@ private: // (This function is called by the app startup code to create our main component) Component* createMainContentComponent() { return new MainContentComponent(); } - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h index 140ed4e0b9..5094db371f 100644 --- a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_PANJXP__ -#define __JUCE_APPCONFIG_PANJXP__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -222,6 +221,3 @@ #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA #endif - - -#endif // __JUCE_APPCONFIG_PANJXP__ diff --git a/examples/AudioAppExample/JuceLibraryCode/JuceHeader.h b/examples/AudioAppExample/JuceLibraryCode/JuceHeader.h index ff78c6f8dc..f549f96720 100644 --- a/examples/AudioAppExample/JuceLibraryCode/JuceHeader.h +++ b/examples/AudioAppExample/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_PANJXP__ -#define __APPHEADERFILE_PANJXP__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_PANJXP__ diff --git a/examples/AudioAppExample/Source/MainComponent.cpp b/examples/AudioAppExample/Source/MainComponent.cpp index b350672f45..c83b416b67 100644 --- a/examples/AudioAppExample/Source/MainComponent.cpp +++ b/examples/AudioAppExample/Source/MainComponent.cpp @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" @@ -150,5 +149,3 @@ private: Component* createMainContentComponent() { return new MainContentComponent(); }; - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h index bcaff4d3ce..cc514699dc 100644 --- a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_AA4REI__ -#define __JUCE_APPCONFIG_AA4REI__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -202,6 +201,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_AA4REI__ diff --git a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/JuceHeader.h b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/JuceHeader.h index c6b3b5fe7d..ef0c0a71d4 100644 --- a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/JuceHeader.h +++ b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_AA4REI__ -#define __APPHEADERFILE_AA4REI__ +#pragma once #include "AppConfig.h" @@ -44,5 +43,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_AA4REI__ diff --git a/examples/BLOCKS/BlocksDrawing/Source/LightpadComponent.h b/examples/BLOCKS/BlocksDrawing/Source/LightpadComponent.h index 51d1b41021..e8c89934b8 100644 --- a/examples/BLOCKS/BlocksDrawing/Source/LightpadComponent.h +++ b/examples/BLOCKS/BlocksDrawing/Source/LightpadComponent.h @@ -1,5 +1,4 @@ -#ifndef LIGHTPADCOMPONENT_H_INCLUDED -#define LIGHTPADCOMPONENT_H_INCLUDED +#pragma once //============================================================================== /** @@ -133,6 +132,3 @@ private: Time lastMouseEventTime; Point lastLED; }; - - -#endif // LIGHTPADCOMPONENT_H_INCLUDED diff --git a/examples/BLOCKS/BlocksDrawing/Source/MainComponent.h b/examples/BLOCKS/BlocksDrawing/Source/MainComponent.h index cdaa5038a9..c72980cdcc 100644 --- a/examples/BLOCKS/BlocksDrawing/Source/MainComponent.h +++ b/examples/BLOCKS/BlocksDrawing/Source/MainComponent.h @@ -1,5 +1,4 @@ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" #include "LightpadComponent.h" @@ -535,6 +534,3 @@ private: //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainComponent) }; - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h index c06660a97b..cc514699dc 100644 --- a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_X7EXS7__ -#define __JUCE_APPCONFIG_X7EXS7__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -202,6 +201,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_X7EXS7__ diff --git a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/JuceHeader.h b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/JuceHeader.h index 57c4f59e3a..a7376eb79c 100644 --- a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/JuceHeader.h +++ b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_X7EXS7__ -#define __APPHEADERFILE_X7EXS7__ +#pragma once #include "AppConfig.h" @@ -44,5 +43,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_X7EXS7__ diff --git a/examples/BLOCKS/BlocksMonitor/Source/BlockComponents.h b/examples/BLOCKS/BlocksMonitor/Source/BlockComponents.h index f23f93af92..50016c0063 100644 --- a/examples/BLOCKS/BlocksMonitor/Source/BlockComponents.h +++ b/examples/BLOCKS/BlocksMonitor/Source/BlockComponents.h @@ -1,5 +1,4 @@ -#ifndef BLOCKCOMPONENTS_H_INCLUDED -#define BLOCKCOMPONENTS_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" @@ -520,5 +519,3 @@ private: //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ControlBlockComponent) }; - -#endif // BLOCKCOMPONENTS_H_INCLUDED diff --git a/examples/BLOCKS/BlocksMonitor/Source/MainComponent.h b/examples/BLOCKS/BlocksMonitor/Source/MainComponent.h index 9fcf93adee..fde65ccbce 100644 --- a/examples/BLOCKS/BlocksMonitor/Source/MainComponent.h +++ b/examples/BLOCKS/BlocksMonitor/Source/MainComponent.h @@ -1,5 +1,4 @@ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" #include "BlockComponents.h" @@ -442,6 +441,3 @@ private: //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainComponent) }; - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h index 5dbc0820f0..cc514699dc 100644 --- a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_XSTYCT__ -#define __JUCE_APPCONFIG_XSTYCT__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -202,6 +201,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_XSTYCT__ diff --git a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/JuceHeader.h b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/JuceHeader.h index be2d94f134..6e2b24f033 100644 --- a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/JuceHeader.h +++ b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_XSTYCT__ -#define __APPHEADERFILE_XSTYCT__ +#pragma once #include "AppConfig.h" @@ -44,5 +43,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_XSTYCT__ diff --git a/examples/BLOCKS/BlocksSynth/Source/Audio.h b/examples/BLOCKS/BlocksSynth/Source/Audio.h index bb10820995..51f39b206b 100644 --- a/examples/BLOCKS/BlocksSynth/Source/Audio.h +++ b/examples/BLOCKS/BlocksSynth/Source/Audio.h @@ -1,6 +1,4 @@ - -#ifndef AUDIO_H_INCLUDED -#define AUDIO_H_INCLUDED +#pragma once #include "Oscillators.h" @@ -91,5 +89,3 @@ private: //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Audio) }; - -#endif // AUDIO_H_INCLUDED diff --git a/examples/BLOCKS/BlocksSynth/Source/MainComponent.h b/examples/BLOCKS/BlocksSynth/Source/MainComponent.h index 41d8fe2931..9023d0697e 100644 --- a/examples/BLOCKS/BlocksSynth/Source/MainComponent.h +++ b/examples/BLOCKS/BlocksSynth/Source/MainComponent.h @@ -1,5 +1,4 @@ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" #include "Audio.h" @@ -327,6 +326,3 @@ private: //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainComponent) }; - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/BLOCKS/BlocksSynth/Source/Oscillators.h b/examples/BLOCKS/BlocksSynth/Source/Oscillators.h index e5fcc205de..29dea22ce0 100644 --- a/examples/BLOCKS/BlocksSynth/Source/Oscillators.h +++ b/examples/BLOCKS/BlocksSynth/Source/Oscillators.h @@ -1,6 +1,4 @@ - -#ifndef OSCILLATORS_H_INCLUDED -#define OSCILLATORS_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" @@ -224,5 +222,3 @@ struct TriangleVoice : public Oscillator //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TriangleVoice) }; - -#endif // OSCILLATORS_H_INCLUDED diff --git a/examples/BLOCKS/BlocksSynth/Source/WaveshapeProgram.h b/examples/BLOCKS/BlocksSynth/Source/WaveshapeProgram.h index 7dc904fccd..d06c2fd3c9 100644 --- a/examples/BLOCKS/BlocksSynth/Source/WaveshapeProgram.h +++ b/examples/BLOCKS/BlocksSynth/Source/WaveshapeProgram.h @@ -1,5 +1,4 @@ -#ifndef WAVESHAPEPROGRAM_H_INCLUDED -#define WAVESHAPEPROGRAM_H_INCLUDED +#pragma once /** A Program to draw moving waveshapes onto the LEDGrid @@ -179,5 +178,3 @@ private: //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (WaveshapeProgram) }; - -#endif // WAVESHAPEPROGRAM_H_INCLUDED diff --git a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h index d970a8af6c..2b4669fa0a 100644 --- a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h +++ b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_FYURFS__ -#define __JUCE_APPCONFIG_FYURFS__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -221,6 +220,3 @@ #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA #endif - - -#endif // __JUCE_APPCONFIG_FYURFS__ diff --git a/examples/BouncingBallWavetableDemo/JuceLibraryCode/JuceHeader.h b/examples/BouncingBallWavetableDemo/JuceLibraryCode/JuceHeader.h index 73dea3a9c0..438cf006de 100644 --- a/examples/BouncingBallWavetableDemo/JuceLibraryCode/JuceHeader.h +++ b/examples/BouncingBallWavetableDemo/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_FYURFS__ -#define __APPHEADERFILE_FYURFS__ +#pragma once #include "AppConfig.h" @@ -44,5 +43,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_FYURFS__ diff --git a/examples/BouncingBallWavetableDemo/Source/MainComponent.cpp b/examples/BouncingBallWavetableDemo/Source/MainComponent.cpp index cf55f6ae40..68baf398e9 100644 --- a/examples/BouncingBallWavetableDemo/Source/MainComponent.cpp +++ b/examples/BouncingBallWavetableDemo/Source/MainComponent.cpp @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" @@ -241,6 +240,3 @@ private: // (This is called from Main.cpp) Component* createMainContentComponent() { return new MainContentComponent(); }; - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h b/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h index ea23cfeffb..1b3ac8f766 100644 --- a/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h +++ b/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_ONVA5C__ -#define __JUCE_APPCONFIG_ONVA5C__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -115,6 +114,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_ONVA5C__ diff --git a/examples/ComponentTutorialExample/JuceLibraryCode/JuceHeader.h b/examples/ComponentTutorialExample/JuceLibraryCode/JuceHeader.h index 9872b24bc9..e16fe88961 100644 --- a/examples/ComponentTutorialExample/JuceLibraryCode/JuceHeader.h +++ b/examples/ComponentTutorialExample/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_ONVA5C__ -#define __APPHEADERFILE_ONVA5C__ +#pragma once #include "AppConfig.h" @@ -37,5 +36,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_ONVA5C__ diff --git a/examples/ComponentTutorialExample/Source/MainComponent.h b/examples/ComponentTutorialExample/Source/MainComponent.h index 9031e6b658..b42f59b77f 100644 --- a/examples/ComponentTutorialExample/Source/MainComponent.h +++ b/examples/ComponentTutorialExample/Source/MainComponent.h @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" @@ -36,6 +35,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent) }; - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/ComponentTutorialExample/Source/ToggleLightComponent.h b/examples/ComponentTutorialExample/Source/ToggleLightComponent.h index a32a7faf75..b76a867f5f 100644 --- a/examples/ComponentTutorialExample/Source/ToggleLightComponent.h +++ b/examples/ComponentTutorialExample/Source/ToggleLightComponent.h @@ -8,8 +8,7 @@ ============================================================================== */ -#ifndef TOGGLELIGHTCOMPONENT_H_INCLUDED -#define TOGGLELIGHTCOMPONENT_H_INCLUDED +#pragma once /** This class represents one of the individual lights in our grid. @@ -48,6 +47,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ToggleLightComponent) }; - - -#endif // TOGGLELIGHTCOMPONENT_H_INCLUDED diff --git a/examples/ComponentTutorialExample/Source/ToggleLightGridComponent.h b/examples/ComponentTutorialExample/Source/ToggleLightGridComponent.h index e20b8c3b8d..f0453f6b64 100644 --- a/examples/ComponentTutorialExample/Source/ToggleLightGridComponent.h +++ b/examples/ComponentTutorialExample/Source/ToggleLightGridComponent.h @@ -8,8 +8,7 @@ ============================================================================== */ -#ifndef TOGGLELIGHTGRIDCOMPONENT_H_INCLUDED -#define TOGGLELIGHTGRIDCOMPONENT_H_INCLUDED +#pragma once #include "ToggleLightComponent.h" @@ -61,7 +60,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ToggleLightGridComponent) }; - - - -#endif // TOGGLELIGHTGRIDCOMPONENT_H_INCLUDED diff --git a/examples/Demo/JuceLibraryCode/AppConfig.h b/examples/Demo/JuceLibraryCode/AppConfig.h index 40da131dc7..faadd31905 100644 --- a/examples/Demo/JuceLibraryCode/AppConfig.h +++ b/examples/Demo/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_SBBIZR__ -#define __JUCE_APPCONFIG_SBBIZR__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -223,6 +222,3 @@ #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA #endif - - -#endif // __JUCE_APPCONFIG_SBBIZR__ diff --git a/examples/Demo/JuceLibraryCode/BinaryData.h b/examples/Demo/JuceLibraryCode/BinaryData.h index 97fbf55b3f..7c3af1db24 100644 --- a/examples/Demo/JuceLibraryCode/BinaryData.h +++ b/examples/Demo/JuceLibraryCode/BinaryData.h @@ -4,8 +4,7 @@ */ -#ifndef BINARYDATA_H_134119534_INCLUDED -#define BINARYDATA_H_134119534_INCLUDED +#pragma once namespace BinaryData { @@ -46,5 +45,3 @@ namespace BinaryData // return the corresponding data and its size (or a null pointer if the name isn't found). const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw(); } - -#endif diff --git a/examples/Demo/JuceLibraryCode/JuceHeader.h b/examples/Demo/JuceLibraryCode/JuceHeader.h index 261b42a1b0..ca309ca271 100644 --- a/examples/Demo/JuceLibraryCode/JuceHeader.h +++ b/examples/Demo/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_SBBIZR__ -#define __APPHEADERFILE_SBBIZR__ +#pragma once #include "AppConfig.h" @@ -47,5 +46,3 @@ namespace ProjectInfo const int versionNumber = 0x30000; } #endif - -#endif // __APPHEADERFILE_SBBIZR__ diff --git a/examples/Demo/Source/DemoUtilities.h b/examples/Demo/Source/DemoUtilities.h index c36de8ad6c..58e3a8f414 100644 --- a/examples/Demo/Source/DemoUtilities.h +++ b/examples/Demo/Source/DemoUtilities.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef DEMOUTILITIES_H_INCLUDED -#define DEMOUTILITIES_H_INCLUDED +#pragma once //============================================================================== /* @@ -74,6 +73,3 @@ struct SlowerBouncingNumber : public BouncingNumber speed *= 0.3; } }; - - -#endif // DEMOUTILITIES_H_INCLUDED diff --git a/examples/Demo/Source/Demos/AudioLiveScrollingDisplay.h b/examples/Demo/Source/Demos/AudioLiveScrollingDisplay.h index f606711498..ae5f7cb2a6 100644 --- a/examples/Demo/Source/Demos/AudioLiveScrollingDisplay.h +++ b/examples/Demo/Source/Demos/AudioLiveScrollingDisplay.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef __AUDIOLIVESCROLLINGDISPLAY_H_4C3BD3A7__ -#define __AUDIOLIVESCROLLINGDISPLAY_H_4C3BD3A7__ +#pragma once #include "../JuceDemoHeader.h" @@ -78,6 +77,3 @@ public: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LiveScrollingAudioDisplay) }; - - -#endif // __AUDIOLIVESCROLLINGDISPLAY_H_4C3BD3A7__ diff --git a/examples/Demo/Source/JuceDemoHeader.h b/examples/Demo/Source/JuceDemoHeader.h index 513015e264..cc77c1d030 100644 --- a/examples/Demo/Source/JuceDemoHeader.h +++ b/examples/Demo/Source/JuceDemoHeader.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef __JUCEDEMOHEADER_H_EE664D1A__ -#define __JUCEDEMOHEADER_H_EE664D1A__ +#pragma once #include "../JuceLibraryCode/JuceHeader.h" #include "MainWindow.h" @@ -66,6 +65,3 @@ public: private: JUCE_DECLARE_NON_COPYABLE (JuceDemoType) }; - - -#endif // __JUCEDEMOHEADER_H_EE664D1A__ diff --git a/examples/Demo/Source/MainWindow.h b/examples/Demo/Source/MainWindow.h index 21bde62df6..c8416ec130 100644 --- a/examples/Demo/Source/MainWindow.h +++ b/examples/Demo/Source/MainWindow.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef __MAINWINDOW_H_7DB41986__ -#define __MAINWINDOW_H_7DB41986__ +#pragma once class ContentComponent; @@ -112,6 +111,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainAppWindow) }; - - -#endif // __MAINWINDOW_H_7DB41986__ diff --git a/examples/HelloWorld/JuceLibraryCode/AppConfig.h b/examples/HelloWorld/JuceLibraryCode/AppConfig.h index 212f7d9719..1b3ac8f766 100644 --- a/examples/HelloWorld/JuceLibraryCode/AppConfig.h +++ b/examples/HelloWorld/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_TTAKTK1S__ -#define __JUCE_APPCONFIG_TTAKTK1S__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -115,6 +114,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_TTAKTK1S__ diff --git a/examples/HelloWorld/JuceLibraryCode/JuceHeader.h b/examples/HelloWorld/JuceLibraryCode/JuceHeader.h index 3047038abb..ad1350fe33 100644 --- a/examples/HelloWorld/JuceLibraryCode/JuceHeader.h +++ b/examples/HelloWorld/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_TTAKTK1S__ -#define __APPHEADERFILE_TTAKTK1S__ +#pragma once #include "AppConfig.h" @@ -37,5 +36,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_TTAKTK1S__ diff --git a/examples/HelloWorld/Source/MainComponent.h b/examples/HelloWorld/Source/MainComponent.h index dcf5250676..724207a7db 100644 --- a/examples/HelloWorld/Source/MainComponent.h +++ b/examples/HelloWorld/Source/MainComponent.h @@ -17,8 +17,7 @@ ============================================================================== */ -#ifndef __JUCE_HEADER_9002020A4DD09B20__ -#define __JUCE_HEADER_9002020A4DD09B20__ +#pragma once //[Headers] -- You can add your own extra header files here -- #include "../JuceLibraryCode/JuceHeader.h" @@ -68,5 +67,3 @@ private: //[EndFile] You can add extra defines here... //[/EndFile] - -#endif // __JUCE_HEADER_9002020A4DD09B20__ diff --git a/examples/MPETest/JuceLibraryCode/AppConfig.h b/examples/MPETest/JuceLibraryCode/AppConfig.h index 0f07bee6ec..5094db371f 100644 --- a/examples/MPETest/JuceLibraryCode/AppConfig.h +++ b/examples/MPETest/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_IILE7R__ -#define __JUCE_APPCONFIG_IILE7R__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -222,6 +221,3 @@ #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA #endif - - -#endif // __JUCE_APPCONFIG_IILE7R__ diff --git a/examples/MPETest/JuceLibraryCode/JuceHeader.h b/examples/MPETest/JuceLibraryCode/JuceHeader.h index 57a588c042..6a95e72f6f 100644 --- a/examples/MPETest/JuceLibraryCode/JuceHeader.h +++ b/examples/MPETest/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_IILE7R__ -#define __APPHEADERFILE_IILE7R__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_IILE7R__ diff --git a/examples/MPETest/Source/MPEDemoSynthVoice.h b/examples/MPETest/Source/MPEDemoSynthVoice.h index 9bb99222f2..dfcaaecf7d 100644 --- a/examples/MPETest/Source/MPEDemoSynthVoice.h +++ b/examples/MPETest/Source/MPEDemoSynthVoice.h @@ -23,8 +23,7 @@ */ -#ifndef MPEDEMOSYNTHVOICE_H_INCLUDED -#define MPEDEMOSYNTHVOICE_H_INCLUDED +#pragma once class MPEDemoSynthVoice : public MPESynthesiserVoice @@ -181,6 +180,3 @@ private: const double maxLevelDb = 31.0f; const double smoothingLengthInSeconds = 0.01; }; - - -#endif // MPEDEMOSYNTHVOICE_H_INCLUDED diff --git a/examples/MPETest/Source/MPESetupComponent.h b/examples/MPETest/Source/MPESetupComponent.h index 951992975c..0e270fb1b9 100644 --- a/examples/MPETest/Source/MPESetupComponent.h +++ b/examples/MPETest/Source/MPESetupComponent.h @@ -23,8 +23,7 @@ */ -#ifndef MPESETUPCOMPONENT_H_INCLUDED -#define MPESETUPCOMPONENT_H_INCLUDED +#pragma once class MPESetupComponent : public Component, @@ -330,6 +329,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MPESetupComponent) }; - - -#endif // MPESETUPCOMPONENT_H_INCLUDED diff --git a/examples/MPETest/Source/MainComponent.h b/examples/MPETest/Source/MainComponent.h index c22143dde2..da2d55a0b5 100644 --- a/examples/MPETest/Source/MainComponent.h +++ b/examples/MPETest/Source/MainComponent.h @@ -23,8 +23,7 @@ */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once class MainComponent : public Component, @@ -195,6 +194,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainComponent) }; - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/MPETest/Source/Visualiser.h b/examples/MPETest/Source/Visualiser.h index 819bfd0077..05db1d61db 100644 --- a/examples/MPETest/Source/Visualiser.h +++ b/examples/MPETest/Source/Visualiser.h @@ -23,8 +23,7 @@ */ -#ifndef VISUALISER_H_INCLUDED -#define VISUALISER_H_INCLUDED +#pragma once class NoteComponent : public Component @@ -248,6 +247,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Visualiser) }; - - -#endif // VISUALISER_H_INCLUDED diff --git a/examples/MPETest/Source/ZoneColourPicker.h b/examples/MPETest/Source/ZoneColourPicker.h index 3f6b48fe3c..3460fe0ca2 100644 --- a/examples/MPETest/Source/ZoneColourPicker.h +++ b/examples/MPETest/Source/ZoneColourPicker.h @@ -23,8 +23,7 @@ */ -#ifndef ZONECOLOURPICKER_H_INCLUDED -#define ZONECOLOURPICKER_H_INCLUDED +#pragma once class ZoneColourPicker @@ -88,6 +87,3 @@ private: MPEZoneLayout zoneLayout; bool legacyModeEnabled; }; - - -#endif // ZONECOLOURPICKER_H_INCLUDED diff --git a/examples/MPETest/Source/ZoneLayoutComponent.h b/examples/MPETest/Source/ZoneLayoutComponent.h index 3de2e01fcf..e343a63f5b 100644 --- a/examples/MPETest/Source/ZoneLayoutComponent.h +++ b/examples/MPETest/Source/ZoneLayoutComponent.h @@ -23,8 +23,7 @@ */ -#ifndef ZONELAYOUTCOMPONENT_H_INCLUDED -#define ZONELAYOUTCOMPONENT_H_INCLUDED +#pragma once class ZoneLayoutComponent : public Component, @@ -149,6 +148,3 @@ private: Range legacyModeChannelRange = { 1, 17 }; const int numMidiChannels = 16; }; - - -#endif // ZONELAYOUTCOMPONENT_H_INCLUDED diff --git a/examples/MidiTest/JuceLibraryCode/AppConfig.h b/examples/MidiTest/JuceLibraryCode/AppConfig.h index b2253aa42a..fc90d3fd0f 100644 --- a/examples/MidiTest/JuceLibraryCode/AppConfig.h +++ b/examples/MidiTest/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_WHE0AY__ -#define __JUCE_APPCONFIG_WHE0AY__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -200,6 +199,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_WHE0AY__ diff --git a/examples/MidiTest/JuceLibraryCode/JuceHeader.h b/examples/MidiTest/JuceLibraryCode/JuceHeader.h index d0075dc86c..4166239051 100644 --- a/examples/MidiTest/JuceLibraryCode/JuceHeader.h +++ b/examples/MidiTest/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_WHE0AY__ -#define __APPHEADERFILE_WHE0AY__ +#pragma once #include "AppConfig.h" @@ -42,5 +41,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_WHE0AY__ diff --git a/examples/MidiTest/Source/MainComponent.h b/examples/MidiTest/Source/MainComponent.h index 904ca8365f..3771b8a344 100644 --- a/examples/MidiTest/Source/MainComponent.h +++ b/examples/MidiTest/Source/MainComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCE_MIDITEST_MAINCOMPONENT_H -#define JUCE_MIDITEST_MAINCOMPONENT_H +#pragma once #include "JuceHeader.h" @@ -95,5 +94,3 @@ private: //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent) }; - -#endif // JUCE_MIDITEST_MAINCOMPONENT_H diff --git a/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h b/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h index 7a605dd2de..f91d2c5d77 100644 --- a/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_GWI5IR__ -#define __JUCE_APPCONFIG_GWI5IR__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -203,6 +202,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_GWI5IR__ diff --git a/examples/NetworkGraphicsDemo/JuceLibraryCode/BinaryData.h b/examples/NetworkGraphicsDemo/JuceLibraryCode/BinaryData.h index 5a7a9e045f..89e6cc9e73 100644 --- a/examples/NetworkGraphicsDemo/JuceLibraryCode/BinaryData.h +++ b/examples/NetworkGraphicsDemo/JuceLibraryCode/BinaryData.h @@ -4,8 +4,7 @@ */ -#ifndef BINARYDATA_H_78586917_INCLUDED -#define BINARYDATA_H_78586917_INCLUDED +#pragma once namespace BinaryData { @@ -22,5 +21,3 @@ namespace BinaryData // return the corresponding data and its size (or a null pointer if the name isn't found). const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw(); } - -#endif diff --git a/examples/NetworkGraphicsDemo/JuceLibraryCode/JuceHeader.h b/examples/NetworkGraphicsDemo/JuceLibraryCode/JuceHeader.h index 4d957d350c..6e79f5e96f 100644 --- a/examples/NetworkGraphicsDemo/JuceLibraryCode/JuceHeader.h +++ b/examples/NetworkGraphicsDemo/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_GWI5IR__ -#define __APPHEADERFILE_GWI5IR__ +#pragma once #include "AppConfig.h" @@ -46,5 +45,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_GWI5IR__ diff --git a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h index 276f314026..9e97df612e 100644 --- a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_IHMIKJ__ -#define __JUCE_APPCONFIG_IHMIKJ__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -211,6 +210,3 @@ #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA #endif - - -#endif // __JUCE_APPCONFIG_IHMIKJ__ diff --git a/examples/OSCMonitor/JuceLibraryCode/JuceHeader.h b/examples/OSCMonitor/JuceLibraryCode/JuceHeader.h index 422cbb85c3..dc65504d22 100644 --- a/examples/OSCMonitor/JuceLibraryCode/JuceHeader.h +++ b/examples/OSCMonitor/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_IHMIKJ__ -#define __APPHEADERFILE_IHMIKJ__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_IHMIKJ__ diff --git a/examples/OSCMonitor/Source/MainComponent.h b/examples/OSCMonitor/Source/MainComponent.h index 9d6976bd19..263b28c49f 100644 --- a/examples/OSCMonitor/Source/MainComponent.h +++ b/examples/OSCMonitor/Source/MainComponent.h @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" #include "OSCLogListBox.h" @@ -214,6 +213,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent) }; - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/OSCMonitor/Source/OSCLogListBox.h b/examples/OSCMonitor/Source/OSCLogListBox.h index 6580e5f9a4..2cd8fad7de 100644 --- a/examples/OSCMonitor/Source/OSCLogListBox.h +++ b/examples/OSCMonitor/Source/OSCLogListBox.h @@ -26,8 +26,7 @@ ============================================================================== */ -#ifndef OSCLOGLISTBOX_H_INCLUDED -#define OSCLOGLISTBOX_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" @@ -178,6 +177,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OSCLogListBox) }; - - -#endif // OSCLOGLISTBOX_H_INCLUDED diff --git a/examples/OSCReceiver/JuceLibraryCode/AppConfig.h b/examples/OSCReceiver/JuceLibraryCode/AppConfig.h index 657f49f795..f683946a7f 100644 --- a/examples/OSCReceiver/JuceLibraryCode/AppConfig.h +++ b/examples/OSCReceiver/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_PDOCPT__ -#define __JUCE_APPCONFIG_PDOCPT__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -117,6 +116,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_PDOCPT__ diff --git a/examples/OSCReceiver/JuceLibraryCode/JuceHeader.h b/examples/OSCReceiver/JuceLibraryCode/JuceHeader.h index d6e282a333..e2aeee611c 100644 --- a/examples/OSCReceiver/JuceLibraryCode/JuceHeader.h +++ b/examples/OSCReceiver/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_PDOCPT__ -#define __APPHEADERFILE_PDOCPT__ +#pragma once #include "AppConfig.h" @@ -39,5 +38,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_PDOCPT__ diff --git a/examples/OSCReceiver/Source/MainComponent.h b/examples/OSCReceiver/Source/MainComponent.h index b9d90fc28c..7f9c24bab7 100644 --- a/examples/OSCReceiver/Source/MainComponent.h +++ b/examples/OSCReceiver/Source/MainComponent.h @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" @@ -64,6 +63,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent) }; - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/OSCSender/JuceLibraryCode/AppConfig.h b/examples/OSCSender/JuceLibraryCode/AppConfig.h index 55cb2ee951..4cbcd96ab5 100644 --- a/examples/OSCSender/JuceLibraryCode/AppConfig.h +++ b/examples/OSCSender/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_RYSVAR__ -#define __JUCE_APPCONFIG_RYSVAR__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -104,6 +103,3 @@ #ifndef JUCE_USE_XCURSOR //#define JUCE_USE_XCURSOR #endif - - -#endif // __JUCE_APPCONFIG_RYSVAR__ diff --git a/examples/OSCSender/JuceLibraryCode/JuceHeader.h b/examples/OSCSender/JuceLibraryCode/JuceHeader.h index 2e2c99ba4d..43fbb15f9b 100644 --- a/examples/OSCSender/JuceLibraryCode/JuceHeader.h +++ b/examples/OSCSender/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_RYSVAR__ -#define __APPHEADERFILE_RYSVAR__ +#pragma once #include "AppConfig.h" @@ -37,5 +36,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_RYSVAR__ diff --git a/examples/OSCSender/Source/MainComponent.h b/examples/OSCSender/Source/MainComponent.h index 85997bb344..93436ec8d5 100644 --- a/examples/OSCSender/Source/MainComponent.h +++ b/examples/OSCSender/Source/MainComponent.h @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" @@ -64,6 +63,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent) }; - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h index 19d9f45227..1363e66e20 100644 --- a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_C3KRLE__ -#define __JUCE_APPCONFIG_C3KRLE__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -210,6 +209,3 @@ #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA #endif - - -#endif // __JUCE_APPCONFIG_C3KRLE__ diff --git a/examples/OpenGLAppExample/JuceLibraryCode/BinaryData.h b/examples/OpenGLAppExample/JuceLibraryCode/BinaryData.h index 470f5ff3bb..2048cb6989 100644 --- a/examples/OpenGLAppExample/JuceLibraryCode/BinaryData.h +++ b/examples/OpenGLAppExample/JuceLibraryCode/BinaryData.h @@ -4,8 +4,7 @@ */ -#ifndef BINARYDATA_H_65160528_INCLUDED -#define BINARYDATA_H_65160528_INCLUDED +#pragma once namespace BinaryData { @@ -22,5 +21,3 @@ namespace BinaryData // return the corresponding data and its size (or a null pointer if the name isn't found). const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw(); } - -#endif diff --git a/examples/OpenGLAppExample/JuceLibraryCode/JuceHeader.h b/examples/OpenGLAppExample/JuceLibraryCode/JuceHeader.h index b79be6e1f8..d6cb990e6f 100644 --- a/examples/OpenGLAppExample/JuceLibraryCode/JuceHeader.h +++ b/examples/OpenGLAppExample/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_C3KRLE__ -#define __APPHEADERFILE_C3KRLE__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_C3KRLE__ diff --git a/examples/OpenGLAppExample/Source/MainComponent.cpp b/examples/OpenGLAppExample/Source/MainComponent.cpp index cb3ae610c3..a6b803bdac 100644 --- a/examples/OpenGLAppExample/Source/MainComponent.cpp +++ b/examples/OpenGLAppExample/Source/MainComponent.cpp @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" #include "Resources/WavefrontObjParser.h" @@ -390,6 +389,3 @@ private: // (This function is called by the app startup code to create our main component) Component* createMainContentComponent() { return new MainContentComponent(); } - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h b/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h index 004454641d..fc90d3fd0f 100644 --- a/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_JKHEJM__ -#define __JUCE_APPCONFIG_JKHEJM__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -200,6 +199,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_JKHEJM__ diff --git a/examples/PluckedStringsDemo/JuceLibraryCode/JuceHeader.h b/examples/PluckedStringsDemo/JuceLibraryCode/JuceHeader.h index 40f73ab9ae..4943bbb143 100644 --- a/examples/PluckedStringsDemo/JuceLibraryCode/JuceHeader.h +++ b/examples/PluckedStringsDemo/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_JKHEJM__ -#define __APPHEADERFILE_JKHEJM__ +#pragma once #include "AppConfig.h" @@ -42,5 +41,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_JKHEJM__ diff --git a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h index e970c4ce52..0b3f0be0f2 100644 --- a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_NXASZK__ -#define __JUCE_APPCONFIG_NXASZK__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -223,7 +222,6 @@ //#define JUCE_USE_CAMERA #endif - //============================================================================== // Audio plugin settings.. @@ -350,5 +348,3 @@ #ifndef JucePlugin_AAXDisableMultiMono #define JucePlugin_AAXDisableMultiMono 0 #endif - -#endif // __JUCE_APPCONFIG_NXASZK__ diff --git a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/JuceHeader.h b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/JuceHeader.h index 1c2c57578e..8319e70dbf 100644 --- a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/JuceHeader.h +++ b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_NXASZK__ -#define __APPHEADERFILE_NXASZK__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_NXASZK__ diff --git a/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj b/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj index 136f852774..d4d0d8857d 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj @@ -2895,7 +2895,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; @@ -2932,7 +2932,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; @@ -2968,7 +2968,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST3.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; @@ -3005,7 +3005,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST3.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; @@ -3041,7 +3041,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AU.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; LIBRARY_STYLE = Bundle; @@ -3079,7 +3079,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AU.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; LIBRARY_STYLE = Bundle; @@ -3114,7 +3114,7 @@ "JucePlugin_Build_Standalone=0", "JUCE_SHARED_CODE=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -3145,7 +3145,7 @@ "JUCE_SHARED_CODE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../../modules", "$(inherited)"); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; diff --git a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h index 10cd7a7825..a9edd6db09 100644 --- a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_JXBTGS__ -#define __JUCE_APPCONFIG_JXBTGS__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -223,7 +222,6 @@ //#define JUCE_USE_CAMERA #endif - //============================================================================== // Audio plugin settings.. @@ -350,5 +348,3 @@ #ifndef JucePlugin_AAXDisableMultiMono #define JucePlugin_AAXDisableMultiMono 0 #endif - -#endif // __JUCE_APPCONFIG_JXBTGS__ diff --git a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/JuceHeader.h b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/JuceHeader.h index 18f258d502..cf73a08263 100644 --- a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/JuceHeader.h +++ b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_JXBTGS__ -#define __APPHEADERFILE_JXBTGS__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_JXBTGS__ diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj b/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj index ba0ceac581..7163cfe876 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj @@ -2912,7 +2912,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; @@ -2949,7 +2949,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; @@ -2985,7 +2985,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST3.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; @@ -3022,7 +3022,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST3.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; @@ -3058,7 +3058,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AAX.plist; INSTALL_PATH = "/Library/Application Support/Avid/Audio/Plug-Ins/"; LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"$(HOME)/SDKs/AAX/Libs/Debug\""); @@ -3096,7 +3096,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AAX.plist; INSTALL_PATH = "/Library/Application Support/Avid/Audio/Plug-Ins/"; LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"$(HOME)/SDKs/AAX/Libs/Release\""); @@ -3133,7 +3133,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AU.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; LIBRARY_STYLE = Bundle; @@ -3171,7 +3171,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AU.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; LIBRARY_STYLE = Bundle; @@ -3206,7 +3206,7 @@ "JucePlugin_Build_Standalone=0", "JUCE_SHARED_CODE=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -3237,7 +3237,7 @@ "JUCE_SHARED_CODE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; diff --git a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h index 559b0c061e..39ea20c63b 100644 --- a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_CBHSOE__ -#define __JUCE_APPCONFIG_CBHSOE__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -223,7 +222,6 @@ //#define JUCE_USE_CAMERA #endif - //============================================================================== // Audio plugin settings.. @@ -350,5 +348,3 @@ #ifndef JucePlugin_AAXDisableMultiMono #define JucePlugin_AAXDisableMultiMono 0 #endif - -#endif // __JUCE_APPCONFIG_CBHSOE__ diff --git a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/BinaryData.h b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/BinaryData.h index b54d59292f..25f7bee1a4 100644 --- a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/BinaryData.h +++ b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/BinaryData.h @@ -4,8 +4,7 @@ */ -#ifndef BINARYDATA_H_131838240_INCLUDED -#define BINARYDATA_H_131838240_INCLUDED +#pragma once namespace BinaryData { @@ -22,5 +21,3 @@ namespace BinaryData // return the corresponding data and its size (or a null pointer if the name isn't found). const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw(); } - -#endif diff --git a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/JuceHeader.h b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/JuceHeader.h index 6eafb527c1..9ea2b1c146 100644 --- a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/JuceHeader.h +++ b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_CBHSOE__ -#define __APPHEADERFILE_CBHSOE__ +#pragma once #include "AppConfig.h" @@ -46,5 +45,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_CBHSOE__ diff --git a/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj b/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj index dcab37e1aa..bcd03cdb9d 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj @@ -2903,7 +2903,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; @@ -2940,7 +2940,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; @@ -2976,7 +2976,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST3.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; @@ -3013,7 +3013,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST3.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; @@ -3049,7 +3049,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AAX.plist; INSTALL_PATH = "/Library/Application Support/Avid/Audio/Plug-Ins/"; LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"$(HOME)/SDKs/AAX/Libs/Debug\""); @@ -3087,7 +3087,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AAX.plist; INSTALL_PATH = "/Library/Application Support/Avid/Audio/Plug-Ins/"; LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"$(HOME)/SDKs/AAX/Libs/Release\""); @@ -3124,7 +3124,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AU.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; LIBRARY_STYLE = Bundle; @@ -3162,7 +3162,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AU.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; LIBRARY_STYLE = Bundle; @@ -3197,7 +3197,7 @@ "JucePlugin_Build_Standalone=0", "JUCE_SHARED_CODE=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -3228,7 +3228,7 @@ "JUCE_SHARED_CODE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; diff --git a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h index f6f256fe27..80b2524163 100644 --- a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_KMYCMO__ -#define __JUCE_APPCONFIG_KMYCMO__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -223,7 +222,6 @@ //#define JUCE_USE_CAMERA #endif - //============================================================================== // Audio plugin settings.. @@ -350,5 +348,3 @@ #ifndef JucePlugin_AAXDisableMultiMono #define JucePlugin_AAXDisableMultiMono 0 #endif - -#endif // __JUCE_APPCONFIG_KMYCMO__ diff --git a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/JuceHeader.h b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/JuceHeader.h index 3432c50435..514789fc1e 100644 --- a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/JuceHeader.h +++ b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_KMYCMO__ -#define __APPHEADERFILE_KMYCMO__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_KMYCMO__ diff --git a/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj b/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj index 427e01507d..b161a44f0a 100644 --- a/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj @@ -2906,7 +2906,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; @@ -2944,7 +2944,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST/"; LIBRARY_STYLE = Bundle; @@ -2981,7 +2981,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST3.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; @@ -3019,7 +3019,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-VST3.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/VST3/"; LIBRARY_STYLE = Bundle; @@ -3056,7 +3056,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AAX.plist; INSTALL_PATH = "/Library/Application Support/Avid/Audio/Plug-Ins/"; LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"$(HOME)/SDKs/AAX/Libs/Debug\""); @@ -3095,7 +3095,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AAX.plist; INSTALL_PATH = "/Library/Application Support/Avid/Audio/Plug-Ins/"; LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"$(HOME)/SDKs/AAX/Libs/Release\""); @@ -3133,7 +3133,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AU.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; LIBRARY_STYLE = Bundle; @@ -3172,7 +3172,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-AU.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; LIBRARY_STYLE = Bundle; @@ -3208,7 +3208,7 @@ "JucePlugin_Build_Standalone=0", "JUCE_SHARED_CODE=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -3240,7 +3240,7 @@ "JUCE_SHARED_CODE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "~/SDKs/AAX", "~/SDKs/AAX/Interfaces", "~/SDKs/AAX/Interfaces/ACF", "../../../../../modules", "$(inherited)"); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; diff --git a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h index 87a033eb36..3bd83be04c 100644 --- a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_S8Q71Q__ -#define __JUCE_APPCONFIG_S8Q71Q__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -223,7 +222,6 @@ //#define JUCE_USE_CAMERA #endif - //============================================================================== // Audio plugin settings.. @@ -350,5 +348,3 @@ #ifndef JucePlugin_AAXDisableMultiMono #define JucePlugin_AAXDisableMultiMono 0 #endif - -#endif // __JUCE_APPCONFIG_S8Q71Q__ diff --git a/examples/PlugInSamples/Surround/JuceLibraryCode/JuceHeader.h b/examples/PlugInSamples/Surround/JuceLibraryCode/JuceHeader.h index 75dec1bbdf..6145fde7b1 100644 --- a/examples/PlugInSamples/Surround/JuceLibraryCode/JuceHeader.h +++ b/examples/PlugInSamples/Surround/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_S8Q71Q__ -#define __APPHEADERFILE_S8Q71Q__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_S8Q71Q__ diff --git a/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h b/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h index 23e7e294a7..fc90d3fd0f 100644 --- a/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h +++ b/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_CGCXPD__ -#define __JUCE_APPCONFIG_CGCXPD__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -200,6 +199,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_CGCXPD__ diff --git a/examples/SimpleFFTExample/JuceLibraryCode/JuceHeader.h b/examples/SimpleFFTExample/JuceLibraryCode/JuceHeader.h index 5f3d584e71..a64e454cf5 100644 --- a/examples/SimpleFFTExample/JuceLibraryCode/JuceHeader.h +++ b/examples/SimpleFFTExample/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_CGCXPD__ -#define __APPHEADERFILE_CGCXPD__ +#pragma once #include "AppConfig.h" @@ -42,5 +41,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_CGCXPD__ diff --git a/examples/audio plugin demo/JuceLibraryCode/AppConfig.h b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h index ba8e6e6802..82a4b9174e 100644 --- a/examples/audio plugin demo/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_0NRD9LLGO__ -#define __JUCE_APPCONFIG_0NRD9LLGO__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -213,7 +212,6 @@ //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - //============================================================================== // Audio plugin settings.. @@ -340,5 +338,3 @@ #ifndef JucePlugin_AAXDisableMultiMono #define JucePlugin_AAXDisableMultiMono 0 #endif - -#endif // __JUCE_APPCONFIG_0NRD9LLGO__ diff --git a/examples/audio plugin demo/JuceLibraryCode/JuceHeader.h b/examples/audio plugin demo/JuceLibraryCode/JuceHeader.h index 1b11ea89d6..dec8914b2f 100644 --- a/examples/audio plugin demo/JuceLibraryCode/JuceHeader.h +++ b/examples/audio plugin demo/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_0NRD9LLGO__ -#define __APPHEADERFILE_0NRD9LLGO__ +#pragma once #include "AppConfig.h" @@ -43,5 +42,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_0NRD9LLGO__ diff --git a/examples/audio plugin demo/Source/PluginEditor.h b/examples/audio plugin demo/Source/PluginEditor.h index 5ba46d5bf0..56f8d2f299 100644 --- a/examples/audio plugin demo/Source/PluginEditor.h +++ b/examples/audio plugin demo/Source/PluginEditor.h @@ -8,8 +8,7 @@ ============================================================================== */ -#ifndef __PLUGINEDITOR_H_4ACCBAA__ -#define __PLUGINEDITOR_H_4ACCBAA__ +#pragma once #include "../JuceLibraryCode/JuceHeader.h" #include "PluginProcessor.h" @@ -45,6 +44,3 @@ private: void updateTimecodeDisplay (AudioPlayHead::CurrentPositionInfo); }; - - -#endif // __PLUGINEDITOR_H_4ACCBAA__ diff --git a/examples/audio plugin demo/Source/PluginProcessor.h b/examples/audio plugin demo/Source/PluginProcessor.h index eea25f9bf2..52451589c6 100644 --- a/examples/audio plugin demo/Source/PluginProcessor.h +++ b/examples/audio plugin demo/Source/PluginProcessor.h @@ -8,8 +8,7 @@ ============================================================================== */ -#ifndef __PLUGINPROCESSOR_H_526ED7A9__ -#define __PLUGINPROCESSOR_H_526ED7A9__ +#pragma once #include "../JuceLibraryCode/JuceHeader.h" @@ -110,5 +109,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JuceDemoPluginAudioProcessor) }; - -#endif // __PLUGINPROCESSOR_H_526ED7A9__ diff --git a/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj b/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj index b0463e6214..9531c664af 100644 --- a/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj +++ b/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj @@ -2744,7 +2744,7 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-App.plist; INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -2775,7 +2775,7 @@ "JucePlugin_Build_Standalone=0", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ("\"/Users/ROLIEngineer/Documents/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); + HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-App.plist; INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.5; diff --git a/examples/audio plugin host/JuceLibraryCode/AppConfig.h b/examples/audio plugin host/JuceLibraryCode/AppConfig.h index cd41523e66..6c7eabcfcf 100644 --- a/examples/audio plugin host/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin host/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_NTE0XB0IJ__ -#define __JUCE_APPCONFIG_NTE0XB0IJ__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -222,6 +221,3 @@ #ifndef JUCE_USE_CAMERA #define JUCE_USE_CAMERA 0 #endif - - -#endif // __JUCE_APPCONFIG_NTE0XB0IJ__ diff --git a/examples/audio plugin host/JuceLibraryCode/JuceHeader.h b/examples/audio plugin host/JuceLibraryCode/JuceHeader.h index d2ab4caeae..f1755362da 100644 --- a/examples/audio plugin host/JuceLibraryCode/JuceHeader.h +++ b/examples/audio plugin host/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_NTE0XB0IJ__ -#define __APPHEADERFILE_NTE0XB0IJ__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_NTE0XB0IJ__ diff --git a/examples/audio plugin host/Source/FilterGraph.h b/examples/audio plugin host/Source/FilterGraph.h index 15b499f563..6008918443 100644 --- a/examples/audio plugin host/Source/FilterGraph.h +++ b/examples/audio plugin host/Source/FilterGraph.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef __FILTERGRAPH_JUCEHEADER__ -#define __FILTERGRAPH_JUCEHEADER__ +#pragma once class FilterInGraph; class FilterGraph; @@ -117,6 +116,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FilterGraph) }; - - -#endif // __FILTERGRAPH_JUCEHEADER__ diff --git a/examples/audio plugin host/Source/FilterIOConfiguration.h b/examples/audio plugin host/Source/FilterIOConfiguration.h index 4c0d4cbebf..7e03ed4d76 100644 --- a/examples/audio plugin host/Source/FilterIOConfiguration.h +++ b/examples/audio plugin host/Source/FilterIOConfiguration.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef FILTERIOCONFIGURATION_H_INCLUDED -#define FILTERIOCONFIGURATION_H_INCLUDED +#pragma once #include "FilterGraph.h" @@ -60,6 +59,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FilterIOConfigurationWindow) }; - - -#endif // FILTERIOCONFIGURATION_H_INCLUDED diff --git a/examples/audio plugin host/Source/GraphEditorPanel.h b/examples/audio plugin host/Source/GraphEditorPanel.h index 6a5f98680d..a0760f0468 100644 --- a/examples/audio plugin host/Source/GraphEditorPanel.h +++ b/examples/audio plugin host/Source/GraphEditorPanel.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef __GRAPHEDITORPANEL_JUCEHEADER__ -#define __GRAPHEDITORPANEL_JUCEHEADER__ +#pragma once #include "FilterGraph.h" @@ -169,6 +168,3 @@ inline String toString (PluginWindow::WindowFormatType type) inline String getLastXProp (PluginWindow::WindowFormatType type) { return "uiLastX_" + toString (type); } inline String getLastYProp (PluginWindow::WindowFormatType type) { return "uiLastY_" + toString (type); } inline String getOpenProp (PluginWindow::WindowFormatType type) { return "uiopen_" + toString (type); } - - -#endif // __GRAPHEDITORPANEL_JUCEHEADER__ diff --git a/examples/audio plugin host/Source/InternalFilters.h b/examples/audio plugin host/Source/InternalFilters.h index 1a1a16424e..859ef73e2b 100644 --- a/examples/audio plugin host/Source/InternalFilters.h +++ b/examples/audio plugin host/Source/InternalFilters.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef __INTERNALFILTERS_JUCEHEADER__ -#define __INTERNALFILTERS_JUCEHEADER__ +#pragma once #include "FilterGraph.h" @@ -78,6 +77,3 @@ private: PluginDescription audioOutDesc; PluginDescription midiInDesc; }; - - -#endif // __INTERNALFILTERS_JUCEHEADER__ diff --git a/examples/audio plugin host/Source/MainHostWindow.h b/examples/audio plugin host/Source/MainHostWindow.h index fe4fda2b8d..6470a874ea 100644 --- a/examples/audio plugin host/Source/MainHostWindow.h +++ b/examples/audio plugin host/Source/MainHostWindow.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef __MAINHOSTWINDOW_JUCEHEADER__ -#define __MAINHOSTWINDOW_JUCEHEADER__ +#pragma once #include "FilterGraph.h" #include "GraphEditorPanel.h" @@ -108,6 +107,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainHostWindow) }; - - -#endif // __MAINHOSTWINDOW_JUCEHEADER__ diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h index 433c658b0c..fc90d3fd0f 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h +++ b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_AKFC5M__ -#define __JUCE_APPCONFIG_AKFC5M__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -200,6 +199,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_AKFC5M__ diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/JuceHeader.h b/extras/AudioPerformanceTest/JuceLibraryCode/JuceHeader.h index dbcc6eff10..b4ce63a878 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/JuceHeader.h +++ b/extras/AudioPerformanceTest/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_AKFC5M__ -#define __APPHEADERFILE_AKFC5M__ +#pragma once #include "AppConfig.h" @@ -42,5 +41,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_AKFC5M__ diff --git a/extras/AudioPerformanceTest/Source/MainComponent.h b/extras/AudioPerformanceTest/Source/MainComponent.h index cf35038f4e..ad8797322a 100644 --- a/extras/AudioPerformanceTest/Source/MainComponent.h +++ b/extras/AudioPerformanceTest/Source/MainComponent.h @@ -26,8 +26,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once #include "../JuceLibraryCode/JuceHeader.h" #include @@ -279,6 +278,3 @@ private: // (This function is called by the app startup code to create our main component) Component* createMainContentComponent() { return new MainContentComponent(); } - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/extras/BLOCKS/standalone_sdk/SDK/BlocksHeader.h b/extras/BLOCKS/standalone_sdk/SDK/BlocksHeader.h index e3aba25337..b7c0aabf23 100644 --- a/extras/BLOCKS/standalone_sdk/SDK/BlocksHeader.h +++ b/extras/BLOCKS/standalone_sdk/SDK/BlocksHeader.h @@ -1,5 +1,4 @@ -#ifndef JUCEHEADER_INCLUDED -#define JUCEHEADER_INCLUDED +#pragma once #ifndef JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED #define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 @@ -14,5 +13,3 @@ #include #include #include - -#endif // JUCEHEADER_INCLUDED diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/BlockFinder.h b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/BlockFinder.h index ba03c41f2f..3e9234d38a 100644 --- a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/BlockFinder.h +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/BlockFinder.h @@ -1,5 +1,4 @@ -#ifndef BLOCKFINDER_INCLUDED -#define BLOCKFINDER_INCLUDED +#pragma once #include @@ -19,5 +18,3 @@ private: // The PhysicalTopologySource member variable which reports BLOCKS changes. juce::PhysicalTopologySource pts; }; - -#endif // BLOCKFINDER_INCLUDED diff --git a/extras/Projucer/JuceLibraryCode/AppConfig.h b/extras/Projucer/JuceLibraryCode/AppConfig.h index f48f6cdf9f..37fabb966b 100644 --- a/extras/Projucer/JuceLibraryCode/AppConfig.h +++ b/extras/Projucer/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_M70QFTRRK__ -#define __JUCE_APPCONFIG_M70QFTRRK__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -116,6 +115,3 @@ #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR #endif - - -#endif // __JUCE_APPCONFIG_M70QFTRRK__ diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp index 5a6932aa5d..b661a70f49 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp +++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp @@ -1239,8 +1239,7 @@ static const unsigned char temp_binary_data_4[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#ifndef MAINCOMPONENT_H_INCLUDED\r\n" -"#define MAINCOMPONENT_H_INCLUDED\r\n" +"#pragma once\r\n" "\r\n" "INCLUDE_JUCE\r\n" "\r\n" @@ -1298,10 +1297,7 @@ static const unsigned char temp_binary_data_4[] = "\r\n" "\r\n" "// (This function is called by the app startup code to create our main component)\r\n" -"Component* createMainContentComponent() { return new MainContentComponent(); }\r\n" -"\r\n" -"\r\n" -"#endif // MAINCOMPONENT_H_INCLUDED\r\n"; +"Component* createMainContentComponent() { return new MainContentComponent(); }\r\n"; const char* jucer_AnimatedComponentTemplate_cpp = (const char*) temp_binary_data_4; @@ -1315,8 +1311,7 @@ static const unsigned char temp_binary_data_5[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#ifndef MAINCOMPONENT_H_INCLUDED\r\n" -"#define MAINCOMPONENT_H_INCLUDED\r\n" +"#pragma once\r\n" "\r\n" "INCLUDE_JUCE\r\n" "\r\n" @@ -1402,10 +1397,7 @@ static const unsigned char temp_binary_data_5[] = "\r\n" "\r\n" "// (This function is called by the app startup code to create our main component)\r\n" -"Component* createMainContentComponent() { return new MainContentComponent(); }\r\n" -"\r\n" -"\r\n" -"#endif // MAINCOMPONENT_H_INCLUDED\r\n"; +"Component* createMainContentComponent() { return new MainContentComponent(); }\r\n"; const char* jucer_AudioComponentTemplate_cpp = (const char*) temp_binary_data_5; @@ -1467,8 +1459,7 @@ static const unsigned char temp_binary_data_7[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#ifndef HEADERGUARD\r\n" -"#define HEADERGUARD\r\n" +"#pragma once\r\n" "\r\n" "EDITORHEADERS\r\n" "\r\n" @@ -1492,10 +1483,7 @@ static const unsigned char temp_binary_data_7[] = " FILTERCLASSNAME& processor;\r\n" "\r\n" " JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (EDITORCLASSNAME)\r\n" -"};\r\n" -"\r\n" -"\r\n" -"#endif // HEADERGUARD\r\n"; +"};\r\n"; const char* jucer_AudioPluginEditorTemplate_h = (const char*) temp_binary_data_7; @@ -1693,8 +1681,7 @@ static const unsigned char temp_binary_data_9[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#ifndef HEADERGUARD\r\n" -"#define HEADERGUARD\r\n" +"#pragma once\r\n" "\r\n" "APPHEADERS\r\n" "\r\n" @@ -1744,10 +1731,7 @@ static const unsigned char temp_binary_data_9[] = "private:\r\n" " //==============================================================================\r\n" " JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FILTERCLASSNAME)\r\n" -"};\r\n" -"\r\n" -"\r\n" -"#endif // HEADERGUARD\r\n"; +"};\r\n"; const char* jucer_AudioPluginFilterTemplate_h = (const char*) temp_binary_data_9; @@ -1851,8 +1835,7 @@ static const unsigned char temp_binary_data_11[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#ifndef %%headerGuard%%\r\n" -"#define %%headerGuard%%\r\n" +"#pragma once\r\n" "\r\n" "//[Headers] -- You can add your own extra header files here --\r\n" "%%includeJUCEHeader%%\r\n" @@ -1893,9 +1876,7 @@ static const unsigned char temp_binary_data_11[] = "};\r\n" "\r\n" "//[EndFile] You can add extra defines here...\r\n" -"//[/EndFile]\r\n" -"\r\n" -"#endif // %%headerGuard%%\r\n"; +"//[/EndFile]\r\n"; const char* jucer_ComponentTemplate_h = (const char*) temp_binary_data_11; @@ -1950,8 +1931,7 @@ static const unsigned char temp_binary_data_13[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#ifndef HEADERGUARD\r\n" -"#define HEADERGUARD\r\n" +"#pragma once\r\n" "\r\n" "INCLUDE_JUCE\r\n" "\r\n" @@ -1974,10 +1954,7 @@ static const unsigned char temp_binary_data_13[] = "private:\r\n" " //==============================================================================\r\n" " JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS)\r\n" -"};\r\n" -"\r\n" -"\r\n" -"#endif // HEADERGUARD\r\n"; +"};\r\n"; const char* jucer_ContentCompTemplate_h = (const char*) temp_binary_data_13; @@ -2392,8 +2369,7 @@ static const unsigned char temp_binary_data_20[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#ifndef HEADERGUARD\r\n" -"#define HEADERGUARD\r\n" +"#pragma once\r\n" "\r\n" "INCLUDE_JUCE\r\n" "\r\n" @@ -2411,10 +2387,7 @@ static const unsigned char temp_binary_data_20[] = "\r\n" "private:\r\n" " JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS)\r\n" -"};\r\n" -"\r\n" -"\r\n" -"#endif // HEADERGUARD\r\n"; +"};\r\n"; const char* jucer_NewComponentTemplate_h = (const char*) temp_binary_data_20; @@ -2446,14 +2419,7 @@ static const unsigned char temp_binary_data_22[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#ifndef HEADERGUARD\r\n" -"#define HEADERGUARD\r\n" -"\r\n" -"\r\n" -"\r\n" -"\r\n" -"\r\n" -"#endif // HEADERGUARD\r\n"; +"#pragma once\r\n"; const char* jucer_NewCppFileTemplate_h = (const char*) temp_binary_data_22; @@ -2469,8 +2435,7 @@ static const unsigned char temp_binary_data_23[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#ifndef HEADERGUARD\r\n" -"#define HEADERGUARD\r\n" +"#pragma once\r\n" "\r\n" "INCLUDE_JUCE\r\n" "\r\n" @@ -2520,10 +2485,7 @@ static const unsigned char temp_binary_data_23[] = "\r\n" "private:\r\n" " JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS)\r\n" -"};\r\n" -"\r\n" -"\r\n" -"#endif // HEADERGUARD\r\n"; +"};\r\n"; const char* jucer_NewInlineComponentTemplate_h = (const char*) temp_binary_data_23; @@ -2537,8 +2499,7 @@ static const unsigned char temp_binary_data_24[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"#ifndef MAINCOMPONENT_H_INCLUDED\r\n" -"#define MAINCOMPONENT_H_INCLUDED\r\n" +"#pragma once\r\n" "\r\n" "INCLUDE_JUCE\r\n" "\r\n" @@ -2601,10 +2562,7 @@ static const unsigned char temp_binary_data_24[] = "\r\n" "\r\n" "// (This function is called by the app startup code to create our main component)\r\n" -"Component* createMainContentComponent() { return new MainContentComponent(); }\r\n" -"\r\n" -"\r\n" -"#endif // MAINCOMPONENT_H_INCLUDED\r\n"; +"Component* createMainContentComponent() { return new MainContentComponent(); }\r\n"; const char* jucer_OpenGLComponentTemplate_cpp = (const char*) temp_binary_data_24; @@ -5283,27 +5241,27 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw case 0x10b04d10: numBytes = 4971; return gradlew; case 0x76cff066: numBytes = 2404; return gradlew_bat; case 0x34bc1021: numBytes = 11325; return LICENSE; - case 0x6cf2645e: numBytes = 1949; return jucer_AnimatedComponentTemplate_cpp; - case 0xafccbd3f: numBytes = 3203; return jucer_AudioComponentTemplate_cpp; + case 0x6cf2645e: numBytes = 1854; return jucer_AnimatedComponentTemplate_cpp; + case 0xafccbd3f: numBytes = 3108; return jucer_AudioComponentTemplate_cpp; case 0x27c5a93a: numBytes = 1162; return jucer_AudioPluginEditorTemplate_cpp; - case 0x4d0721bf: numBytes = 994; return jucer_AudioPluginEditorTemplate_h; + case 0x4d0721bf: numBytes = 938; return jucer_AudioPluginEditorTemplate_h; case 0x51b49ac5: numBytes = 5475; return jucer_AudioPluginFilterTemplate_cpp; - case 0x488afa0a: numBytes = 2259; return jucer_AudioPluginFilterTemplate_h; + case 0x488afa0a: numBytes = 2203; return jucer_AudioPluginFilterTemplate_h; case 0xabad7041: numBytes = 2151; return jucer_ComponentTemplate_cpp; - case 0xfc72fe86: numBytes = 2131; return jucer_ComponentTemplate_h; + case 0xfc72fe86: numBytes = 2064; return jucer_ComponentTemplate_h; case 0x0b66646c: numBytes = 886; return jucer_ContentCompTemplate_cpp; - case 0x6fa10171: numBytes = 942; return jucer_ContentCompTemplate_h; + case 0x6fa10171: numBytes = 886; return jucer_ContentCompTemplate_h; case 0x28d496ad: numBytes = 1161; return jucer_InlineComponentTemplate_h; case 0x8905395b: numBytes = 470; return jucer_MainConsoleAppTemplate_cpp; case 0x5e5ea047: numBytes = 1992; return jucer_MainTemplate_NoWindow_cpp; case 0xda2391f8: numBytes = 4001; return jucer_MainTemplate_SimpleWindow_cpp; case 0x400bc026: numBytes = 3913; return jucer_MainTemplate_Window_cpp; case 0xf4842835: numBytes = 1389; return jucer_NewComponentTemplate_cpp; - case 0xe7bf237a: numBytes = 666; return jucer_NewComponentTemplate_h; + case 0xe7bf237a: numBytes = 610; return jucer_NewComponentTemplate_h; case 0x02a2a077: numBytes = 262; return jucer_NewCppFileTemplate_cpp; - case 0x0842c43c: numBytes = 308; return jucer_NewCppFileTemplate_h; - case 0x36e634a1: numBytes = 1644; return jucer_NewInlineComponentTemplate_h; - case 0x7fbac252: numBytes = 1827; return jucer_OpenGLComponentTemplate_cpp; + case 0x0842c43c: numBytes = 246; return jucer_NewCppFileTemplate_h; + case 0x36e634a1: numBytes = 1588; return jucer_NewInlineComponentTemplate_h; + case 0x7fbac252: numBytes = 1732; return jucer_OpenGLComponentTemplate_cpp; case 0x406db5c1: numBytes = 3117; return background_logo_svg; case 0x4a0cfd09: numBytes = 151; return background_tile_png; case 0x763d39dc: numBytes = 1050; return colourscheme_dark_xml; diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.h b/extras/Projucer/JuceLibraryCode/BinaryData.h index 9e8fe9c1e2..ebf84990ca 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.h +++ b/extras/Projucer/JuceLibraryCode/BinaryData.h @@ -4,8 +4,7 @@ */ -#ifndef BINARYDATA_H_62491730_INCLUDED -#define BINARYDATA_H_62491730_INCLUDED +#pragma once namespace BinaryData { @@ -22,34 +21,34 @@ namespace BinaryData const int LICENSESize = 11325; extern const char* jucer_AnimatedComponentTemplate_cpp; - const int jucer_AnimatedComponentTemplate_cppSize = 1949; + const int jucer_AnimatedComponentTemplate_cppSize = 1854; extern const char* jucer_AudioComponentTemplate_cpp; - const int jucer_AudioComponentTemplate_cppSize = 3203; + const int jucer_AudioComponentTemplate_cppSize = 3108; extern const char* jucer_AudioPluginEditorTemplate_cpp; const int jucer_AudioPluginEditorTemplate_cppSize = 1162; extern const char* jucer_AudioPluginEditorTemplate_h; - const int jucer_AudioPluginEditorTemplate_hSize = 994; + const int jucer_AudioPluginEditorTemplate_hSize = 938; extern const char* jucer_AudioPluginFilterTemplate_cpp; const int jucer_AudioPluginFilterTemplate_cppSize = 5475; extern const char* jucer_AudioPluginFilterTemplate_h; - const int jucer_AudioPluginFilterTemplate_hSize = 2259; + const int jucer_AudioPluginFilterTemplate_hSize = 2203; extern const char* jucer_ComponentTemplate_cpp; const int jucer_ComponentTemplate_cppSize = 2151; extern const char* jucer_ComponentTemplate_h; - const int jucer_ComponentTemplate_hSize = 2131; + const int jucer_ComponentTemplate_hSize = 2064; extern const char* jucer_ContentCompTemplate_cpp; const int jucer_ContentCompTemplate_cppSize = 886; extern const char* jucer_ContentCompTemplate_h; - const int jucer_ContentCompTemplate_hSize = 942; + const int jucer_ContentCompTemplate_hSize = 886; extern const char* jucer_InlineComponentTemplate_h; const int jucer_InlineComponentTemplate_hSize = 1161; @@ -70,19 +69,19 @@ namespace BinaryData const int jucer_NewComponentTemplate_cppSize = 1389; extern const char* jucer_NewComponentTemplate_h; - const int jucer_NewComponentTemplate_hSize = 666; + const int jucer_NewComponentTemplate_hSize = 610; extern const char* jucer_NewCppFileTemplate_cpp; const int jucer_NewCppFileTemplate_cppSize = 262; extern const char* jucer_NewCppFileTemplate_h; - const int jucer_NewCppFileTemplate_hSize = 308; + const int jucer_NewCppFileTemplate_hSize = 246; extern const char* jucer_NewInlineComponentTemplate_h; - const int jucer_NewInlineComponentTemplate_hSize = 1644; + const int jucer_NewInlineComponentTemplate_hSize = 1588; extern const char* jucer_OpenGLComponentTemplate_cpp; - const int jucer_OpenGLComponentTemplate_cppSize = 1827; + const int jucer_OpenGLComponentTemplate_cppSize = 1732; extern const char* background_logo_svg; const int background_logo_svgSize = 3117; @@ -166,5 +165,3 @@ namespace BinaryData // return the corresponding data and its size (or a null pointer if the name isn't found). const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw(); } - -#endif diff --git a/extras/Projucer/JuceLibraryCode/JuceHeader.h b/extras/Projucer/JuceLibraryCode/JuceHeader.h index 65d8fe6afa..397050e744 100644 --- a/extras/Projucer/JuceLibraryCode/JuceHeader.h +++ b/extras/Projucer/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_M70QFTRRK__ -#define __APPHEADERFILE_M70QFTRRK__ +#pragma once #include "AppConfig.h" @@ -39,5 +38,3 @@ namespace ProjectInfo const int versionNumber = 0x40301; } #endif - -#endif // __APPHEADERFILE_M70QFTRRK__ diff --git a/extras/Projucer/Source/Application/jucer_AppearanceSettings.h b/extras/Projucer/Source/Application/jucer_AppearanceSettings.h index 87fff40816..64fcb92254 100644 --- a/extras/Projucer/Source/Application/jucer_AppearanceSettings.h +++ b/extras/Projucer/Source/Application/jucer_AppearanceSettings.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_APPEARANCESETTINGS_H_INCLUDED -#define JUCER_APPEARANCESETTINGS_H_INCLUDED +#pragma once class AppearanceSettings : private ValueTree::Listener @@ -76,7 +75,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AppearanceSettings) }; - - - -#endif // JUCER_APPEARANCESETTINGS_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_Application.h b/extras/Projucer/Source/Application/jucer_Application.h index 36f4a3cf46..08dede8266 100644 --- a/extras/Projucer/Source/Application/jucer_Application.h +++ b/extras/Projucer/Source/Application/jucer_Application.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_APPLICATION_H_INCLUDED -#define JUCER_APPLICATION_H_INCLUDED +#pragma once #include "jucer_MainWindow.h" #include "../Project/jucer_Module.h" @@ -140,6 +139,3 @@ private: void handleAsyncUpdate() override; void initCommandManager(); }; - - -#endif // JUCER_APPLICATION_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_AutoUpdater.h b/extras/Projucer/Source/Application/jucer_AutoUpdater.h index 47426b428d..c0dab7f91e 100644 --- a/extras/Projucer/Source/Application/jucer_AutoUpdater.h +++ b/extras/Projucer/Source/Application/jucer_AutoUpdater.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_AUTOUPDATER_H_INCLUDED -#define JUCER_AUTOUPDATER_H_INCLUDED +#pragma once class UpdaterDialogModalCallback; @@ -103,6 +102,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LatestVersionChecker) }; - - -#endif // JUCER_AUTOUPDATER_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_CommandLine.h b/extras/Projucer/Source/Application/jucer_CommandLine.h index 44b1fda8ba..2df16228a0 100644 --- a/extras/Projucer/Source/Application/jucer_CommandLine.h +++ b/extras/Projucer/Source/Application/jucer_CommandLine.h @@ -22,13 +22,9 @@ ============================================================================== */ -#ifndef JUCER_COMMANDLINE_H_INCLUDED -#define JUCER_COMMANDLINE_H_INCLUDED +#pragma once int performCommandLine (const String& commandLine); enum { commandLineNotPerformed = 0x72346231 }; - - -#endif // JUCER_COMMANDLINE_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_CommonHeaders.h b/extras/Projucer/Source/Application/jucer_CommonHeaders.h index 9fd97dc81b..245313c2ec 100644 --- a/extras/Projucer/Source/Application/jucer_CommonHeaders.h +++ b/extras/Projucer/Source/Application/jucer_CommonHeaders.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMMONHEADERS_H_INCLUDED -#define JUCER_COMMONHEADERS_H_INCLUDED +#pragma once //============================================================================== struct TargetOS @@ -72,5 +71,3 @@ enum ColourIds { mainBackgroundColourId = 0x2340000, }; - -#endif // JUCER_COMMONHEADERS_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_DocumentEditorComponent.h b/extras/Projucer/Source/Application/jucer_DocumentEditorComponent.h index 22e263d5d1..0115448236 100644 --- a/extras/Projucer/Source/Application/jucer_DocumentEditorComponent.h +++ b/extras/Projucer/Source/Application/jucer_DocumentEditorComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_DOCUMENTEDITORCOMPONENT_H_INCLUDED -#define JUCER_DOCUMENTEDITORCOMPONENT_H_INCLUDED +#pragma once #include "jucer_OpenDocumentManager.h" @@ -51,6 +50,3 @@ protected: private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DocumentEditorComponent) }; - - -#endif // JUCER_DOCUMENTEDITORCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_DownloadCompileEngineThread.h b/extras/Projucer/Source/Application/jucer_DownloadCompileEngineThread.h index a1d5167a0e..e6be4ab8b1 100644 --- a/extras/Projucer/Source/Application/jucer_DownloadCompileEngineThread.h +++ b/extras/Projucer/Source/Application/jucer_DownloadCompileEngineThread.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_DOWNLOADCOMPILEENGINETHREAD_H_INCLUDED -#define JUCER_DOWNLOADCOMPILEENGINETHREAD_H_INCLUDED +#pragma once #include "jucer_Application.h" @@ -53,5 +52,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DownloadCompileEngineThread) }; - -#endif // JUCER_DOWNLOADCOMPILEENGINETHREAD_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_EulaDialogue.h b/extras/Projucer/Source/Application/jucer_EulaDialogue.h index c3327be6f8..496e98b888 100644 --- a/extras/Projucer/Source/Application/jucer_EulaDialogue.h +++ b/extras/Projucer/Source/Application/jucer_EulaDialogue.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef PROJUCER_EULADIALOGUE_H_INCLUDED -#define PROJUCER_EULADIALOGUE_H_INCLUDED +#pragma once class EULADialogue : public AlertWindow @@ -75,6 +74,3 @@ private: EULADialogueComponent component; ProjucerDialogLookAndFeel lookAndFeel; }; - - -#endif // PROJUCER_EULADIALOGUE_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_FilePreviewComponent.h b/extras/Projucer/Source/Application/jucer_FilePreviewComponent.h index a27ce64f28..0c98e6d672 100644 --- a/extras/Projucer/Source/Application/jucer_FilePreviewComponent.h +++ b/extras/Projucer/Source/Application/jucer_FilePreviewComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_FILEPREVIEWCOMPONENT_H_INCLUDED -#define JUCER_FILEPREVIEWCOMPONENT_H_INCLUDED +#pragma once #include "../Utility/jucer_ProjucerLookAndFeel.h" @@ -128,6 +127,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ItemPreviewComponent) }; - - -#endif // JUCER_FILEPREVIEWCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_GlobalPreferences.h b/extras/Projucer/Source/Application/jucer_GlobalPreferences.h index e9fcc14f22..8f52db6336 100644 --- a/extras/Projucer/Source/Application/jucer_GlobalPreferences.h +++ b/extras/Projucer/Source/Application/jucer_GlobalPreferences.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_GLOBALPREFERENCES_H_INCLUDED -#define JUCER_GLOBALPREFERENCES_H_INCLUDED +#pragma once //============================================================================== @@ -108,6 +107,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GlobalPreferencesComponent) }; - - -#endif // JUCER_GLOBALPREFERENCES_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_LoginForm.h b/extras/Projucer/Source/Application/jucer_LoginForm.h index 20d3963e54..72d72ffe40 100644 --- a/extras/Projucer/Source/Application/jucer_LoginForm.h +++ b/extras/Projucer/Source/Application/jucer_LoginForm.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef PROJUCER_LOGINFORM_H_INCLUDED -#define PROJUCER_LOGINFORM_H_INCLUDED +#pragma once class LoginForm : public Component, @@ -312,6 +311,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LoginForm) }; - - -#endif // PROJUCER_LOGINFORM_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_MainWindow.h b/extras/Projucer/Source/Application/jucer_MainWindow.h index d7aa244ad6..6e0f7d05f2 100644 --- a/extras/Projucer/Source/Application/jucer_MainWindow.h +++ b/extras/Projucer/Source/Application/jucer_MainWindow.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_MAINWINDOW_H_INCLUDED -#define JUCER_MAINWINDOW_H_INCLUDED +#pragma once #include "../Project/jucer_ProjectContentComponent.h" @@ -118,6 +117,3 @@ public: private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindowList) }; - - -#endif // JUCER_MAINWINDOW_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_OpenDocumentManager.h b/extras/Projucer/Source/Application/jucer_OpenDocumentManager.h index b5f8a19a49..b873e663ca 100644 --- a/extras/Projucer/Source/Application/jucer_OpenDocumentManager.h +++ b/extras/Projucer/Source/Application/jucer_OpenDocumentManager.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_OPENDOCUMENTMANAGER_H_INCLUDED -#define JUCER_OPENDOCUMENTMANAGER_H_INCLUDED +#pragma once #include "../Project/jucer_Project.h" @@ -150,6 +149,3 @@ private: Array previousDocs, nextDocs; }; - - -#endif // JUCER_OPENDOCUMENTMANAGER_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h b/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h index 9435d241d7..05b612be26 100644 --- a/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h +++ b/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef PROJUCER_PROJUCERLICENSES_H_INCLUDED -#define PROJUCER_PROJUCERLICENSES_H_INCLUDED +#pragma once //============================================================================== @@ -137,7 +136,3 @@ private: static void crashCallback (const char*) {} static void quitCallback() {} }; - - - -#endif // PROJUCER_PROJUCERLICENSES_H_INCLUDED diff --git a/extras/Projucer/Source/BinaryData/jucer_AnimatedComponentTemplate.cpp b/extras/Projucer/Source/BinaryData/jucer_AnimatedComponentTemplate.cpp index 3d1d46812a..207ffdcde2 100644 --- a/extras/Projucer/Source/BinaryData/jucer_AnimatedComponentTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/jucer_AnimatedComponentTemplate.cpp @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once INCLUDE_JUCE @@ -66,6 +65,3 @@ private: // (This function is called by the app startup code to create our main component) Component* createMainContentComponent() { return new MainContentComponent(); } - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/BinaryData/jucer_AudioComponentTemplate.cpp b/extras/Projucer/Source/BinaryData/jucer_AudioComponentTemplate.cpp index 60c86f9c45..a6b4e84c7c 100644 --- a/extras/Projucer/Source/BinaryData/jucer_AudioComponentTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/jucer_AudioComponentTemplate.cpp @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once INCLUDE_JUCE @@ -94,6 +93,3 @@ private: // (This function is called by the app startup code to create our main component) Component* createMainContentComponent() { return new MainContentComponent(); } - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/BinaryData/jucer_AudioPluginEditorTemplate.h b/extras/Projucer/Source/BinaryData/jucer_AudioPluginEditorTemplate.h index efc062c36c..b2a2a07fe0 100644 --- a/extras/Projucer/Source/BinaryData/jucer_AudioPluginEditorTemplate.h +++ b/extras/Projucer/Source/BinaryData/jucer_AudioPluginEditorTemplate.h @@ -8,8 +8,7 @@ ============================================================================== */ -#ifndef HEADERGUARD -#define HEADERGUARD +#pragma once EDITORHEADERS @@ -34,6 +33,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (EDITORCLASSNAME) }; - - -#endif // HEADERGUARD diff --git a/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.h b/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.h index 547d09b447..573f570b5e 100644 --- a/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.h +++ b/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.h @@ -8,8 +8,7 @@ ============================================================================== */ -#ifndef HEADERGUARD -#define HEADERGUARD +#pragma once APPHEADERS @@ -60,6 +59,3 @@ private: //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FILTERCLASSNAME) }; - - -#endif // HEADERGUARD diff --git a/extras/Projucer/Source/BinaryData/jucer_ComponentTemplate.h b/extras/Projucer/Source/BinaryData/jucer_ComponentTemplate.h index bf1b070b9e..417e8b72d3 100644 --- a/extras/Projucer/Source/BinaryData/jucer_ComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/jucer_ComponentTemplate.h @@ -17,8 +17,7 @@ ============================================================================== */ -#ifndef %%headerGuard%% -#define %%headerGuard%% +#pragma once //[Headers] -- You can add your own extra header files here -- %%includeJUCEHeader%% @@ -60,5 +59,3 @@ private: //[EndFile] You can add extra defines here... //[/EndFile] - -#endif // %%headerGuard%% diff --git a/extras/Projucer/Source/BinaryData/jucer_ContentCompTemplate.h b/extras/Projucer/Source/BinaryData/jucer_ContentCompTemplate.h index 3154105bf5..95c56e99e1 100644 --- a/extras/Projucer/Source/BinaryData/jucer_ContentCompTemplate.h +++ b/extras/Projucer/Source/BinaryData/jucer_ContentCompTemplate.h @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef HEADERGUARD -#define HEADERGUARD +#pragma once INCLUDE_JUCE @@ -31,6 +30,3 @@ private: //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS) }; - - -#endif // HEADERGUARD diff --git a/extras/Projucer/Source/BinaryData/jucer_NewComponentTemplate.h b/extras/Projucer/Source/BinaryData/jucer_NewComponentTemplate.h index 0c4126b97e..d50d9fb71c 100644 --- a/extras/Projucer/Source/BinaryData/jucer_NewComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/jucer_NewComponentTemplate.h @@ -8,8 +8,7 @@ ============================================================================== */ -#ifndef HEADERGUARD -#define HEADERGUARD +#pragma once INCLUDE_JUCE @@ -28,6 +27,3 @@ public: private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS) }; - - -#endif // HEADERGUARD diff --git a/extras/Projucer/Source/BinaryData/jucer_NewCppFileTemplate.h b/extras/Projucer/Source/BinaryData/jucer_NewCppFileTemplate.h index 1c1bdd816c..1f789d193d 100644 --- a/extras/Projucer/Source/BinaryData/jucer_NewCppFileTemplate.h +++ b/extras/Projucer/Source/BinaryData/jucer_NewCppFileTemplate.h @@ -8,11 +8,4 @@ ============================================================================== */ -#ifndef HEADERGUARD -#define HEADERGUARD - - - - - -#endif // HEADERGUARD +#pragma once diff --git a/extras/Projucer/Source/BinaryData/jucer_NewInlineComponentTemplate.h b/extras/Projucer/Source/BinaryData/jucer_NewInlineComponentTemplate.h index 1e609178fd..bd58dc0965 100644 --- a/extras/Projucer/Source/BinaryData/jucer_NewInlineComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/jucer_NewInlineComponentTemplate.h @@ -8,8 +8,7 @@ ============================================================================== */ -#ifndef HEADERGUARD -#define HEADERGUARD +#pragma once INCLUDE_JUCE @@ -60,6 +59,3 @@ public: private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS) }; - - -#endif // HEADERGUARD diff --git a/extras/Projucer/Source/BinaryData/jucer_OpenGLComponentTemplate.cpp b/extras/Projucer/Source/BinaryData/jucer_OpenGLComponentTemplate.cpp index 387639acc8..1bd40a3c79 100644 --- a/extras/Projucer/Source/BinaryData/jucer_OpenGLComponentTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/jucer_OpenGLComponentTemplate.cpp @@ -6,8 +6,7 @@ ============================================================================== */ -#ifndef MAINCOMPONENT_H_INCLUDED -#define MAINCOMPONENT_H_INCLUDED +#pragma once INCLUDE_JUCE @@ -71,6 +70,3 @@ private: // (This function is called by the app startup code to create our main component) Component* createMainContentComponent() { return new MainContentComponent(); } - - -#endif // MAINCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Code Editor/jucer_SourceCodeEditor.h b/extras/Projucer/Source/Code Editor/jucer_SourceCodeEditor.h index 62cb112b7b..8aa7952660 100644 --- a/extras/Projucer/Source/Code Editor/jucer_SourceCodeEditor.h +++ b/extras/Projucer/Source/Code Editor/jucer_SourceCodeEditor.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_SOURCECODEEDITOR_H_INCLUDED -#define JUCER_SOURCECODEEDITOR_H_INCLUDED +#pragma once #include "../Project/jucer_Project.h" #include "../Application/jucer_DocumentEditorComponent.h" @@ -238,6 +237,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CppCodeEditorComponent) }; - - -#endif // JUCER_SOURCECODEEDITOR_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentNameProperty.h b/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentNameProperty.h index 1f09623e7f..abf7864073 100644 --- a/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentNameProperty.h +++ b/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentNameProperty.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTNAMEPROPERTY_H_INCLUDED -#define JUCER_COMPONENTNAMEPROPERTY_H_INCLUDED +#pragma once #include "jucer_ComponentTypeHandler.h" #include "jucer_ComponentUndoableAction.h" @@ -177,7 +176,3 @@ private: String newName, oldName; }; }; - - - -#endif // JUCER_COMPONENTNAMEPROPERTY_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentTypeHandler.h b/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentTypeHandler.h index d43497f551..c3c8c87273 100644 --- a/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentTypeHandler.h +++ b/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentTypeHandler.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTTYPEHANDLER_H_INCLUDED -#define JUCER_COMPONENTTYPEHANDLER_H_INCLUDED +#pragma once class ComponentOverlayComponent; class ComponentLayout; @@ -138,6 +137,3 @@ protected: private: JUCE_DECLARE_NON_COPYABLE (ComponentTypeHandler) }; - - -#endif // JUCER_COMPONENTTYPEHANDLER_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentUndoableAction.h b/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentUndoableAction.h index 45e5119115..185d2aca6c 100644 --- a/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentUndoableAction.h +++ b/extras/Projucer/Source/ComponentEditor/components/jucer_ComponentUndoableAction.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTUNDOABLEACTION_H_INCLUDED -#define JUCER_COMPONENTUNDOABLEACTION_H_INCLUDED +#pragma once #include "../ui/jucer_JucerDocumentEditor.h" @@ -74,7 +73,3 @@ protected: private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ComponentUndoableAction) }; - - - -#endif // JUCER_COMPONENTUNDOABLEACTION_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/components/jucer_JucerComponentHandler.h b/extras/Projucer/Source/ComponentEditor/components/jucer_JucerComponentHandler.h index aa62953caa..b792bccb73 100644 --- a/extras/Projucer/Source/ComponentEditor/components/jucer_JucerComponentHandler.h +++ b/extras/Projucer/Source/ComponentEditor/components/jucer_JucerComponentHandler.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_JUCERCOMPONENTHANDLER_H_INCLUDED -#define JUCER_JUCERCOMPONENTHANDLER_H_INCLUDED +#pragma once #include "../ui/jucer_TestComponent.h" #include "../properties/jucer_FilePropertyComponent.h" @@ -267,6 +266,3 @@ private: }; }; }; - - -#endif // JUCER_JUCERCOMPONENTHANDLER_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/documents/jucer_ButtonDocument.h b/extras/Projucer/Source/ComponentEditor/documents/jucer_ButtonDocument.h index 065c170b11..dde177351c 100644 --- a/extras/Projucer/Source/ComponentEditor/documents/jucer_ButtonDocument.h +++ b/extras/Projucer/Source/ComponentEditor/documents/jucer_ButtonDocument.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_BUTTONDOCUMENT_H_INCLUDED -#define JUCER_BUTTONDOCUMENT_H_INCLUDED +#pragma once #include "../jucer_JucerDocument.h" @@ -70,6 +69,3 @@ public: ScopedPointer paintRoutines[7]; bool paintStatesEnabled [7]; }; - - -#endif // JUCER_BUTTONDOCUMENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/documents/jucer_ComponentDocument.h b/extras/Projucer/Source/ComponentEditor/documents/jucer_ComponentDocument.h index c6b1f79181..61f9765132 100644 --- a/extras/Projucer/Source/ComponentEditor/documents/jucer_ComponentDocument.h +++ b/extras/Projucer/Source/ComponentEditor/documents/jucer_ComponentDocument.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTDOCUMENT_H_INCLUDED -#define JUCER_COMPONENTDOCUMENT_H_INCLUDED +#pragma once #include "../jucer_JucerDocument.h" @@ -57,6 +56,3 @@ private: ScopedPointer components; ScopedPointer backgroundGraphics; }; - - -#endif // JUCER_COMPONENTDOCUMENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/jucer_BinaryResources.h b/extras/Projucer/Source/ComponentEditor/jucer_BinaryResources.h index 07f6e9645a..d53e329211 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_BinaryResources.h +++ b/extras/Projucer/Source/ComponentEditor/jucer_BinaryResources.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_BINARYRESOURCES_H_INCLUDED -#define JUCER_BINARYRESOURCES_H_INCLUDED +#pragma once class JucerDocument; @@ -96,6 +95,3 @@ private: BinaryResource* findResource (const String& name) const noexcept; void changed(); }; - - -#endif // JUCER_BINARYRESOURCES_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/jucer_ComponentLayout.h b/extras/Projucer/Source/ComponentEditor/jucer_ComponentLayout.h index f7308a0bff..90446cf042 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_ComponentLayout.h +++ b/extras/Projucer/Source/ComponentEditor/jucer_ComponentLayout.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTLAYOUT_H_INCLUDED -#define JUCER_COMPONENTLAYOUT_H_INCLUDED +#pragma once #include "components/jucer_ComponentTypeHandler.h" @@ -131,5 +130,3 @@ private: void positionToCode (const RelativePositionedRectangle& position, const ComponentLayout* layout, String& x, String& y, String& w, String& h); - -#endif // JUCER_COMPONENTLAYOUT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp index 7f96314f66..da4b1e561e 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp +++ b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp @@ -322,11 +322,6 @@ void GeneratedCode::applyToCode (String& code, const String& oldFileWithUserData, Project* project) const { - // header guard.. - String headerGuard ("__JUCE_HEADER_"); - headerGuard << String::toHexString ((className + "xx" + targetFile.getFileNameWithoutExtension()).hashCode64()).toUpperCase() << "__"; - replaceTemplate (code, "headerGuard", headerGuard); - replaceTemplate (code, "version", JUCEApplicationBase::getInstance()->getApplicationVersion()); replaceTemplate (code, "creationTime", Time::getCurrentTime().toString (true, true, true)); diff --git a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h index 89d96fed5f..69a8aa132f 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h +++ b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_GENERATEDCODE_H_INCLUDED -#define JUCER_GENERATEDCODE_H_INCLUDED +#pragma once #include "../Project/jucer_Project.h" class JucerDocument; @@ -98,6 +97,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GeneratedCode) }; - - -#endif // JUCER_GENERATEDCODE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.h b/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.h index 6131935bc2..64e88919f9 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.h +++ b/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_JUCERDOCUMENT_H_INCLUDED -#define JUCER_JUCERDOCUMENT_H_INCLUDED +#pragma once #include "../Application/jucer_OpenDocumentManager.h" #include "../Code Editor/jucer_SourceCodeEditor.h" @@ -174,6 +173,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JucerDocument) }; - - -#endif // JUCER_JUCERDOCUMENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/jucer_ObjectTypes.h b/extras/Projucer/Source/ComponentEditor/jucer_ObjectTypes.h index 2f0101dcc7..110c7295f2 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_ObjectTypes.h +++ b/extras/Projucer/Source/ComponentEditor/jucer_ObjectTypes.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_OBJECTTYPES_H_INCLUDED -#define JUCER_OBJECTTYPES_H_INCLUDED +#pragma once #include "jucer_JucerDocument.h" #include "paintelements/jucer_PaintElement.h" @@ -45,5 +44,3 @@ namespace ObjectTypes PaintElement* createNewImageElement (PaintRoutine* owner); PaintElement* createElementForXml (const XmlElement* const e, PaintRoutine* const owner); } - -#endif // JUCER_OBJECTTYPES_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/jucer_PaintRoutine.h b/extras/Projucer/Source/ComponentEditor/jucer_PaintRoutine.h index c37ff91cf9..e2d09201e3 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_PaintRoutine.h +++ b/extras/Projucer/Source/ComponentEditor/jucer_PaintRoutine.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTROUTINE_H_INCLUDED -#define JUCER_PAINTROUTINE_H_INCLUDED +#pragma once #include "paintelements/jucer_PaintElement.h" class JucerDocument; @@ -115,5 +114,3 @@ private: friend class FrontOrBackElementAction; void moveElementZOrder (int oldIndex, int newIndex); }; - -#endif // JUCER_PAINTROUTINE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/jucer_UtilityFunctions.h b/extras/Projucer/Source/ComponentEditor/jucer_UtilityFunctions.h index 88d573a686..c4f7c2cd6e 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_UtilityFunctions.h +++ b/extras/Projucer/Source/ComponentEditor/jucer_UtilityFunctions.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_UTILITYFUNCTIONS_H_INCLUDED -#define JUCER_UTILITYFUNCTIONS_H_INCLUDED +#pragma once inline String quotedString (const String& s, bool wrapInTransMacro) { @@ -112,5 +111,3 @@ inline void drawMouseOverCorners (Graphics& g, int w, int h) for (int i = r.getNumRectangles(); --i >= 0;) g.fillRect (r.getRectangle (i)); } - -#endif // JUCER_UTILITYFUNCTIONS_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ColouredElement.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ColouredElement.h index 96662b5646..72b0bd9685 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ColouredElement.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ColouredElement.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COLOUREDELEMENT_H_INCLUDED -#define JUCER_COLOUREDELEMENT_H_INCLUDED +#pragma once #include "../jucer_PaintRoutine.h" #include "../jucer_JucerDocument.h" @@ -79,6 +78,3 @@ protected: void convertToNewPathElement (const Path& path); }; - - -#endif // JUCER_COLOUREDELEMENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ElementSiblingComponent.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ElementSiblingComponent.h index ee366b2ec6..d340283f13 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ElementSiblingComponent.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ElementSiblingComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_ELEMENTSIBLINGCOMPONENT_H_INCLUDED -#define JUCER_ELEMENTSIBLINGCOMPONENT_H_INCLUDED +#pragma once //============================================================================== @@ -55,5 +54,3 @@ protected: PaintElement* const owner; }; - -#endif // JUCER_ELEMENTSIBLINGCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_FillType.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_FillType.h index 1db4560512..c8cad69bb9 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_FillType.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_FillType.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_FILLTYPE_H_INCLUDED -#define JUCER_FILLTYPE_H_INCLUDED +#pragma once #include "../jucer_JucerDocument.h" #include "../jucer_UtilityFunctions.h" @@ -389,6 +388,3 @@ private: } } }; - - -#endif // JUCER_FILLTYPE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_GradientPointComponent.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_GradientPointComponent.h index 45ef7fd00e..54e15bd85b 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_GradientPointComponent.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_GradientPointComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_GRADIENTPOINTCOMPONENT_H_INCLUDED -#define JUCER_GRADIENTPOINTCOMPONENT_H_INCLUDED +#pragma once #include "jucer_PointComponent.h" #include "jucer_ColouredElement.h" @@ -98,6 +97,3 @@ public: private: bool isStroke, isStart; }; - - -#endif // JUCER_GRADIENTPOINTCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ImageResourceProperty.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ImageResourceProperty.h index 40203105f4..09de6d53b0 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ImageResourceProperty.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_ImageResourceProperty.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_IMAGERESOURCEPROPERTY_H_INCLUDED -#define JUCER_IMAGERESOURCEPROPERTY_H_INCLUDED +#pragma once #include "../../Project Saving/jucer_ResourceFile.h" @@ -140,6 +139,3 @@ protected: JucerDocument& document; const bool allowChoiceOfNoResource; }; - - -#endif // JUCER_IMAGERESOURCEPROPERTY_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElement.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElement.h index 368071db25..c6611e3729 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElement.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElement.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTELEMENT_H_INCLUDED -#define JUCER_PAINTELEMENT_H_INCLUDED +#pragma once #include "../jucer_GeneratedCode.h" #include "../ui/jucer_RelativePositionedRectangle.h" @@ -168,6 +167,3 @@ public: JUCE_DECLARE_NON_COPYABLE (ElementListener) }; - - -#endif // JUCER_PAINTELEMENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementEllipse.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementEllipse.h index cf9649382c..1b46082268 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementEllipse.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementEllipse.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTELEMENTELLIPSE_H_INCLUDED -#define JUCER_PAINTELEMENTELLIPSE_H_INCLUDED +#pragma once #include "jucer_ColouredElement.h" @@ -154,6 +153,3 @@ private: PaintElementEllipse* const element; }; }; - - -#endif // JUCER_PAINTELEMENTELLIPSE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementGroup.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementGroup.h index 944e2e7959..1c8024cbaf 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementGroup.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementGroup.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTELEMENTGROUP_H_INCLUDED -#define JUCER_PAINTELEMENTGROUP_H_INCLUDED +#pragma once #include "jucer_PaintElement.h" #include "../jucer_ObjectTypes.h" @@ -234,6 +233,3 @@ private: PaintElementGroup* const element; }; }; - - -#endif // JUCER_PAINTELEMENTGROUP_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementImage.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementImage.h index 1f6240aa4b..4dac2ca917 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementImage.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementImage.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTELEMENTIMAGE_H_INCLUDED -#define JUCER_PAINTELEMENTIMAGE_H_INCLUDED +#pragma once #include "../jucer_PaintRoutine.h" #include "../properties/jucer_FilePropertyComponent.h" @@ -481,6 +480,3 @@ private: PaintElementImage* const element; }; }; - - -#endif // JUCER_PAINTELEMENTIMAGE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementPath.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementPath.h index cfe877bb40..5ccc1c900d 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementPath.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementPath.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTELEMENTPATH_H_INCLUDED -#define JUCER_PAINTELEMENTPATH_H_INCLUDED +#pragma once #include "jucer_ColouredElement.h" #include "jucer_ElementSiblingComponent.h" @@ -171,6 +170,3 @@ private: int dragX, dragY; bool selected, dragging, mouseDownSelectStatus; }; - - -#endif // JUCER_PAINTELEMENTPATH_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementRectangle.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementRectangle.h index 93bfb2d006..368ed4a10b 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementRectangle.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementRectangle.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTELEMENTRECTANGLE_H_INCLUDED -#define JUCER_PAINTELEMENTRECTANGLE_H_INCLUDED +#pragma once #include "jucer_ColouredElement.h" @@ -156,6 +155,3 @@ private: PaintElementRectangle* const element; }; }; - - -#endif // JUCER_PAINTELEMENTRECTANGLE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementRoundedRectangle.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementRoundedRectangle.h index ec8632ae73..657a27beb7 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementRoundedRectangle.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementRoundedRectangle.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTELEMENTROUNDEDRECTANGLE_H_INCLUDED -#define JUCER_PAINTELEMENTROUNDEDRECTANGLE_H_INCLUDED +#pragma once #include "jucer_ColouredElement.h" #include "../jucer_UtilityFunctions.h" @@ -247,6 +246,3 @@ private: PaintElementRoundedRectangle* const element; }; }; - - -#endif // JUCER_PAINTELEMENTROUNDEDRECTANGLE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementText.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementText.h index 1284a932fd..8960149c2c 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementText.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementText.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTELEMENTTEXT_H_INCLUDED -#define JUCER_PAINTELEMENTTEXT_H_INCLUDED +#pragma once #include "jucer_ColouredElement.h" #include "../properties/jucer_FontPropertyComponent.h" @@ -565,6 +564,3 @@ private: PaintElementText* const element; }; }; - - -#endif // JUCER_PAINTELEMENTTEXT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementUndoableAction.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementUndoableAction.h index 9edc4f0107..afa55e5dcd 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementUndoableAction.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PaintElementUndoableAction.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTELEMENTUNDOABLEACTION_H_INCLUDED -#define JUCER_PAINTELEMENTUNDOABLEACTION_H_INCLUDED +#pragma once #include "../ui/jucer_JucerDocumentEditor.h" #include "jucer_PaintElementGroup.h" @@ -136,7 +135,3 @@ private: PaintElementUndoableAction (const PaintElementUndoableAction&); PaintElementUndoableAction& operator= (const PaintElementUndoableAction&); }; - - - -#endif // JUCER_PAINTELEMENTUNDOABLEACTION_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PointComponent.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PointComponent.h index 7833460b93..1f8e208eb0 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PointComponent.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_PointComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_POINTCOMPONENT_H_INCLUDED -#define JUCER_POINTCOMPONENT_H_INCLUDED +#pragma once #include "jucer_ElementSiblingComponent.h" #include "../ui/jucer_PaintRoutineEditor.h" @@ -106,6 +105,3 @@ public: private: int dragX, dragY; }; - - -#endif // JUCER_POINTCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_StrokeType.h b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_StrokeType.h index 73e2eaacb2..c3f461deef 100644 --- a/extras/Projucer/Source/ComponentEditor/paintelements/jucer_StrokeType.h +++ b/extras/Projucer/Source/ComponentEditor/paintelements/jucer_StrokeType.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_STROKETYPE_H_INCLUDED -#define JUCER_STROKETYPE_H_INCLUDED +#pragma once #include "jucer_FillType.h" @@ -156,6 +155,3 @@ private: fill.colour = Colours::black; } }; - - -#endif // JUCER_STROKETYPE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h index a91714abf8..462e87571b 100644 --- a/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h +++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COLOURPROPERTYCOMPONENT_H_INCLUDED -#define JUCER_COLOURPROPERTYCOMPONENT_H_INCLUDED +#pragma once class JucerColourPropertyComponent : public PropertyComponent @@ -207,6 +206,3 @@ public: ScopedPointer colourPropEditor; }; - - -#endif // JUCER_COLOURPROPERTYCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentBooleanProperty.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentBooleanProperty.h index fd5fd6ab6f..dc4abaea66 100644 --- a/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentBooleanProperty.h +++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentBooleanProperty.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTBOOLEANPROPERTY_H_INCLUDED -#define JUCER_COMPONENTBOOLEANPROPERTY_H_INCLUDED +#pragma once template @@ -57,6 +56,3 @@ protected: ComponentType* component; JucerDocument& document; }; - - -#endif // JUCER_COMPONENTBOOLEANPROPERTY_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentChoiceProperty.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentChoiceProperty.h index 0fda3d280b..ec2273dbb1 100644 --- a/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentChoiceProperty.h +++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentChoiceProperty.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTCHOICEPROPERTY_H_INCLUDED -#define JUCER_COMPONENTCHOICEPROPERTY_H_INCLUDED +#pragma once template @@ -55,6 +54,3 @@ protected: ComponentType* component; JucerDocument& document; }; - - -#endif // JUCER_COMPONENTCHOICEPROPERTY_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentColourProperty.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentColourProperty.h index 5462579cdd..452de96aa8 100644 --- a/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentColourProperty.h +++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentColourProperty.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTCOLOURPROPERTY_H_INCLUDED -#define JUCER_COMPONENTCOLOURPROPERTY_H_INCLUDED +#pragma once #include "jucer_ColourPropertyComponent.h" @@ -168,6 +167,3 @@ private: bool isDefault, wasSpecified; }; }; - - -#endif // JUCER_COMPONENTCOLOURPROPERTY_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentTextProperty.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentTextProperty.h index 88edfa106d..03e31a6ad8 100644 --- a/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentTextProperty.h +++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_ComponentTextProperty.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTTEXTPROPERTY_H_INCLUDED -#define JUCER_COMPONENTTEXTPROPERTY_H_INCLUDED +#pragma once template @@ -57,6 +56,3 @@ protected: ComponentType* component; JucerDocument& document; }; - - -#endif // JUCER_COMPONENTTEXTPROPERTY_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_FilePropertyComponent.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_FilePropertyComponent.h index 7a4d867e00..1c1cd35d8b 100644 --- a/extras/Projucer/Source/ComponentEditor/properties/jucer_FilePropertyComponent.h +++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_FilePropertyComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_FILEPROPERTYCOMPONENT_H_INCLUDED -#define JUCER_FILEPROPERTYCOMPONENT_H_INCLUDED +#pragma once class FilePropertyComponent : public PropertyComponent, @@ -60,6 +59,3 @@ public: private: FilenameComponent filenameComp; }; - - -#endif // JUCER_FILEPROPERTYCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_FontPropertyComponent.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_FontPropertyComponent.h index 43519c4fbc..4feed6af55 100644 --- a/extras/Projucer/Source/ComponentEditor/properties/jucer_FontPropertyComponent.h +++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_FontPropertyComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_FONTPROPERTYCOMPONENT_H_INCLUDED -#define JUCER_FONTPROPERTYCOMPONENT_H_INCLUDED +#pragma once class FontPropertyComponent : public ChoicePropertyComponent @@ -117,6 +116,3 @@ public: + ")"; } }; - - -#endif // JUCER_FONTPROPERTYCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_JustificationProperty.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_JustificationProperty.h index 21cc7ff3fd..549401265e 100644 --- a/extras/Projucer/Source/ComponentEditor/properties/jucer_JustificationProperty.h +++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_JustificationProperty.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_JUSTIFICATIONPROPERTY_H_INCLUDED -#define JUCER_JUSTIFICATIONPROPERTY_H_INCLUDED +#pragma once class JustificationProperty : public ChoicePropertyComponent @@ -97,6 +96,3 @@ public: return -1; } }; - - -#endif // JUCER_JUSTIFICATIONPROPERTY_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_PositionPropertyBase.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_PositionPropertyBase.h index 9051c3146b..6e8b68a607 100644 --- a/extras/Projucer/Source/ComponentEditor/properties/jucer_PositionPropertyBase.h +++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_PositionPropertyBase.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_POSITIONPROPERTYBASE_H_INCLUDED -#define JUCER_POSITIONPROPERTYBASE_H_INCLUDED +#pragma once #include "../ui/jucer_PaintRoutineEditor.h" #include "../ui/jucer_ComponentLayoutEditor.h" @@ -450,6 +449,3 @@ protected: ComponentPositionDimension dimension; const bool includeAnchorOptions, allowRelativeOptions; }; - - -#endif // JUCER_POSITIONPROPERTYBASE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.h index cba5326f4f..58762a40fc 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTLAYOUTEDITOR_H_INCLUDED -#define JUCER_COMPONENTLAYOUTEDITOR_H_INCLUDED +#pragma once #include "jucer_ComponentOverlayComponent.h" #include "../jucer_JucerDocument.h" @@ -86,6 +85,3 @@ private: SnapGridPainter grid; bool firstResize; }; - - -#endif // JUCER_COMPONENTLAYOUTEDITOR_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentLayoutPanel.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentLayoutPanel.h index 073015af08..a4ec064a69 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentLayoutPanel.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentLayoutPanel.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTLAYOUTPANEL_H_INCLUDED -#define JUCER_COMPONENTLAYOUTPANEL_H_INCLUDED +#pragma once #include "jucer_ComponentLayoutEditor.h" #include "jucer_EditingPanelBase.h" @@ -115,6 +114,3 @@ private: PropertyPanel propsPanel; }; }; - - -#endif // JUCER_COMPONENTLAYOUTPANEL_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.h index 536bc06096..fe4c0eff5c 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COMPONENTOVERLAYCOMPONENT_H_INCLUDED -#define JUCER_COMPONENTOVERLAYCOMPONENT_H_INCLUDED +#pragma once #include "../jucer_JucerDocument.h" @@ -85,7 +84,3 @@ private: bool selected, dragging, mouseDownSelectStatus; double originalAspectRatio; }; - - - -#endif // JUCER_COMPONENTOVERLAYCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_EditingPanelBase.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_EditingPanelBase.h index b1bca7eba9..255162c671 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_EditingPanelBase.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_EditingPanelBase.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_EDITINGPANELBASE_H_INCLUDED -#define JUCER_EDITINGPANELBASE_H_INCLUDED +#pragma once #include "../jucer_JucerDocument.h" #include "jucer_ComponentLayoutEditor.h" @@ -74,6 +73,3 @@ protected: Component* editor; Component* propsPanel; }; - - -#endif // JUCER_EDITINGPANELBASE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.h index 597ec5ea2b..7dc4439762 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_JUCERDOCUMENTEDITOR_H_INCLUDED -#define JUCER_JUCERDOCUMENTEDITOR_H_INCLUDED +#pragma once #include "../jucer_JucerDocument.h" #include "jucer_ComponentLayoutEditor.h" @@ -91,6 +90,3 @@ private: void addElement (const int index); void addComponent (const int index); }; - - -#endif // JUCER_JUCERDOCUMENTEDITOR_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_PaintRoutineEditor.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_PaintRoutineEditor.h index 9da450b696..9efc3937ef 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_PaintRoutineEditor.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_PaintRoutineEditor.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTROUTINEEDITOR_H_INCLUDED -#define JUCER_PAINTROUTINEEDITOR_H_INCLUDED +#pragma once #include "../jucer_JucerDocument.h" #include "../jucer_PaintRoutine.h" @@ -84,6 +83,3 @@ private: void updateComponentOverlay(); void updateChildBounds(); }; - - -#endif // JUCER_PAINTROUTINEEDITOR_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_PaintRoutinePanel.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_PaintRoutinePanel.h index 6811d4b27a..5cce43c44a 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_PaintRoutinePanel.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_PaintRoutinePanel.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PAINTROUTINEPANEL_H_INCLUDED -#define JUCER_PAINTROUTINEPANEL_H_INCLUDED +#pragma once #include "jucer_PaintRoutineEditor.h" #include "jucer_EditingPanelBase.h" @@ -44,6 +43,3 @@ public: private: PaintRoutine& routine; }; - - -#endif // JUCER_PAINTROUTINEPANEL_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_RelativePositionedRectangle.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_RelativePositionedRectangle.h index 30dbbac42a..ffafd36a84 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_RelativePositionedRectangle.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_RelativePositionedRectangle.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_RELATIVEPOSITIONEDRECTANGLE_H_INCLUDED -#define JUCER_RELATIVEPOSITIONEDRECTANGLE_H_INCLUDED +#pragma once class ComponentLayout; @@ -757,6 +756,3 @@ struct RelativePositionedRectangle int64 relativeToW; int64 relativeToH; }; - - -#endif // JUCER_RELATIVEPOSITIONEDRECTANGLE_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_ResourceEditorPanel.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_ResourceEditorPanel.h index 36124a4e7f..15e4dd0867 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_ResourceEditorPanel.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_ResourceEditorPanel.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_RESOURCEEDITORPANEL_H_INCLUDED -#define JUCER_RESOURCEEDITORPANEL_H_INCLUDED +#pragma once #include "../jucer_JucerDocument.h" @@ -55,6 +54,3 @@ private: ScopedPointer listBox; TextButton addButton, reloadAllButton, delButton; }; - - -#endif // JUCER_RESOURCEEDITORPANEL_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_SnapGridPainter.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_SnapGridPainter.h index 01aea5e316..8396c872db 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_SnapGridPainter.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_SnapGridPainter.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_SNAPGRIDPAINTER_H_INCLUDED -#define JUCER_SNAPGRIDPAINTER_H_INCLUDED +#pragma once #include "../jucer_JucerDocument.h" #include "../jucer_PaintRoutine.h" @@ -79,6 +78,3 @@ private: int snapGridSize; bool snapShown; }; - - -#endif // JUCER_SNAPGRIDPAINTER_H_INCLUDED diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_TestComponent.h b/extras/Projucer/Source/ComponentEditor/ui/jucer_TestComponent.h index 4334155fca..55a6c416b3 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_TestComponent.h +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_TestComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_TESTCOMPONENT_H_INCLUDED -#define JUCER_TESTCOMPONENT_H_INCLUDED +#pragma once #include "../jucer_JucerDocument.h" @@ -75,6 +74,3 @@ private: void updateContents(); void reload(); }; - - -#endif // JUCER_TESTCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.h b/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.h index 5b67d2ba45..a7e2d3645b 100644 --- a/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.h +++ b/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef __PROJUCER_CLANGCLIENT_H_5AE7396F__ -#define __PROJUCER_CLANGCLIENT_H_5AE7396F__ +#pragma once #include "projucer_ActivityList.h" #include "projucer_ErrorList.h" @@ -166,6 +165,3 @@ struct LiveBuildProjectSettings static bool areWarningsDisabled (Project&); static void setWarningsDisabled (Project&, bool); }; - - -#endif // __PROJUCER_CLANGCLIENT_H_5AE7396F__ diff --git a/extras/Projucer/Source/LiveBuildEngine/projucer_LiveCodeBuilderDLL.h b/extras/Projucer/Source/LiveBuildEngine/projucer_LiveCodeBuilderDLL.h index 433126891b..98f90e73ff 100644 --- a/extras/Projucer/Source/LiveBuildEngine/projucer_LiveCodeBuilderDLL.h +++ b/extras/Projucer/Source/LiveBuildEngine/projucer_LiveCodeBuilderDLL.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef PROJUCER_LIVECODEBUILDERDLL_H_INCLUDED -#define PROJUCER_LIVECODEBUILDERDLL_H_INCLUDED +#pragma once extern "C" @@ -55,6 +54,3 @@ extern "C" X (projucer_hasLiveCodingLicence, bool, ()) } - - -#endif // PROJUCER_LIVECODEBUILDERDLL_H_INCLUDED diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.h index 4bc582d3a4..e43022bb94 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PROJECTEXPORTER_H_INCLUDED -#define JUCER_PROJECTEXPORTER_H_INCLUDED +#pragma once #include "../Project/jucer_Project.h" #include "../Project/jucer_ProjectType.h" @@ -421,6 +420,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ProjectExporter) }; - - -#endif // JUCER_PROJECTEXPORTER_H_INCLUDED diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h index 7565f4839e..008c27d492 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PROJECTSAVER_H_INCLUDED -#define JUCER_PROJECTSAVER_H_INCLUDED +#pragma once #include "jucer_ResourceFile.h" #include "../Project/jucer_Module.h" @@ -365,9 +364,7 @@ private: << "*/" << newLine << newLine; - const String headerGuard ("__JUCE_APPCONFIG_" + project.getProjectUID().toUpperCase() + "__"); - out << "#ifndef " << headerGuard << newLine - << "#define " << headerGuard << newLine + out << "#pragma once" << newLine << newLine << "//==============================================================================" << newLine << "// [BEGIN_USER_CODE_SECTION]" << newLine @@ -407,8 +404,6 @@ private: << "#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1" << newLine; } - out << newLine; - for (int j = 0; j < modules.size(); ++j) { LibraryModule* const m = modules.getUnchecked(j); @@ -417,9 +412,9 @@ private: if (flags.size() > 0) { - out << "//==============================================================================" << newLine - << "// " << m->getID() << " flags:" << newLine - << newLine; + out << newLine + << "//==============================================================================" << newLine + << "// " << m->getID() << " flags:" << newLine; for (int i = 0; i < flags.size(); ++i) { @@ -428,7 +423,8 @@ private: const Project::ConfigFlag* const f = flags[i]; const String value (project.getConfigFlag (f->symbol).toString()); - out << "#ifndef " << f->symbol << newLine; + out << newLine + << "#ifndef " << f->symbol << newLine; if (value == Project::configFlagEnabled) out << " #define " << f->symbol << " 1"; @@ -441,17 +437,13 @@ private: out << newLine - << "#endif" << newLine - << newLine; + << "#endif" << newLine; } } } if (extraAppConfigContent.isNotEmpty()) out << newLine << extraAppConfigContent.trimEnd() << newLine; - - out << newLine - << "#endif // " << headerGuard << newLine; } void writeAppConfigFile (const OwnedArray& modules, const String& userContent) @@ -474,9 +466,7 @@ private: << newLine << "*/" << newLine << newLine; - String headerGuard ("__APPHEADERFILE_" + project.getProjectUID().toUpperCase() + "__"); - out << "#ifndef " << headerGuard << newLine - << "#define " << headerGuard << newLine << newLine; + out << "#pragma once" << newLine << newLine; if (appConfigFile.exists()) out << CodeHelpers::createIncludeStatement (project.getAppConfigFilename()) << newLine; @@ -508,9 +498,7 @@ private: << " const char* const versionString = " << CppTokeniserFunctions::addEscapeChars (project.getVersionString()).quoted() << ";" << newLine << " const int versionNumber = " << project.getVersionAsHex() << ";" << newLine << "}" << newLine - << "#endif" << newLine - << newLine - << "#endif // " << headerGuard << newLine; + << "#endif" << newLine; } void writeAppHeader (const OwnedArray& modules) @@ -704,6 +692,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ProjectSaver) }; - - -#endif // JUCER_PROJECTSAVER_H_INCLUDED diff --git a/extras/Projucer/Source/Project Saving/jucer_ResourceFile.cpp b/extras/Projucer/Source/Project Saving/jucer_ResourceFile.cpp index f30b303d3a..d7b71b271d 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ResourceFile.cpp +++ b/extras/Projucer/Source/Project Saving/jucer_ResourceFile.cpp @@ -112,12 +112,9 @@ static String getComment() Result ResourceFile::writeHeader (MemoryOutputStream& header) { - const String headerGuard ("BINARYDATA_H_" + String (project.getProjectUID().hashCode() & 0x7ffffff) + "_INCLUDED"); - header << "/* =========================================================================================" << getComment() - << "#ifndef " << headerGuard << newLine - << "#define " << headerGuard << newLine + << "#pragma once" << newLine << newLine << "namespace " << className << newLine << "{" << newLine; @@ -156,9 +153,7 @@ Result ResourceFile::writeHeader (MemoryOutputStream& header) << " // If you provide the name of one of the binary resource variables above, this function will" << newLine << " // return the corresponding data and its size (or a null pointer if the name isn't found)." << newLine << " const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw();" << newLine - << "}" << newLine - << newLine - << "#endif" << newLine; + << "}" << newLine; return Result::ok(); } diff --git a/extras/Projucer/Source/Project Saving/jucer_ResourceFile.h b/extras/Projucer/Source/Project Saving/jucer_ResourceFile.h index d8c9038c7c..9b2cd1537b 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ResourceFile.h +++ b/extras/Projucer/Source/Project Saving/jucer_ResourceFile.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_RESOURCEFILE_H_INCLUDED -#define JUCER_RESOURCEFILE_H_INCLUDED +#pragma once #include "../Project/jucer_Project.h" @@ -64,6 +63,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ResourceFile) }; - - -#endif // JUCER_RESOURCEFILE_H_INCLUDED diff --git a/extras/Projucer/Source/Project Saving/jucer_TextWithDefaultPropertyComponent.h b/extras/Projucer/Source/Project Saving/jucer_TextWithDefaultPropertyComponent.h index 5117a1fb5d..309dcc2576 100644 --- a/extras/Projucer/Source/Project Saving/jucer_TextWithDefaultPropertyComponent.h +++ b/extras/Projucer/Source/Project Saving/jucer_TextWithDefaultPropertyComponent.h @@ -23,8 +23,7 @@ */ -#ifndef JUCER_TEXTWITHDEFAULTPROPERTYCOMPONENT_H_INCLUDED -#define JUCER_TEXTWITHDEFAULTPROPERTYCOMPONENT_H_INCLUDED +#pragma once template class TextWithDefaultPropertyComponent : public PropertyComponent, @@ -165,5 +164,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TextWithDefaultPropertyComponent) }; - -#endif // JUCER_TEXTWITHDEFAULTPROPERTYCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.h b/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.h index e88db2fe2a..0c850200b2 100644 --- a/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.h +++ b/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_DEPENDENCYPATHPROPERTYCOMPONENT_H_INCLUDED -#define JUCER_DEPENDENCYPATHPROPERTYCOMPONENT_H_INCLUDED +#pragma once //============================================================================== @@ -178,6 +177,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DependencyPathPropertyComponent) }; - - -#endif // JUCER_DEPENDENCYPATHPROPERTYCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Project/jucer_GroupInformationComponent.h b/extras/Projucer/Source/Project/jucer_GroupInformationComponent.h index 1c6fec7d3d..31ec971b38 100644 --- a/extras/Projucer/Source/Project/jucer_GroupInformationComponent.h +++ b/extras/Projucer/Source/Project/jucer_GroupInformationComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_GROUPINFORMATIONCOMPONENT_H_INCLUDED -#define JUCER_GROUPINFORMATIONCOMPONENT_H_INCLUDED +#pragma once #include "../Project/jucer_Project.h" @@ -164,6 +163,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GroupInformationComponent) }; - - -#endif // JUCER_GROUPINFORMATIONCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Project/jucer_Module.h b/extras/Projucer/Source/Project/jucer_Module.h index adc424584b..f1570b135c 100644 --- a/extras/Projucer/Source/Project/jucer_Module.h +++ b/extras/Projucer/Source/Project/jucer_Module.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_MODULE_H_INCLUDED -#define JUCER_MODULE_H_INCLUDED +#pragma once #include "jucer_Project.h" class ProjectExporter; @@ -170,6 +169,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (EnabledModuleList) }; - - -#endif // JUCER_MODULE_H_INCLUDED diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h index ca5c4f5797..06cd9251c2 100644 --- a/extras/Projucer/Source/Project/jucer_Project.h +++ b/extras/Projucer/Source/Project/jucer_Project.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PROJECT_H_INCLUDED -#define JUCER_PROJECT_H_INCLUDED +#pragma once #include "jucer_ProjectType.h" @@ -359,6 +358,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Project) }; - - -#endif // JUCER_PROJECT_H_INCLUDED diff --git a/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h b/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h index 55dde800d8..96787130ad 100644 --- a/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h +++ b/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PROJECTCONTENTCOMPONENT_H_INCLUDED -#define JUCER_PROJECTCONTENTCOMPONENT_H_INCLUDED +#pragma once #include "jucer_Project.h" #include "../Application/jucer_OpenDocumentManager.h" @@ -171,6 +170,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ProjectContentComponent) }; - - -#endif // JUCER_PROJECTCONTENTCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Project/jucer_ProjectType.h b/extras/Projucer/Source/Project/jucer_ProjectType.h index 090eb1b8fa..7ab33c64c1 100644 --- a/extras/Projucer/Source/Project/jucer_ProjectType.h +++ b/extras/Projucer/Source/Project/jucer_ProjectType.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PROJECTTYPE_H_INCLUDED -#define JUCER_PROJECTTYPE_H_INCLUDED +#pragma once class Project; class ProjectExporter; @@ -209,5 +208,3 @@ inline Array ProjectType::getAllTypes() return Array (allTypes); } - -#endif // JUCER_PROJECTTYPE_H_INCLUDED diff --git a/extras/Projucer/Source/Project/jucer_TreeItemTypes.h b/extras/Projucer/Source/Project/jucer_TreeItemTypes.h index 4dc1970d26..181dc4861d 100644 --- a/extras/Projucer/Source/Project/jucer_TreeItemTypes.h +++ b/extras/Projucer/Source/Project/jucer_TreeItemTypes.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_TREEITEMTYPES_H_INCLUDED -#define JUCER_TREEITEMTYPES_H_INCLUDED +#pragma once #include "../Project Saving/jucer_ProjectExporter.h" #include "../Utility/jucer_TranslationTool.h" @@ -46,6 +45,3 @@ struct ConfigTreeItemTypes #include "jucer_ConfigTree_Modules.h" #include "jucer_ConfigTree_Exporter.h" }; - - -#endif // JUCER_TREEITEMTYPES_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_CodeHelpers.h b/extras/Projucer/Source/Utility/jucer_CodeHelpers.h index 0d25ef72a4..77ebe3a2dc 100644 --- a/extras/Projucer/Source/Utility/jucer_CodeHelpers.h +++ b/extras/Projucer/Source/Utility/jucer_CodeHelpers.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_CODEHELPERS_H_INCLUDED -#define JUCER_CODEHELPERS_H_INCLUDED +#pragma once //============================================================================== @@ -56,6 +55,3 @@ namespace CodeHelpers bool getIndentForCurrentBlock (CodeDocument::Position pos, const String& tab, String& blockIndent, String& lastLineIndent); } - - -#endif // JUCER_CODEHELPERS_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_ColourPropertyComponent.h b/extras/Projucer/Source/Utility/jucer_ColourPropertyComponent.h index 5358c3d0fe..12e3fea2c3 100644 --- a/extras/Projucer/Source/Utility/jucer_ColourPropertyComponent.h +++ b/extras/Projucer/Source/Utility/jucer_ColourPropertyComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_COLOURPROPERTYCOMPONENT_H_INCLUDED -#define JUCER_COLOURPROPERTYCOMPONENT_H_INCLUDED +#pragma once struct ColourPropertyComponent : public PropertyComponent @@ -222,6 +221,3 @@ private: ColourEditorComponent colourEditor; }; - - -#endif // JUCER_COLOURPROPERTYCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_DialogLookAndFeel.h b/extras/Projucer/Source/Utility/jucer_DialogLookAndFeel.h index 6fbcc4d44f..47cf3ff3f5 100644 --- a/extras/Projucer/Source/Utility/jucer_DialogLookAndFeel.h +++ b/extras/Projucer/Source/Utility/jucer_DialogLookAndFeel.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef PROJUCER_LOOKANDFEEL_H_INCLUDED -#define PROJUCER_LOOKANDFEEL_H_INCLUDED +#pragma once class ProjucerDialogLookAndFeel : public LookAndFeel_V3 @@ -141,7 +140,3 @@ private: g.drawRoundedRectangle (buttonRect.reduced (1.0f), 5.0f, 2.0f); } }; - - - -#endif // PROJUCER_LOOKANDFEEL_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_FileHelpers.h b/extras/Projucer/Source/Utility/jucer_FileHelpers.h index f4fe685d21..2b4c1c0ec0 100644 --- a/extras/Projucer/Source/Utility/jucer_FileHelpers.h +++ b/extras/Projucer/Source/Utility/jucer_FileHelpers.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_FILEHELPERS_H_INCLUDED -#define JUCER_FILEHELPERS_H_INCLUDED +#pragma once //============================================================================== @@ -91,6 +90,3 @@ private: Time fileModificationTime; int64 fileHashCode, fileSize; }; - - -#endif // JUCER_FILEHELPERS_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_FilePathPropertyComponent.h b/extras/Projucer/Source/Utility/jucer_FilePathPropertyComponent.h index 0c536b7eb8..8dc457db88 100644 --- a/extras/Projucer/Source/Utility/jucer_FilePathPropertyComponent.h +++ b/extras/Projucer/Source/Utility/jucer_FilePathPropertyComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_FILEPATHPROPERTYCOMPONENT_H_INCLUDED -#define JUCER_FILEPATHPROPERTYCOMPONENT_H_INCLUDED +#pragma once class FilePathPropertyComponent : public PropertyComponent @@ -140,6 +139,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FilePathPropertyComponent) }; - - -#endif // JUCER_FILEPATHPROPERTYCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_FloatingToolWindow.h b/extras/Projucer/Source/Utility/jucer_FloatingToolWindow.h index 0d06efdb2e..1f4a325bd4 100644 --- a/extras/Projucer/Source/Utility/jucer_FloatingToolWindow.h +++ b/extras/Projucer/Source/Utility/jucer_FloatingToolWindow.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_FLOATINGTOOLWINDOW_H_INCLUDED -#define JUCER_FLOATINGTOOLWINDOW_H_INCLUDED +#pragma once //============================================================================== @@ -78,6 +77,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FloatingToolWindow) }; - - -#endif // JUCER_FLOATINGTOOLWINDOW_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_Icons.h b/extras/Projucer/Source/Utility/jucer_Icons.h index c2bbddcf21..0b7374d321 100644 --- a/extras/Projucer/Source/Utility/jucer_Icons.h +++ b/extras/Projucer/Source/Utility/jucer_Icons.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_ICONS_H_INCLUDED -#define JUCER_ICONS_H_INCLUDED +#pragma once //============================================================================== @@ -77,6 +76,3 @@ private: }; const Icons& getIcons(); - - -#endif // JUCER_ICONS_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.h b/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.h index a703ce0a85..a87514765e 100644 --- a/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.h +++ b/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_JUCERTREEVIEWBASE_H_INCLUDED -#define JUCER_JUCERTREEVIEWBASE_H_INCLUDED +#pragma once class ProjectContentComponent; class Project; @@ -229,6 +228,3 @@ public: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TreeItemComponent) }; - - -#endif // JUCER_JUCERTREEVIEWBASE_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_MiscUtilities.h b/extras/Projucer/Source/Utility/jucer_MiscUtilities.h index 22ce43f284..71f4699877 100644 --- a/extras/Projucer/Source/Utility/jucer_MiscUtilities.h +++ b/extras/Projucer/Source/Utility/jucer_MiscUtilities.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_MISCUTILITIES_H_INCLUDED -#define JUCER_MISCUTILITIES_H_INCLUDED +#pragma once String hexString8Digits (int value); @@ -104,6 +103,3 @@ protected: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ValueSourceFilter) }; - - -#endif // JUCER_MISCUTILITIES_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_PresetIDs.h b/extras/Projucer/Source/Utility/jucer_PresetIDs.h index 40d0778fbb..11267a00e1 100644 --- a/extras/Projucer/Source/Utility/jucer_PresetIDs.h +++ b/extras/Projucer/Source/Utility/jucer_PresetIDs.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PRESETIDS_H_INCLUDED -#define JUCER_PRESETIDS_H_INCLUDED +#pragma once // Handy list of static Identifiers.. @@ -236,5 +235,3 @@ namespace Ids #undef DECLARE_ID } - -#endif // JUCER_PRESETIDS_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_ProjucerLookAndFeel.h b/extras/Projucer/Source/Utility/jucer_ProjucerLookAndFeel.h index 43387b183d..e1a3a49562 100644 --- a/extras/Projucer/Source/Utility/jucer_ProjucerLookAndFeel.h +++ b/extras/Projucer/Source/Utility/jucer_ProjucerLookAndFeel.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_PROJUCERLOOKANDFEEL_H_INCLUDED -#define JUCER_PROJUCERLOOKANDFEEL_H_INCLUDED +#pragma once //============================================================================== @@ -45,7 +44,3 @@ private: Image backgroundTexture; Colour backgroundTextureBaseColour; }; - - - -#endif diff --git a/extras/Projucer/Source/Utility/jucer_RelativePath.h b/extras/Projucer/Source/Utility/jucer_RelativePath.h index 3ce40e96ac..a006221e3d 100644 --- a/extras/Projucer/Source/Utility/jucer_RelativePath.h +++ b/extras/Projucer/Source/Utility/jucer_RelativePath.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_RELATIVEPATH_H_INCLUDED -#define JUCER_RELATIVEPATH_H_INCLUDED +#pragma once //============================================================================== @@ -114,6 +113,3 @@ private: return currentWorkingDirectory.getChildFile (path); } }; - - -#endif // JUCER_RELATIVEPATH_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_SlidingPanelComponent.h b/extras/Projucer/Source/Utility/jucer_SlidingPanelComponent.h index 37812f1dea..0d530029ef 100644 --- a/extras/Projucer/Source/Utility/jucer_SlidingPanelComponent.h +++ b/extras/Projucer/Source/Utility/jucer_SlidingPanelComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_SLIDINGPANELCOMPONENT_H_INCLUDED -#define JUCER_SLIDINGPANELCOMPONENT_H_INCLUDED +#pragma once #include "../Application/jucer_Application.h" @@ -79,6 +78,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SlidingPanelComponent) }; - - -#endif // JUCER_SLIDINGPANELCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_StoredSettings.h b/extras/Projucer/Source/Utility/jucer_StoredSettings.h index 96ac576dbe..4f3ff2cf8e 100644 --- a/extras/Projucer/Source/Utility/jucer_StoredSettings.h +++ b/extras/Projucer/Source/Utility/jucer_StoredSettings.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_STOREDSETTINGS_H_INCLUDED -#define JUCER_STOREDSETTINGS_H_INCLUDED +#pragma once #include #include "../Application/jucer_AppearanceSettings.h" @@ -100,6 +99,3 @@ private: StoredSettings& getAppSettings(); PropertiesFile& getGlobalProperties(); - - -#endif // JUCER_STOREDSETTINGS_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_TranslationTool.h b/extras/Projucer/Source/Utility/jucer_TranslationTool.h index cf37e6ed1c..e0645fa819 100644 --- a/extras/Projucer/Source/Utility/jucer_TranslationTool.h +++ b/extras/Projucer/Source/Utility/jucer_TranslationTool.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_TRANSLATIONTOOL_H_INCLUDED -#define JUCER_TRANSLATIONTOOL_H_INCLUDED +#pragma once struct TranslationHelpers @@ -455,6 +454,3 @@ private: editorPre.selectAll(); } }; - - -#endif // JUCER_TRANSLATIONTOOL_H_INCLUDED diff --git a/extras/Projucer/Source/Utility/jucer_ValueSourceHelpers.h b/extras/Projucer/Source/Utility/jucer_ValueSourceHelpers.h index 218f51e3e8..481b31300d 100644 --- a/extras/Projucer/Source/Utility/jucer_ValueSourceHelpers.h +++ b/extras/Projucer/Source/Utility/jucer_ValueSourceHelpers.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_VALUESOURCEHELPERS_H_INCLUDED -#define JUCER_VALUESOURCEHELPERS_H_INCLUDED +#pragma once //============================================================================== @@ -50,6 +49,3 @@ public: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NumericValueSource) }; - - -#endif // JUCER_VALUESOURCEHELPERS_H_INCLUDED diff --git a/extras/Projucer/Source/Wizards/jucer_NewFileWizard.h b/extras/Projucer/Source/Wizards/jucer_NewFileWizard.h index 078e6d372e..42ffd4f4c9 100644 --- a/extras/Projucer/Source/Wizards/jucer_NewFileWizard.h +++ b/extras/Projucer/Source/Wizards/jucer_NewFileWizard.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_NEWFILEWIZARD_H_INCLUDED -#define JUCER_NEWFILEWIZARD_H_INCLUDED +#pragma once #include "../jucer_Headers.h" #include "../Project/jucer_Project.h" @@ -66,6 +65,3 @@ public: private: OwnedArray wizards; }; - - -#endif // JUCER_NEWFILEWIZARD_H_INCLUDED diff --git a/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h b/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h index 56204c40a7..81c5502e1a 100644 --- a/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h +++ b/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_NEWPROJECTWIZARD_H_INCLUDED -#define JUCER_NEWPROJECTWIZARD_H_INCLUDED +#pragma once //============================================================================== @@ -224,6 +223,3 @@ struct NewProjectWizard project.createExporterForCurrentPlatform(); } }; - - -#endif // JUCER_NEWPROJECTWIZARD_H_INCLUDED diff --git a/extras/Projucer/Source/Wizards/jucer_NewProjectWizardComponent.h b/extras/Projucer/Source/Wizards/jucer_NewProjectWizardComponent.h index db454bb8a7..01fca5203a 100644 --- a/extras/Projucer/Source/Wizards/jucer_NewProjectWizardComponent.h +++ b/extras/Projucer/Source/Wizards/jucer_NewProjectWizardComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_NEWPROJECTWIZARDCOMPONENT_H_INCLUDED -#define JUCER_NEWPROJECTWIZARDCOMPONENT_H_INCLUDED +#pragma once class ModulesFolderPathBox : public Component, @@ -447,6 +446,3 @@ private: createButton.setEnabled (projectName.getText().trim().isNotEmpty()); } }; - - -#endif // JUCER_NEWPROJECTWIZARDCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h b/extras/Projucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h index dff337dd49..b4bab3da4b 100644 --- a/extras/Projucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h +++ b/extras/Projucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef JUCER_TEMPLATETHUMBNAILSCOMPONENT_H_INCLUDED -#define JUCER_TEMPLATETHUMBNAILSCOMPONENT_H_INCLUDED +#pragma once //============================================================================== /** @@ -279,6 +278,3 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TemplateTileBrowser) }; - - -#endif // JUCER_TEMPLATETHUMBNAILSCOMPONENT_H_INCLUDED diff --git a/extras/Projucer/Source/jucer_Headers.h b/extras/Projucer/Source/jucer_Headers.h index e100107b18..a98c7ec595 100644 --- a/extras/Projucer/Source/jucer_Headers.h +++ b/extras/Projucer/Source/jucer_Headers.h @@ -22,8 +22,7 @@ ============================================================================== */ -#ifndef __JUCER_HEADERS_JUCEHEADER__ -#define __JUCER_HEADERS_JUCEHEADER__ +#pragma once #include "../JuceLibraryCode/JuceHeader.h" #include "Application/jucer_CommonHeaders.h" @@ -33,6 +32,3 @@ #else #define RUN_CLANG_IN_CHILD_PROCESS 1 #endif - - -#endif diff --git a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h index ff66a9d717..9e97df612e 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h +++ b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_Z2XZCP__ -#define __JUCE_APPCONFIG_Z2XZCP__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -211,6 +210,3 @@ #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA #endif - - -#endif // __JUCE_APPCONFIG_Z2XZCP__ diff --git a/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h b/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h index 3b0d0bc764..5248c5dda4 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h +++ b/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_Z2XZCP__ -#define __APPHEADERFILE_Z2XZCP__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_Z2XZCP__ diff --git a/extras/binarybuilder/JuceLibraryCode/AppConfig.h b/extras/binarybuilder/JuceLibraryCode/AppConfig.h index 0f39490cd4..6ca7c2df96 100644 --- a/extras/binarybuilder/JuceLibraryCode/AppConfig.h +++ b/extras/binarybuilder/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_3T6YQETY1__ -#define __JUCE_APPCONFIG_3T6YQETY1__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -69,6 +68,3 @@ #ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES //#define JUCE_ALLOW_STATIC_NULL_VARIABLES #endif - - -#endif // __JUCE_APPCONFIG_3T6YQETY1__ diff --git a/extras/binarybuilder/JuceLibraryCode/JuceHeader.h b/extras/binarybuilder/JuceLibraryCode/JuceHeader.h index b934ac50cc..100a8e1b20 100644 --- a/extras/binarybuilder/JuceLibraryCode/JuceHeader.h +++ b/extras/binarybuilder/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_3T6YQETY1__ -#define __APPHEADERFILE_3T6YQETY1__ +#pragma once #include "AppConfig.h" @@ -32,5 +31,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_3T6YQETY1__ diff --git a/extras/binarybuilder/Source/Main.cpp b/extras/binarybuilder/Source/Main.cpp index 86e57de00b..275b52a2d6 100644 --- a/extras/binarybuilder/Source/Main.cpp +++ b/extras/binarybuilder/Source/Main.cpp @@ -153,8 +153,7 @@ int main (int argc, char* argv[]) } *header << "/* (Auto-generated binary data file). */\r\n\r\n" - "#ifndef BINARY_" << className.toUpperCase() << "_H\r\n" - "#define BINARY_" << className.toUpperCase() << "_H\r\n\r\n" + "#pragma once\r\n\r\n" "namespace " << className << "\r\n" "{\r\n"; @@ -187,8 +186,7 @@ int main (int argc, char* argv[]) } } - *header << "}\r\n\r\n" - "#endif\r\n"; + *header << "}\r\n"; header = nullptr; cpp = nullptr; diff --git a/extras/windows dll/JuceLibraryCode/AppConfig.h b/extras/windows dll/JuceLibraryCode/AppConfig.h index c84981f2b7..5094db371f 100644 --- a/extras/windows dll/JuceLibraryCode/AppConfig.h +++ b/extras/windows dll/JuceLibraryCode/AppConfig.h @@ -11,8 +11,7 @@ */ -#ifndef __JUCE_APPCONFIG_IVABE4__ -#define __JUCE_APPCONFIG_IVABE4__ +#pragma once //============================================================================== // [BEGIN_USER_CODE_SECTION] @@ -222,6 +221,3 @@ #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA #endif - - -#endif // __JUCE_APPCONFIG_IVABE4__ diff --git a/extras/windows dll/JuceLibraryCode/JuceHeader.h b/extras/windows dll/JuceLibraryCode/JuceHeader.h index f43f8196a8..307fc90a7e 100644 --- a/extras/windows dll/JuceLibraryCode/JuceHeader.h +++ b/extras/windows dll/JuceLibraryCode/JuceHeader.h @@ -10,8 +10,7 @@ */ -#ifndef __APPHEADERFILE_IVABE4__ -#define __APPHEADERFILE_IVABE4__ +#pragma once #include "AppConfig.h" @@ -45,5 +44,3 @@ namespace ProjectInfo const int versionNumber = 0x10000; } #endif - -#endif // __APPHEADERFILE_IVABE4__ diff --git a/modules/juce_audio_processors/format_types/juce_VSTInterface.h b/modules/juce_audio_processors/format_types/juce_VSTInterface.h index 502f3672b6..fc1010533b 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTInterface.h +++ b/modules/juce_audio_processors/format_types/juce_VSTInterface.h @@ -22,7 +22,7 @@ ============================================================================== */ -#ifndef JUCE_VSTINTERFACE_H_INCLUDED +#pragma once #define JUCE_VSTINTERFACE_H_INCLUDED #include "../../juce_core/juce_core.h" @@ -454,5 +454,3 @@ enum VstSpeakerConfigurationType #else #pragma pack(pop) #endif - -#endif // JUCE_VSTINTERFACE_H_INCLUDED diff --git a/modules/juce_events/native/juce_linux_EventLoop.h b/modules/juce_events/native/juce_linux_EventLoop.h index 2b552a49b3..58122d9687 100644 --- a/modules/juce_events/native/juce_linux_EventLoop.h +++ b/modules/juce_events/native/juce_linux_EventLoop.h @@ -1,5 +1,4 @@ -#ifndef JUCE_LINUX_EVENTLOOP_H_INCLUDED -#define JUCE_LINUX_EVENTLOOP_H_INCLUDED +#pragma once namespace LinuxEventLoop { @@ -29,5 +28,3 @@ namespace LinuxEventLoop void setWindowSystemFdInternal (int fd, CallbackFunctionBase* readCallback) noexcept; } - -#endif /* JUCE_LINUX_EVENTLOOP_H_INCLUDED */ diff --git a/modules/juce_gui_basics/native/juce_linux_X11.h b/modules/juce_gui_basics/native/juce_linux_X11.h index 3a31d2351e..176b2b387c 100644 --- a/modules/juce_gui_basics/native/juce_linux_X11.h +++ b/modules/juce_gui_basics/native/juce_linux_X11.h @@ -1,5 +1,4 @@ -#ifndef JUCE_XWINDOWSYSTEM_H_INCLUDED -#define JUCE_XWINDOWSYSTEM_H_INCLUDED +#pragma once // Hack to forward declare _XDisplay outside the // juce namespace @@ -110,5 +109,3 @@ struct GetXProperty }; #undef ATOM_TYPE - -#endif // JUCE_XWINDOWSYSTEM_H_INCLUDED