Skip to content

Commit b6f25f1

Browse files
author
falkTX
committed
Fix build against latest juce
1 parent 0b3a99b commit b6f25f1

File tree

17 files changed

+156
-156
lines changed

17 files changed

+156
-156
lines changed

ports/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ lv2:
2727
vst:
2828
install -d ../bin/vst
2929
$(MAKE) -C argotlunar/VST
30-
# $(MAKE) -C cabbage/VST-fx
31-
# $(MAKE) -C cabbage/VST-ins
32-
# $(MAKE) -C cabbage/VST-midi
30+
# # $(MAKE) -C cabbage/VST-fx
31+
# # $(MAKE) -C cabbage/VST-ins
32+
# # $(MAKE) -C cabbage/VST-midi
3333
$(MAKE) -C protoplug/VST-fx
3434
$(MAKE) -C protoplug/VST-gen
3535
$(MAKE) -C PdPulp/VST-fx

ports/PdPulp/Source/MainComponent.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ MainComponent::MainComponent (PureDataAudioProcessor& processor)
5050
findButton->setColour (TextButton::buttonOnColourId, Colour (0xff727272));
5151

5252
addAndMakeVisible (pathField = new Label ("new label",
53-
String::empty));
53+
String()));
5454
pathField->setFont (Font (15.00f, Font::plain));
5555
pathField->setJustificationType (Justification::centred);
5656
pathField->setEditable (false, false, false);
@@ -74,7 +74,7 @@ MainComponent::MainComponent (PureDataAudioProcessor& processor)
7474
editButton->setColour (TextButton::buttonOnColourId, Colour (0xff727272));
7575

7676
addAndMakeVisible (statusField = new Label ("new label",
77-
String::empty));
77+
String()));
7878
statusField->setFont (Font (11.00f, Font::plain));
7979
statusField->setJustificationType (Justification::centred);
8080
statusField->setEditable (false, false, false);

ports/argotlunar/Source/Parameters.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ const String Parameters::getParameterName(int index)
240240
case kProgram:
241241
return "program";
242242
}
243-
return String::empty;
243+
return String();
244244
}
245245

246246
const String Parameters::getParameterText(int index)

ports/argotlunar/Source/Plugin.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ void Plugin::saveBankXml(File* file)
376376

377377
// output bank to file
378378
XmlElement* bankXml = program_bank->createBankXml();
379-
file->replaceWithText(bankXml->createDocument(String::empty));
379+
file->replaceWithText(bankXml->createDocument(String()));
380380
delete bankXml;
381381
editor_program_update_pending = true;
382382
setSavedState(true);
@@ -402,6 +402,6 @@ void Plugin::saveCurrentProgramXml(File* file)
402402

403403
//output program to file
404404
XmlElement* program = program_bank->createProgramXml(current_program);
405-
file->replaceWithText(program->createDocument(String::empty));
405+
file->replaceWithText(program->createDocument(String()));
406406
delete program;
407407
}

ports/argotlunar/Source/PluginEditor.cpp

Lines changed: 123 additions & 123 deletions
Large diffs are not rendered by default.

ports/cabbage/source/CabbageGUIClass.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,7 +1694,7 @@ String CabbageGUIClass::getStringProp(Identifier prop, int index)
16941694
else if(prop.equalsIgnoreCase("snapshotData"))
16951695
return snapshotData[index].trim();
16961696
else*/
1697-
return String::empty;
1697+
return String();
16981698
}
16991699
//===================================================================
17001700
Rectangle<int> CabbageGUIClass::getComponentBounds()
@@ -1720,7 +1720,7 @@ String CabbageGUIClass::getStringProp(Identifier prop)
17201720
//Logger::writeToLog(prop+":"+strings.toString());
17211721
return strings.toString();
17221722
}
1723-
return String::empty;
1723+
return String();
17241724
}
17251725
//===================================================================
17261726
StringArray CabbageGUIClass::getStringArrayProp(Identifier prop)
@@ -1825,7 +1825,7 @@ void CabbageGUIClass::setStringProp(Identifier prop, String val)
18251825
String CabbageGUIClass::getColourProp(Identifier prop)
18261826
{
18271827
jassert(1);
1828-
return String::empty;
1828+
return String();
18291829
}
18301830
//===================================================================
18311831
String CabbageGUIClass::getStringForIdentifier(var propsArray, String identifier, String type)

ports/cabbage/source/CabbageLookAndFeel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ Font CabbageLookAndFeel::getComboBoxFont (ComboBox& box)
11551155

11561156
Label* CabbageLookAndFeel::createComboBoxTextBox (ComboBox&)
11571157
{
1158-
return new Label (String::empty, String::empty);
1158+
return new Label (String(), String());
11591159
}
11601160

11611161
void CabbageLookAndFeel::positionComboBoxText (ComboBox& box, Label& label)

ports/cabbage/source/Plugin/CabbagePluginEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2461,7 +2461,7 @@ void CabbagePluginAudioProcessorEditor::buttonClicked(Button* button)
24612461
{
24622462
if(getFilter()->getGUILayoutCtrls(i).getStringProp(CabbageIDs::type)==String("filebutton"))
24632463
{
2464-
WildcardFileFilter wildcardFilter ("*.*", String::empty, "Foo files");
2464+
WildcardFileFilter wildcardFilter ("*.*", String(), "Foo files");
24652465

24662466

24672467
const String filetype = getFilter()->getGUILayoutCtrls(i).getStringProp("filetype");

ports/cabbage/source/Plugin/CabbagePluginProcessor.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,7 @@ void CabbagePluginAudioProcessor::changeListenerCallback(ChangeBroadcaster *sour
12981298
StringArray CabbagePluginAudioProcessor::getTableStatement(int tableNum)
12991299
{
13001300
StringArray fdata;
1301-
fdata.add(String::empty);
1301+
fdata.add(String());
13021302
#ifndef Cabbage_No_Csound
13031303
if(csCompileResult==OK)
13041304
{
@@ -1632,28 +1632,28 @@ const String CabbagePluginAudioProcessor::getParameterName (int index)
16321632
{
16331633
if(index<(int)guiCtrls.size())//make sure index isn't out of range
16341634
return guiCtrls.getReference(index).getStringProp(CabbageIDs::channel);
1635-
else return String::empty;
1635+
else return String();
16361636
}
16371637

16381638
const String CabbagePluginAudioProcessor::getParameterText (int index)
16391639
{
16401640
if(index<(int)guiCtrls.size())//make sure index isn't out of range
16411641
return String (guiCtrls.getReference(index).getNumProp(CabbageIDs::value), 2);
1642-
else return String::empty;
1642+
else return String();
16431643
}
16441644

16451645
const String CabbagePluginAudioProcessor::getInputChannelName (int channelIndex) const
16461646
{
16471647
if(channelIndex<(int)guiCtrls.size())//make sure index isn't out of range
16481648
return String (channelIndex + 1);
1649-
else return String::empty;
1649+
else return String();
16501650
}
16511651

16521652
const String CabbagePluginAudioProcessor::getOutputChannelName (int channelIndex) const
16531653
{
16541654
if(channelIndex<(int)guiCtrls.size())//make sure index isn't out of range
16551655
return String (channelIndex + 1);
1656-
else return String::empty;
1656+
else return String();
16571657
}
16581658

16591659
bool CabbagePluginAudioProcessor::isInputChannelStereoPair (int /*index*/) const
@@ -1715,7 +1715,7 @@ void CabbagePluginAudioProcessor::setCurrentProgram (int /*index*/)
17151715

17161716
const String CabbagePluginAudioProcessor::getProgramName (int /*index*/)
17171717
{
1718-
return String::empty;
1718+
return String();
17191719
}
17201720

17211721
void CabbagePluginAudioProcessor::changeProgramName (int /*index*/, const String& /*newName*/)

ports/protoplug/Source/LuaLink.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,9 @@ String LuaLink::callStringOverride(const char *fname, ...)
323323
int numArgs = startVarargOverride(fname, args);
324324
va_end(args);
325325
if (numArgs<0)
326-
return String::empty; // state or function does not exist
326+
return String(); // state or function does not exist
327327
if (safepcall (fname, numArgs, 1, 0))
328-
return String::empty; // function crashed
328+
return String(); // function crashed
329329
return safetostring();
330330
}
331331

@@ -358,7 +358,7 @@ String LuaLink::safetostring()
358358
{
359359
if (!ls->isstring(-1)) {
360360
ls->settop(0);
361-
return String::empty; // there is no string
361+
return String(); // there is no string
362362
}
363363
String ret = ls->tostring(-1);
364364
ls->settop(0);

0 commit comments

Comments
 (0)