From 36f561a8e586367cd58af1402f811dacc0aeff26 Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 5 Dec 2016 12:06:04 +0000 Subject: [PATCH] Changed FileHelpers namespace to MacFileHelpers in juce_mac_Files.mm to be consistent with other native code --- modules/juce_core/native/juce_mac_Files.mm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/juce_core/native/juce_mac_Files.mm b/modules/juce_core/native/juce_mac_Files.mm index 35d8629fcc..e3e5baf2bc 100644 --- a/modules/juce_core/native/juce_mac_Files.mm +++ b/modules/juce_core/native/juce_mac_Files.mm @@ -58,7 +58,7 @@ void File::findFileSystemRoots (Array& destArray) //============================================================================== -namespace FileHelpers +namespace MacFileHelpers { static bool isFileOnDriveType (const File& f, const char* const* types) { @@ -134,14 +134,14 @@ bool File::isOnCDRomDrive() const { static const char* const cdTypes[] = { "cd9660", "cdfs", "cddafs", "udf", nullptr }; - return FileHelpers::isFileOnDriveType (*this, cdTypes); + return MacFileHelpers::isFileOnDriveType (*this, cdTypes); } bool File::isOnHardDisk() const { static const char* const nonHDTypes[] = { "nfs", "smbfs", "ramfs", nullptr }; - return ! (isOnCDRomDrive() || FileHelpers::isFileOnDriveType (*this, nonHDTypes)); + return ! (isOnCDRomDrive() || MacFileHelpers::isFileOnDriveType (*this, nonHDTypes)); } bool File::isOnRemovableDrive() const @@ -168,7 +168,7 @@ bool File::isOnRemovableDrive() const bool File::isHidden() const { - return FileHelpers::isHiddenFile (getFullPathName()); + return MacFileHelpers::isHiddenFile (getFullPathName()); } //============================================================================== @@ -360,7 +360,7 @@ public: updateStatInfoForFile (fullPath, isDir, fileSize, modTime, creationTime, isReadOnly); if (isHidden != nullptr) - *isHidden = FileHelpers::isHiddenFile (fullPath); + *isHidden = MacFileHelpers::isHiddenFile (fullPath); return true; } @@ -441,7 +441,7 @@ bool JUCE_CALLTYPE Process::openDocument (const String& fileName, const String& } if (file.exists()) - return FileHelpers::launchExecutable ("\"" + fileName + "\" " + parameters); + return MacFileHelpers::launchExecutable ("\"" + fileName + "\" " + parameters); return false; #endif