From 2bfed0b354519addb6d0b29ef1d8f5ceed75038c Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Fri, 22 May 2020 11:59:35 +0100
Subject: [PATCH] Removed some unnecessary JUCE_MODULE_AVAILABLE_* checks

---
 modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm     | 2 --
 .../Standalone/juce_StandaloneFilterApp.cpp                  | 2 --
 .../juce_audio_plugin_client/utility/juce_PluginHostType.h   | 4 +---
 .../utility/juce_PluginUtilities.cpp                         | 5 -----
 modules/juce_events/messages/juce_MessageManager.h           | 5 -----
 5 files changed, 1 insertion(+), 17 deletions(-)

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 e6856a33d6..fcba2e2ab9 100644
--- a/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm
+++ b/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm
@@ -1934,10 +1934,8 @@ private:
 #if JUCE_IOS
 bool JUCE_CALLTYPE juce_isInterAppAudioConnected() { return false; }
 void JUCE_CALLTYPE juce_switchToHostApplication()  {}
-#if JUCE_MODULE_AVAILABLE_juce_gui_basics
 Image JUCE_CALLTYPE juce_getIAAHostIcon (int)      { return {}; }
 #endif
-#endif
 
 JUCE_END_IGNORE_WARNINGS_GCC_LIKE
 #endif
diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp
index fdcc38fe5c..7bb75e1762 100644
--- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp
+++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp
@@ -149,7 +149,6 @@ void JUCE_CALLTYPE juce_switchToHostApplication()
         holder->switchToHostApplication();
 }
 
-#if JUCE_MODULE_AVAILABLE_juce_gui_basics
 Image JUCE_CALLTYPE juce_getIAAHostIcon (int size)
 {
     if (auto holder = StandalonePluginHolder::getInstance())
@@ -158,6 +157,5 @@ Image JUCE_CALLTYPE juce_getIAAHostIcon (int size)
     return Image();
 }
 #endif
-#endif
 
 #endif
diff --git a/modules/juce_audio_plugin_client/utility/juce_PluginHostType.h b/modules/juce_audio_plugin_client/utility/juce_PluginHostType.h
index 2c4de3d2b0..3ab05fd55c 100644
--- a/modules/juce_audio_plugin_client/utility/juce_PluginHostType.h
+++ b/modules/juce_audio_plugin_client/utility/juce_PluginHostType.h
@@ -264,10 +264,8 @@ public:
     bool isInterAppAudioConnected() const;
     /** Switches to the host application when Inter-App Audio is used on iOS. */
     void switchToHostApplication() const;
-
-   #if JUCE_MODULE_AVAILABLE_juce_gui_basics
+    /** Gets the host app's icon when Inter-App Audio is used on iOS. */
     Image getHostIcon (int size) const;
-   #endif
 
     //==============================================================================
     /** Returns the complete absolute path of the host application executable. */
diff --git a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp b/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp
index b89f687391..b981d431ae 100644
--- a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp
+++ b/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp
@@ -145,10 +145,7 @@ using namespace juce;
 #if JucePlugin_Enable_IAA && JucePlugin_Build_Standalone && JUCE_IOS && (! JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP)
  extern bool JUCE_CALLTYPE juce_isInterAppAudioConnected();
  extern void JUCE_CALLTYPE juce_switchToHostApplication();
-
- #if JUCE_MODULE_AVAILABLE_juce_gui_basics
  extern Image JUCE_CALLTYPE juce_getIAAHostIcon (int);
- #endif
 #endif
 
 bool PluginHostType::isInterAppAudioConnected() const
@@ -183,7 +180,6 @@ bool PluginHostType::isInAAXAudioSuite (AudioProcessor& processor)
     return false;
 }
 
-#if JUCE_MODULE_AVAILABLE_juce_gui_basics
 namespace juce {
 
 extern Image JUCE_API getIconFromApplication (const String&, const int);
@@ -206,4 +202,3 @@ Image PluginHostType::getHostIcon (int size) const
 }
 
 }
-#endif
diff --git a/modules/juce_events/messages/juce_MessageManager.h b/modules/juce_events/messages/juce_MessageManager.h
index e83594b496..ae72311019 100644
--- a/modules/juce_events/messages/juce_MessageManager.h
+++ b/modules/juce_events/messages/juce_MessageManager.h
@@ -28,11 +28,6 @@ class ThreadPoolJob;
 class ActionListener;
 class ActionBroadcaster;
 
-//==============================================================================
-#if JUCE_MODULE_AVAILABLE_juce_opengl
-class OpenGLContext;
-#endif
-
 //==============================================================================
 /** See MessageManager::callFunctionOnMessageThread() for use of this function type. */
 using MessageCallbackFunction = void* (void* userData);