4 files changed, 6 insertions, 12 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;
 }
diff --git a/SwifTools/Notifier/GNTPNotifier.cpp b/SwifTools/Notifier/GNTPNotifier.cpp
index 62203b4..89025af 100644
--- a/SwifTools/Notifier/GNTPNotifier.cpp
+++ b/SwifTools/Notifier/GNTPNotifier.cpp
@@ -15,7 +15,6 @@
 #include <boost/bind.hpp>
 
 #include <Swiften/Base/Path.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Network/ConnectionFactory.h>
 
 namespace Swift {
@@ -29,7 +28,7 @@ GNTPNotifier::GNTPNotifier(const std::string& name, const boost::filesystem::pat
     message << "Notifications-Count: " << getAllTypes().size() << "\r\n";
     std::vector<Notifier::Type> defaultTypes = getDefaultTypes();
     std::vector<Notifier::Type> allTypes = getAllTypes();
-    foreach(Notifier::Type type, allTypes) {
+    for (const auto& type : allTypes) {
         message << "\r\n";
         message << "Notification-Name: " << typeToString(type) << "\r\n";
         message << "Notification-Enabled: " << (std::find(defaultTypes.begin(), defaultTypes.end(), type) == defaultTypes.end() ? "false" : "true") << "\r\n";
diff --git a/SwifTools/TabComplete.cpp b/SwifTools/TabComplete.cpp
index f158ffa..39a70cc 100644
--- a/SwifTools/TabComplete.cpp
+++ b/SwifTools/TabComplete.cpp
@@ -10,8 +10,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <Swiften/Base/foreach.h>
-
 namespace Swift {
 
 void TabComplete::addWord(const std::string& word) {
@@ -43,7 +41,7 @@ std::string TabComplete::completeWord(const std::string& word) {
     } else {
         lastShort_ = boost::to_lower_copy(word);
         lastCompletionCandidates_.clear();
-        foreach (std::string candidate, words_) {
+        for (auto&& candidate : words_) {
             if (boost::starts_with(boost::to_lower_copy(candidate), boost::to_lower_copy(word))) {
                 lastCompletionCandidates_.push_back(candidate);
             }