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
@@ -1,49 +1,48 @@
 /*
  * 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 <Swiften/Base/Log.h>
 #include <Swiften/Base/Paths.h>
-#include <Swiften/Base/foreach.h>
 
 namespace Swift {
 
 ApplicationPathProvider::ApplicationPathProvider(const std::string& applicationName) : applicationName(applicationName) {
 }
 
 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) {
         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) {
+    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();
 }
 
 }
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
@@ -1,64 +1,62 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <SwifTools/Application/UnixApplicationPathProvider.h>
 
 #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 {
 
 UnixApplicationPathProvider::UnixApplicationPathProvider(const std::string& name) : ApplicationPathProvider(name) {
     resourceDirs.push_back(getExecutableDir() / "../resources"); // Development
     resourceDirs.push_back(getExecutableDir() / ".." / "share" / boost::to_lower_copy(getApplicationName())); // Local install
     char* xdgDataDirs = getenv("XDG_DATA_DIRS");
     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;
         }
     }
     resourceDirs.push_back("/usr/local/share/" + boost::to_lower_copy(getApplicationName()));
     resourceDirs.push_back("/usr/share/" + boost::to_lower_copy(getApplicationName()));
 }
 
 boost::filesystem::path UnixApplicationPathProvider::getHomeDir() const {
     char* home = getenv("HOME");
     return home ? boost::filesystem::path(home) : boost::filesystem::path();
 }
 
 boost::filesystem::path UnixApplicationPathProvider::getDataDir() const {
     char* xdgDataHome = getenv("XDG_DATA_HOME");
     std::string dataDir;
     if (xdgDataHome) {
         dataDir = std::string(xdgDataHome);
     }
 
     boost::filesystem::path dataPath = (dataDir.empty() ?
             getHomeDir() / ".local" / "share"
             : boost::filesystem::path(dataDir)) / boost::to_lower_copy(getApplicationName());
 
     try {
         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;
 }
 
 }