diff --git a/sago/platform_folders.cpp b/sago/platform_folders.cpp index 170d373..5f419f1 100644 --- a/sago/platform_folders.cpp +++ b/sago/platform_folders.cpp @@ -72,7 +72,7 @@ static std::string getHome() { return res; } -#endif +#endif #ifdef _WIN32 // Make sure we don't bring in all the extra junk with windows.h @@ -191,21 +191,21 @@ namespace sago { #if !defined(_WIN32) && !defined(__APPLE__) namespace internal { - void appendExtraFoldersTokenizer(const char* envName, const char* envValue, std::vector& folders) { - std::stringstream ss(envValue); - std::string value; - while (std::getline(ss, value, ':')) { - if (value[0] == '/') { - folders.push_back(value); - } - else { - //Unless the system is wrongly configured this should never happen... But of course some systems will be incorectly configured. - //The XDG documentation indicates that the folder should be ignored but that the program should continue. - std::cerr << "Skipping path \"" << value << "\" in \"" << envName << "\" because it does not start with a \"/\"\n"; - } +void appendExtraFoldersTokenizer(const char* envName, const char* envValue, std::vector& folders) { + std::stringstream ss(envValue); + std::string value; + while (std::getline(ss, value, ':')) { + if (value[0] == '/') { + folders.push_back(value); + } + else { + //Unless the system is wrongly configured this should never happen... But of course some systems will be incorectly configured. + //The XDG documentation indicates that the folder should be ignored but that the program should continue. + std::cerr << "Skipping path \"" << value << "\" in \"" << envName << "\" because it does not start with a \"/\"\n"; } } } +} #endif std::string getDataHome() { @@ -273,7 +273,8 @@ static void PlatformFoldersAddFromFile(const std::string& filename, std::map& folders); - #endif - #ifdef _WIN32 - std::string win32_utf16_to_utf8(const wchar_t* wstr); - #endif +#if !defined(_WIN32) && !defined(__APPLE__) +void appendExtraFoldersTokenizer(const char* envName, const char* envValue, std::vector& folders); +#endif +#ifdef _WIN32 +std::string win32_utf16_to_utf8(const wchar_t* wstr); +#endif } #endif //DOXYGEN_SHOULD_SKIP_THIS @@ -225,7 +225,7 @@ public: */ std::string getPicturesFolder() const; /** - * Use sago::getPublicFolder() instead! + * Use sago::getPublicFolder() instead! */ std::string getPublicFolder() const; /**