1 files changed, 12 insertions, 52 deletions
diff --git a/Swiften/Network/FakeConnection.h b/Swiften/Network/FakeConnection.h
index 4e2e960..99cb584 100644
--- a/Swiften/Network/FakeConnection.h
+++ b/Swiften/Network/FakeConnection.h
@@ -7,14 +7,13 @@
 #pragma once
 
 #include <boost/optional.hpp>
-#include <boost/bind.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <vector>
 
-#include "Swiften/Network/Connection.h"
-#include "Swiften/Network/HostAddressPort.h"
-#include "Swiften/EventLoop/EventOwner.h"
-#include "Swiften/EventLoop/EventLoop.h"
+#include <Swiften/Network/Connection.h>
+#include <Swiften/Network/HostAddressPort.h>
+#include <Swiften/EventLoop/EventOwner.h>
+#include <Swiften/EventLoop/EventLoop.h>
 
 namespace Swift {
 	class FakeConnection : 
@@ -30,58 +29,19 @@ namespace Swift {
 				DisconnectedWithError
 			};
 
-			FakeConnection(EventLoop* eventLoop) : eventLoop(eventLoop), state(Initial), delayConnect(false) {}
-
-			virtual void listen() {
-				assert(false);
-			}
+			FakeConnection(EventLoop* eventLoop);
+			~FakeConnection();
 
+			virtual void listen();
 			virtual HostAddressPort getLocalAddress() const {
 				return HostAddressPort();
 			}
 
-			void setError(const Error& e) {
-				error = boost::optional<Error>(e);
-				state = DisconnectedWithError;
-				if (connectedTo) {
-					eventLoop->postEvent(
-							boost::bind(boost::ref(onDisconnected), error),
-							shared_from_this());
-				}
-			}
-
-			virtual void connect(const HostAddressPort& address) {
-				if (delayConnect) {
-					state = Connecting;
-				}
-				else {
-					if (!error) {
-						connectedTo = address;
-						state = Connected;
-					}
-					else {
-						state = DisconnectedWithError;
-					}
-					eventLoop->postEvent(
-							boost::bind(boost::ref(onConnectFinished), error),
-							shared_from_this());
-				}
-			}
-
-			virtual void disconnect() {
-				if (!error) {
-					state = Disconnected;
-				}
-				else {
-					state = DisconnectedWithError;
-				}
-				connectedTo.reset();
-				eventLoop->postEvent(
-						boost::bind(boost::ref(onDisconnected), error),
-						shared_from_this());
-			}
+			void setError(const Error& e);
+			virtual void connect(const HostAddressPort& address);
+			virtual void disconnect();
 
-			virtual void write(const ByteArray& data) {
+			virtual void write(const SafeByteArray& data) {
 				dataWritten.push_back(data);
 			}
 
@@ -91,7 +51,7 @@ namespace Swift {
 
 			EventLoop* eventLoop;
 			boost::optional<HostAddressPort> connectedTo;
-			std::vector<ByteArray> dataWritten;
+			std::vector<SafeByteArray> dataWritten;
 			boost::optional<Error> error;
 			State state;
 			bool delayConnect;