diff options
Diffstat (limited to 'SwifTools/Application/ApplicationPathProvider.cpp')
| -rw-r--r-- | SwifTools/Application/ApplicationPathProvider.cpp | 42 | 
1 files changed, 21 insertions, 21 deletions
diff --git a/SwifTools/Application/ApplicationPathProvider.cpp b/SwifTools/Application/ApplicationPathProvider.cpp index 358a5fc..8b952bb 100644 --- a/SwifTools/Application/ApplicationPathProvider.cpp +++ b/SwifTools/Application/ApplicationPathProvider.cpp @@ -1,14 +1,14 @@  /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited.   * All rights reserved.   * See the COPYING file for more information.   */ +#include <SwifTools/Application/ApplicationPathProvider.h> +  #include <boost/filesystem.hpp> -#include <iostream> -#include <SwifTools/Application/ApplicationPathProvider.h> -#include <Swiften/Base/foreach.h> +#include <Swiften/Base/Log.h>  #include <Swiften/Base/Paths.h>  namespace Swift { @@ -20,29 +20,29 @@ ApplicationPathProvider::~ApplicationPathProvider() {  }  boost::filesystem::path ApplicationPathProvider::getProfileDir(const std::string& profile) const { -	boost::filesystem::path result(getHomeDir() / profile); -	try { -		boost::filesystem::create_directory(result); -	} -	catch (const boost::filesystem::filesystem_error& e) { -		std::cerr << "ERROR: " << e.what() << std::endl; -	} -	return result; +    boost::filesystem::path result(getHomeDir() / profile); +    try { +        boost::filesystem::create_directory(result); +    } +    catch (const boost::filesystem::filesystem_error& e) { +        SWIFT_LOG(error) << e.what() << std::endl; +    } +    return result;  }  boost::filesystem::path ApplicationPathProvider::getResourcePath(const std::string& resource) const { -	std::vector<boost::filesystem::path> resourcePaths = getResourceDirs(); -	foreach(const boost::filesystem::path& resourcePath, resourcePaths) { -		boost::filesystem::path r(resourcePath / resource); -		if (boost::filesystem::exists(r)) { -			return r; -		} -	} -	return boost::filesystem::path(); +    std::vector<boost::filesystem::path> resourcePaths = getResourceDirs(); +    for (const auto& resourcePath : resourcePaths) { +        boost::filesystem::path r(resourcePath / resource); +        if (boost::filesystem::exists(r)) { +            return r; +        } +    } +    return boost::filesystem::path();  }  boost::filesystem::path ApplicationPathProvider::getExecutableDir() const { -	return Paths::getExecutablePath(); +    return Paths::getExecutablePath();  }  }  | 
 Swift