summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'SwifTools/Application')
-rw-r--r--SwifTools/Application/ApplicationPathProvider.cpp3
-rw-r--r--SwifTools/Application/UnixApplicationPathProvider.cpp8
2 files changed, 4 insertions, 7 deletions
diff --git a/SwifTools/Application/ApplicationPathProvider.cpp b/SwifTools/Application/ApplicationPathProvider.cpp
index a5080f9..8b952bb 100644
--- a/SwifTools/Application/ApplicationPathProvider.cpp
+++ b/SwifTools/Application/ApplicationPathProvider.cpp
@@ -10,7 +10,6 @@
#include <Swiften/Base/Log.h>
#include <Swiften/Base/Paths.h>
-#include <Swiften/Base/foreach.h>
namespace Swift {
@@ -33,7 +32,7 @@ boost::filesystem::path ApplicationPathProvider::getProfileDir(const std::string
boost::filesystem::path ApplicationPathProvider::getResourcePath(const std::string& resource) const {
std::vector<boost::filesystem::path> resourcePaths = getResourceDirs();
- foreach(const boost::filesystem::path& resourcePath, resourcePaths) {
+ for (const auto& resourcePath : resourcePaths) {
boost::filesystem::path r(resourcePath / resource);
if (boost::filesystem::exists(r)) {
return r;
diff --git a/SwifTools/Application/UnixApplicationPathProvider.cpp b/SwifTools/Application/UnixApplicationPathProvider.cpp
index c561d72..e455d23 100644
--- a/SwifTools/Application/UnixApplicationPathProvider.cpp
+++ b/SwifTools/Application/UnixApplicationPathProvider.cpp
@@ -8,14 +8,12 @@
#include <stdlib.h>
-#include <iostream>
-
#include <boost/algorithm/string.hpp>
#include <unistd.h>
+#include <Swiften/Base/Log.h>
#include <Swiften/Base/String.h>
-#include <Swiften/Base/foreach.h>
namespace Swift {
@@ -26,7 +24,7 @@ UnixApplicationPathProvider::UnixApplicationPathProvider(const std::string& name
if (xdgDataDirs) {
std::vector<std::string> dataDirs = String::split(xdgDataDirs, ':');
if (!dataDirs.empty()) {
- foreach(const std::string& dir, dataDirs) {
+ for (const auto& dir : dataDirs) {
resourceDirs.push_back(boost::filesystem::path(dir) / "swift");
}
return;
@@ -56,7 +54,7 @@ boost::filesystem::path UnixApplicationPathProvider::getDataDir() const {
boost::filesystem::create_directories(dataPath);
}
catch (const boost::filesystem::filesystem_error& e) {
- std::cerr << "ERROR: " << e.what() << std::endl;
+ SWIFT_LOG(error) << "file system error: " << e.what() << std::endl;
}
return dataPath;
}