Fix build against latest juce

Author: falkTX

ports/Makefile

@@ -27,9 +27,9 @@ lv2:
 vst:
 	install -d ../bin/vst
 	$(MAKE) -C argotlunar/VST
-# 	$(MAKE) -C cabbage/VST-fx
-# 	$(MAKE) -C cabbage/VST-ins
-# 	$(MAKE) -C cabbage/VST-midi
+# # 	$(MAKE) -C cabbage/VST-fx
+# # 	$(MAKE) -C cabbage/VST-ins
+# # 	$(MAKE) -C cabbage/VST-midi
 	$(MAKE) -C protoplug/VST-fx
 	$(MAKE) -C protoplug/VST-gen
 	$(MAKE) -C PdPulp/VST-fx

ports/PdPulp/Source/MainComponent.cpp

@@ -50,7 +50,7 @@ MainComponent::MainComponent (PureDataAudioProcessor& processor)
     findButton->setColour (TextButton::buttonOnColourId, Colour (0xff727272));
 
     addAndMakeVisible (pathField = new Label ("new label",
-                                              String::empty));
+                                              String()));
     pathField->setFont (Font (15.00f, Font::plain));
     pathField->setJustificationType (Justification::centred);
     pathField->setEditable (false, false, false);
@@ -74,7 +74,7 @@ MainComponent::MainComponent (PureDataAudioProcessor& processor)
     editButton->setColour (TextButton::buttonOnColourId, Colour (0xff727272));
 
     addAndMakeVisible (statusField = new Label ("new label",
-                                                String::empty));
+                                                String()));
     statusField->setFont (Font (11.00f, Font::plain));
     statusField->setJustificationType (Justification::centred);
     statusField->setEditable (false, false, false);

ports/argotlunar/Source/Parameters.cpp

@@ -240,7 +240,7 @@ const String Parameters::getParameterName(int index)
     case kProgram:
         return "program";
     }
-    return String::empty;
+    return String();
 }
 
 const String Parameters::getParameterText(int index)

ports/argotlunar/Source/Plugin.cpp

@@ -376,7 +376,7 @@ void Plugin::saveBankXml(File* file)
 
     // output bank to file
     XmlElement* bankXml = program_bank->createBankXml();
-    file->replaceWithText(bankXml->createDocument(String::empty));
+    file->replaceWithText(bankXml->createDocument(String()));
     delete bankXml;
     editor_program_update_pending = true;
     setSavedState(true);
@@ -402,6 +402,6 @@ void Plugin::saveCurrentProgramXml(File* file)
 
     //output program to file
     XmlElement* program = program_bank->createProgramXml(current_program);
-    file->replaceWithText(program->createDocument(String::empty));
+    file->replaceWithText(program->createDocument(String()));
     delete program;
 }

ports/argotlunar/Source/PluginEditor.cpp

@@ -1694,7 +1694,7 @@ String CabbageGUIClass::getStringProp(Identifier prop, int index)
     		else if(prop.equalsIgnoreCase("snapshotData"))
     			return snapshotData[index].trim();
     		else*/
-    return String::empty;
+    return String();
 }
 //===================================================================
 Rectangle<int> CabbageGUIClass::getComponentBounds()
@@ -1720,7 +1720,7 @@ String CabbageGUIClass::getStringProp(Identifier prop)
         //Logger::writeToLog(prop+":"+strings.toString());
         return strings.toString();
     }
-	return String::empty;
+	return String();
 }
 //===================================================================
 StringArray CabbageGUIClass::getStringArrayProp(Identifier prop)
@@ -1825,7 +1825,7 @@ void CabbageGUIClass::setStringProp(Identifier prop, String val)
 String CabbageGUIClass::getColourProp(Identifier prop)
 {
     jassert(1);
-	return String::empty;
+	return String();
 }
 //===================================================================
 String CabbageGUIClass::getStringForIdentifier(var propsArray, String identifier, String type)

ports/cabbage/source/CabbageGUIClass.cpp

@@ -1155,7 +1155,7 @@ Font CabbageLookAndFeel::getComboBoxFont (ComboBox& box)
 
 Label* CabbageLookAndFeel::createComboBoxTextBox (ComboBox&)
 {
-    return new Label (String::empty, String::empty);
+    return new Label (String(), String());
 }
 
 void CabbageLookAndFeel::positionComboBoxText (ComboBox& box, Label& label)

ports/cabbage/source/CabbageLookAndFeel.cpp

@@ -2461,7 +2461,7 @@ void CabbagePluginAudioProcessorEditor::buttonClicked(Button* button)
                     {
                         if(getFilter()->getGUILayoutCtrls(i).getStringProp(CabbageIDs::type)==String("filebutton"))
                         {
-                            WildcardFileFilter wildcardFilter ("*.*", String::empty, "Foo files");
+                            WildcardFileFilter wildcardFilter ("*.*", String(), "Foo files");
 
 
                             const String filetype = getFilter()->getGUILayoutCtrls(i).getStringProp("filetype");

ports/cabbage/source/Plugin/CabbagePluginEditor.cpp

@@ -1298,7 +1298,7 @@ void CabbagePluginAudioProcessor::changeListenerCallback(ChangeBroadcaster *sour
 StringArray CabbagePluginAudioProcessor::getTableStatement(int tableNum)
 {
 StringArray fdata;
-fdata.add(String::empty);
+fdata.add(String());
 #ifndef Cabbage_No_Csound
     if(csCompileResult==OK)
     {
@@ -1632,28 +1632,28 @@ const String CabbagePluginAudioProcessor::getParameterName (int index)
 {
     if(index<(int)guiCtrls.size())//make sure index isn't out of range
         return guiCtrls.getReference(index).getStringProp(CabbageIDs::channel);
-    else return String::empty;
+    else return String();
 }
 
 const String CabbagePluginAudioProcessor::getParameterText (int index)
 {
     if(index<(int)guiCtrls.size())//make sure index isn't out of range
         return String (guiCtrls.getReference(index).getNumProp(CabbageIDs::value), 2);
-    else return String::empty;
+    else return String();
 }
 
 const String CabbagePluginAudioProcessor::getInputChannelName (int channelIndex) const
 {
     if(channelIndex<(int)guiCtrls.size())//make sure index isn't out of range
         return String (channelIndex + 1);
-    else return String::empty;
+    else return String();
 }
 
 const String CabbagePluginAudioProcessor::getOutputChannelName (int channelIndex) const
 {
     if(channelIndex<(int)guiCtrls.size())//make sure index isn't out of range
         return String (channelIndex + 1);
-    else return String::empty;
+    else return String();
 }
 
 bool CabbagePluginAudioProcessor::isInputChannelStereoPair (int /*index*/) const
@@ -1715,7 +1715,7 @@ void CabbagePluginAudioProcessor::setCurrentProgram (int /*index*/)
 
 const String CabbagePluginAudioProcessor::getProgramName (int /*index*/)
 {
-    return String::empty;
+    return String();
 }
 
 void CabbagePluginAudioProcessor::changeProgramName (int /*index*/, const String& /*newName*/)

ports/cabbage/source/Plugin/CabbagePluginProcessor.cpp

@@ -323,9 +323,9 @@ String LuaLink::callStringOverride(const char *fname, ...)
 	int numArgs = startVarargOverride(fname, args);
     va_end(args);
 	if (numArgs<0)
-		return String::empty; // state or function does not exist
+		return String(); // state or function does not exist
 	if (safepcall (fname, numArgs, 1, 0))
-		return String::empty; // function crashed
+		return String(); // function crashed
 	return safetostring();
 }
 
@@ -358,7 +358,7 @@ String LuaLink::safetostring()
 {
 	if (!ls->isstring(-1)) {
 		ls->settop(0);
-		return String::empty; // there is no string
+		return String(); // there is no string
 	}
 	String ret = ls->tostring(-1);
 	ls->settop(0);