From 3b2c6a545e8d33f92ed3b0403a3caf6bc0cf739e Mon Sep 17 00:00:00 2001 From: reuk Date: Wed, 8 Mar 2023 14:28:44 +0000 Subject: [PATCH] Plugin Client: Normalise includes --- .../AAX/juce_AAX_Wrapper.cpp | 8 ++++---- .../ARA/juce_ARA_Wrapper.cpp | 6 +++--- .../juce_audio_plugin_client/AU/juce_AU_Wrapper.mm | 6 +++--- .../juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm | 6 +++--- .../Standalone/juce_StandaloneFilterApp.cpp | 10 +++++----- .../Standalone/juce_StandaloneFilterWindow.h | 2 +- .../Unity/juce_Unity_Wrapper.cpp | 4 ++-- .../VST/juce_VST_Wrapper.cpp | 10 +++++----- .../juce_audio_plugin_client/VST/juce_VST_Wrapper.mm | 6 +++--- .../VST3/juce_VST3_Wrapper.cpp | 12 ++++++------ .../utility/juce_IncludeModuleHeaders.h | 2 +- .../utility/juce_PluginUtilities.cpp | 4 ++-- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp index 2367cf29ca..f4fb880ab7 100644 --- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp @@ -24,13 +24,13 @@ */ #include -#include "../utility/juce_CheckSettingMacros.h" +#include #if JucePlugin_Build_AAX && (JUCE_MAC || JUCE_WINDOWS) -#include "../utility/juce_IncludeSystemHeaders.h" -#include "../utility/juce_IncludeModuleHeaders.h" -#include "../utility/juce_WindowsHooks.h" +#include +#include +#include #include diff --git a/modules/juce_audio_plugin_client/ARA/juce_ARA_Wrapper.cpp b/modules/juce_audio_plugin_client/ARA/juce_ARA_Wrapper.cpp index 44f39beb93..4be01d8c94 100644 --- a/modules/juce_audio_plugin_client/ARA/juce_ARA_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/ARA/juce_ARA_Wrapper.cpp @@ -24,12 +24,12 @@ */ #include -#include "../utility/juce_CheckSettingMacros.h" +#include #if JucePlugin_Enable_ARA -#include "../utility/juce_IncludeSystemHeaders.h" -#include "../utility/juce_IncludeModuleHeaders.h" +#include +#include JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wunused-parameter", "-Wgnu-zero-variadic-macro-arguments", "-Wmissing-prototypes") JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4100) diff --git a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm index f19c6881c5..a97fdee747 100644 --- a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm +++ b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm @@ -25,7 +25,7 @@ #include #include -#include "../utility/juce_CheckSettingMacros.h" +#include #if JucePlugin_Build_AU @@ -45,7 +45,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wshorten-64-to-32", "-Wformat-pedantic", "-Wdeprecated-anon-enum-enum-conversion") -#include "../utility/juce_IncludeSystemHeaders.h" +#include #include #include @@ -58,7 +58,7 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE #define JUCE_CORE_INCLUDE_OBJC_HELPERS 1 -#include "../utility/juce_IncludeModuleHeaders.h" +#include #include #include diff --git a/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm index d91d07ae26..04610cda42 100644 --- a/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm +++ b/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm @@ -24,7 +24,7 @@ */ #include -#include "../utility/juce_CheckSettingMacros.h" +#include #if JucePlugin_Build_AUv3 @@ -38,8 +38,8 @@ #define JUCE_CORE_INCLUDE_OBJC_HELPERS 1 -#include "../utility/juce_IncludeSystemHeaders.h" -#include "../utility/juce_IncludeModuleHeaders.h" +#include +#include #import #import diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp index 1f13a1d8a9..67d4534f42 100644 --- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp +++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp @@ -24,11 +24,11 @@ */ #include -#include "../utility/juce_CheckSettingMacros.h" +#include -#include "../utility/juce_IncludeSystemHeaders.h" -#include "../utility/juce_IncludeModuleHeaders.h" -#include "../utility/juce_WindowsHooks.h" +#include +#include +#include #include #include @@ -39,7 +39,7 @@ // set it then by default we'll just create a simple one as below. #if ! JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP -#include "juce_StandaloneFilterWindow.h" +#include namespace juce { diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h index 13d02e24a3..d7268e436d 100644 --- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h +++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h @@ -26,7 +26,7 @@ #pragma once #ifndef DOXYGEN - #include "../utility/juce_CreatePluginFilter.h" + #include #endif namespace juce diff --git a/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp b/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp index e2cc0f692f..e889b09ead 100644 --- a/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp @@ -27,11 +27,11 @@ #if JucePlugin_Build_Unity -#include "../utility/juce_IncludeModuleHeaders.h" +#include #include #if JUCE_WINDOWS - #include "../utility/juce_IncludeSystemHeaders.h" + #include #endif #include "juce_UnityPluginInterface.h" diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp index 2e789e4680..887c0585b3 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp @@ -25,13 +25,13 @@ #include #include -#include "../utility/juce_CheckSettingMacros.h" +#include #if JucePlugin_Build_VST JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996 4100) -#include "../utility/juce_IncludeSystemHeaders.h" +#include #include #if JucePlugin_VersionCode < 0x010000 // Major < 0 @@ -100,12 +100,12 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE #define JUCE_VSTINTERFACE_H_INCLUDED 1 #define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1 -#include "../utility/juce_IncludeModuleHeaders.h" +#include using namespace juce; -#include "../utility/juce_WindowsHooks.h" -#include "../utility/juce_LinuxMessageThread.h" +#include +#include #include #include diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm index 2c13881a5a..79c0b0ce0d 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm @@ -27,12 +27,12 @@ #if JUCE_MAC -#include "../utility/juce_CheckSettingMacros.h" +#include #if JucePlugin_Build_VST || JucePlugin_Build_VST3 -#include "../utility/juce_IncludeSystemHeaders.h" -#include "../utility/juce_IncludeModuleHeaders.h" +#include +#include //============================================================================== namespace juce diff --git a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp index 7a1746fe97..33a284d0f4 100644 --- a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp @@ -44,11 +44,11 @@ JUCE_BEGIN_NO_SANITIZE ("vptr") #undef JUCE_VST3HEADERS_INCLUDE_HEADERS_ONLY #define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1 -#include "../utility/juce_CheckSettingMacros.h" -#include "../utility/juce_IncludeSystemHeaders.h" -#include "../utility/juce_IncludeModuleHeaders.h" -#include "../utility/juce_WindowsHooks.h" -#include "../utility/juce_LinuxMessageThread.h" +#include +#include +#include +#include +#include #include #include #include @@ -78,7 +78,7 @@ JUCE_BEGIN_NO_SANITIZE ("vptr") #endif #if JUCE_LINUX || JUCE_BSD - #include "juce_events/native/juce_linux_EventLoopInternal.h" + #include #include #endif diff --git a/modules/juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h b/modules/juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h index 70547cbe5e..d8fc9bc1ce 100644 --- a/modules/juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h +++ b/modules/juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h @@ -24,7 +24,7 @@ */ #include -#include "juce_CreatePluginFilter.h" +#include namespace juce { diff --git a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp b/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp index f6b4b2689d..4e4e18cdb6 100644 --- a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp +++ b/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp @@ -28,8 +28,8 @@ #endif #include -#include "../utility/juce_CheckSettingMacros.h" -#include "juce_IncludeModuleHeaders.h" +#include +#include namespace juce {