upgrade to JUCE 5.4.3. Remove (probably) unused JUCE modules. Remove VST2 target (it's been end-of-life'd by Steinberg and by JUCE)
This commit is contained in:
@ -27,16 +27,16 @@
|
||||
namespace juce
|
||||
{
|
||||
|
||||
static XmlElement* findFontsConfFile()
|
||||
static std::unique_ptr<XmlElement> findFontsConfFile()
|
||||
{
|
||||
static const char* pathsToSearch[] = { "/etc/fonts/fonts.conf",
|
||||
"/usr/share/fonts/fonts.conf" };
|
||||
|
||||
for (auto* path : pathsToSearch)
|
||||
if (auto* xml = XmlDocument::parse (File (path)))
|
||||
if (auto xml = parseXML (File (path)))
|
||||
return xml;
|
||||
|
||||
return nullptr;
|
||||
return {};
|
||||
}
|
||||
|
||||
StringArray FTTypefaceList::getDefaultFontDirectories()
|
||||
@ -48,9 +48,7 @@ StringArray FTTypefaceList::getDefaultFontDirectories()
|
||||
|
||||
if (fontDirs.isEmpty())
|
||||
{
|
||||
std::unique_ptr<XmlElement> fontsInfo (findFontsConfFile());
|
||||
|
||||
if (fontsInfo != nullptr)
|
||||
if (auto fontsInfo = findFontsConfFile())
|
||||
{
|
||||
forEachXmlChildElementWithTagName (*fontsInfo, e, "dir")
|
||||
{
|
||||
|
Reference in New Issue
Block a user