1 files changed, 4 insertions, 14 deletions
diff --git a/Swiften/EventLoop/DummyEventLoop.h b/Swiften/EventLoop/DummyEventLoop.h
index b7ef516..4c01c16 100644
--- a/Swiften/EventLoop/DummyEventLoop.h
+++ b/Swiften/EventLoop/DummyEventLoop.h
@@ -7,24 +7,14 @@
 #pragma once
 
 #include <deque>
-#include <iostream>
-#include <boost/function.hpp>
 
-#include "Swiften/EventLoop/EventLoop.h"
-#include "Swiften/Base/foreach.h"
+#include <Swiften/EventLoop/EventLoop.h>
 
 namespace Swift {
 	class DummyEventLoop : public EventLoop {
 		public:
-			DummyEventLoop() {
-			}
-
-			~DummyEventLoop() {
-				if (!events_.empty()) {
-					std::cerr << "DummyEventLoop: Unhandled events at destruction time" << std::endl;
-				}
-				events_.clear();
-			}
+			DummyEventLoop();
+			~DummyEventLoop();
 
 			void processEvents() {
 				while (!events_.empty()) {
@@ -34,7 +24,7 @@ namespace Swift {
 			}
 
 			bool hasEvents() {
-				return events_.size() > 0;
+				return !events_.empty();
 			}
 
 			virtual void post(const Event& event) {