3 files changed, 3 insertions, 7 deletions
diff --git a/Swiften/EventLoop/EventLoop.cpp b/Swiften/EventLoop/EventLoop.cpp
index eefbf65..186616f 100644
--- a/Swiften/EventLoop/EventLoop.cpp
+++ b/Swiften/EventLoop/EventLoop.cpp
@@ -16,7 +16,6 @@
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/foreach.h>
 
 namespace lambda = boost::lambda;
 
@@ -61,7 +60,7 @@ void EventLoop::handleNextEvents() {
                 callEventPosted = !events_.empty();
             }
             if (!nextEvents.empty()) {
-                foreach (const Event& event, nextEvents) {
+                for (const auto& event : nextEvents) {
                     invokeCallback(event);
                 }
             }
diff --git a/Swiften/EventLoop/SimpleEventLoop.cpp b/Swiften/EventLoop/SimpleEventLoop.cpp
index 2397016..cac04e4 100644
--- a/Swiften/EventLoop/SimpleEventLoop.cpp
+++ b/Swiften/EventLoop/SimpleEventLoop.cpp
@@ -8,8 +8,6 @@
 
 #include <boost/bind.hpp>
 
-#include <Swiften/Base/foreach.h>
-
 namespace Swift {
 
 SimpleEventLoop::SimpleEventLoop() : isRunning_(true), eventAvailable_(false) {
diff --git a/Swiften/EventLoop/SingleThreadedEventLoop.cpp b/Swiften/EventLoop/SingleThreadedEventLoop.cpp
index acb6e4d..0542f37 100644
--- a/Swiften/EventLoop/SingleThreadedEventLoop.cpp
+++ b/Swiften/EventLoop/SingleThreadedEventLoop.cpp
@@ -16,8 +16,6 @@
 
 #include <boost/bind.hpp>
 
-#include <Swiften/Base/foreach.h>
-
 namespace Swift {
 
 SingleThreadedEventLoop::SingleThreadedEventLoop()
@@ -35,8 +33,9 @@ void SingleThreadedEventLoop::waitForEvents() {
         eventAvailableCondition_.wait(lock);
     }
 
-    if (shouldShutDown_)
+    if (shouldShutDown_) {
         throw EventLoopCanceledException();
+    }
 }
 
 void SingleThreadedEventLoop::handleEvents() {