Dont use the new code for now

source/tests/CarlaUtils4.cpp

@@ -26,6 +26,7 @@ using namespace CarlaBackend;
 // -----------------------------------------------------------------------
 
 #define HAVE_JUCE
+#define HAVE_JUCE_LATER
 #undef CARLA_BACKEND_START_NAMESPACE
 #define CARLA_BACKEND_START_NAMESPACE namespace state_juce {
 #include "CarlaStateUtils.cpp"
@@ -37,6 +38,7 @@ using namespace CarlaBackend;
 // -----------------------------------------------------------------------
 
 #undef HAVE_JUCE
+#undef HAVE_JUCE_LATER
 #undef CARLA_BACKEND_START_NAMESPACE
 #define CARLA_BACKEND_START_NAMESPACE namespace state_qt {
 #include "CarlaStateUtils.cpp"

source/utils/CarlaStateUtils.cpp

@@ -21,7 +21,7 @@
 #include "CarlaMathUtils.hpp"
 #include "CarlaMIDI.h"
 
-#ifdef HAVE_JUCE
+#ifdef HAVE_JUCE_LATER
 # include "juce_core.h"
 using juce::String;
 using juce::XmlElement;
@@ -176,7 +176,7 @@ void SaveState::reset() noexcept
 // -----------------------------------------------------------------------
 // xmlSafeString
 
-#ifdef HAVE_JUCE
+#ifdef HAVE_JUCE_LATER
 static String xmlSafeString(const String& string, const bool toXml)
 {
     String newString(string);
@@ -201,7 +201,7 @@ static QString xmlSafeString(const QString& string, const bool toXml)
 // -----------------------------------------------------------------------
 // xmlSafeStringCharDup
 
-#ifdef HAVE_JUCE
+#ifdef HAVE_JUCE_LATER
 static const char* xmlSafeStringCharDup(const String& string, const bool toXml)
 {
     return carla_strdup(xmlSafeString(string, toXml).toRawUTF8());
@@ -216,7 +216,7 @@ static const char* xmlSafeStringCharDup(const QString& string, const bool toXml)
 // -----------------------------------------------------------------------
 // fillSaveStateFromXmlNode
 
-#ifdef HAVE_JUCE
+#ifdef HAVE_JUCE_LATER
 void fillSaveStateFromXmlNode(SaveState& saveState, const XmlElement* const xmlElement)
 {
     CARLA_SAFE_ASSERT_RETURN(xmlElement != nullptr,);
@@ -625,7 +625,7 @@ void fillSaveStateFromXmlNode(SaveState& saveState, const QDomNode& xmlNode)
 // -----------------------------------------------------------------------
 // fillXmlStringFromSaveState
 
-#ifdef HAVE_JUCE
+#ifdef HAVE_JUCE_LATER
 void fillXmlStringFromSaveState(String& content, const SaveState& saveState)
 {
     {

source/utils/CarlaStateUtils.hpp

@@ -21,7 +21,7 @@
 #include "CarlaBackend.h"
 #include "LinkedList.hpp"
 
-#ifdef HAVE_JUCE
+#ifdef HAVE_JUCE_LATER
 namespace juce {
 class String;
 class XmlElement;
@@ -106,7 +106,7 @@ struct SaveState {
 
 // -----------------------------------------------------------------------
 
-#ifdef HAVE_JUCE
+#ifdef HAVE_JUCE_LATER
 void fillSaveStateFromXmlNode(SaveState& saveState, const juce::XmlElement* const xmlElement);
 void fillXmlStringFromSaveState(juce::String& content, const SaveState& saveState);
 #else