8 files changed, 86 insertions, 64 deletions
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 083b8a0..05c1e6e 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Swiften/Client/CoreClient.h"
+#include <Swiften/Client/CoreClient.h>
 
 namespace Swift {
 	class SoftwareVersionResponder;
@@ -85,12 +85,12 @@ namespace Swift {
 			/**
 			 * Returns the last received presence for the given (full) JID.
 			 */
-			Presence::ref getLastPresence(const JID& jid) const;
+			boost::shared_ptr<Presence> getLastPresence(const JID& jid) const;
 
 			/**
 			 * Returns the presence with the highest priority received for the given JID.
 			 */
-			Presence::ref getHighestPriorityPresence(const JID& bareJID) const;
+			boost::shared_ptr<Presence> getHighestPriorityPresence(const JID& bareJID) const;
 
 			PresenceOracle* getPresenceOracle() const {
 				return presenceOracle;
@@ -142,7 +142,7 @@ namespace Swift {
 			/**
 			 * This signal is emitted when a JID changes presence.
 			 */
-			boost::signal<void (Presence::ref)> onPresenceChange;
+			boost::signal<void (boost::shared_ptr<Presence>)> onPresenceChange;
 
 		private:
 			Storages* getStorages() const;
diff --git a/Swiften/Client/ClientSessionStanzaChannel.cpp b/Swiften/Client/ClientSessionStanzaChannel.cpp
index 6b32b3d..85d9dec 100644
--- a/Swiften/Client/ClientSessionStanzaChannel.cpp
+++ b/Swiften/Client/ClientSessionStanzaChannel.cpp
@@ -7,6 +7,7 @@
 #include "Swiften/Client/ClientSessionStanzaChannel.h"
 
 #include <boost/bind.hpp>
+#include <iostream>
 
 namespace Swift {
 
diff --git a/Swiften/Client/ClientXMLTracer.cpp b/Swiften/Client/ClientXMLTracer.cpp
new file mode 100644
index 0000000..a26ce66
--- /dev/null
+++ b/Swiften/Client/ClientXMLTracer.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/Client/ClientXMLTracer.h>
+
+#include <iostream>
+#include <boost/bind.hpp>
+
+namespace Swift {
+
+ClientXMLTracer::ClientXMLTracer(CoreClient* client) {
+	client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, '<', _1));
+	client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, '>', _1));
+}
+
+void ClientXMLTracer::printData(char direction, const std::string& data) {
+	printLine(direction);
+	std::cerr << data << std::endl;
+}
+
+void ClientXMLTracer::printLine(char c) {
+	for (unsigned int i = 0; i < 80; ++i) {
+		std::cerr << c;
+	}
+	std::cerr << std::endl;
+}
+
+}
diff --git a/Swiften/Client/ClientXMLTracer.h b/Swiften/Client/ClientXMLTracer.h
index bca2a54..617c53f 100644
--- a/Swiften/Client/ClientXMLTracer.h
+++ b/Swiften/Client/ClientXMLTracer.h
@@ -6,29 +6,15 @@
 
 #pragma once
 
-#include <boost/bind.hpp>
-
 #include <Swiften/Client/CoreClient.h>
 
 namespace Swift {
 	class ClientXMLTracer {
 		public:
-			ClientXMLTracer(CoreClient* client) {
-				client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, '<', _1));
-				client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, '>', _1));
-			}
+			ClientXMLTracer(CoreClient* client);
 
 		private:
-			static void printData(char direction, const std::string& data) {
-				printLine(direction);
-				std::cerr << data << std::endl;
-			}
-
-			static void printLine(char c) {
-				for (unsigned int i = 0; i < 80; ++i) {
-					std::cerr << c;
-				}
-				std::cerr << std::endl;
-			}
+			static void printData(char direction, const std::string& data);
+			static void printLine(char c);
 	};
 }
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index f0c5333..8e51c8e 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -283,5 +283,25 @@ void CoreClient::setUseTLS(UseTLS b) {
 	useTLS = b;
 }
 
+bool CoreClient::isAvailable() const {
+	return stanzaChannel_->isAvailable();
+}
+
+bool CoreClient::getStreamManagementEnabled() const {
+	return stanzaChannel_->getStreamManagementEnabled();
+}
+
+StanzaChannel* CoreClient::getStanzaChannel() const {
+	return stanzaChannel_;
+}
+
+const JID& CoreClient::getJID() const {
+	if (session_) {
+		return session_->getLocalJID();
+	}
+	else {
+		return jid_;
+	}
+}
 
 }
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h
index eb9c42c..060c699 100644
--- a/Swiften/Client/CoreClient.h
+++ b/Swiften/Client/CoreClient.h
@@ -6,35 +6,32 @@
 
 #pragma once
 
-#include "Swiften/Base/boost_bsignals.h"
+#include <string>
 #include <boost/shared_ptr.hpp>
+#include <Swiften/Base/boost_bsignals.h>
 
-#include "Swiften/Network/PlatformDomainNameResolver.h"
-#include "Swiften/Network/Connector.h"
-#include "Swiften/Base/Error.h"
-#include "Swiften/Client/ClientSession.h"
-#include "Swiften/Client/ClientError.h"
-#include "Swiften/Elements/Presence.h"
-#include "Swiften/Elements/Message.h"
-#include "Swiften/JID/JID.h"
-#include <string>
-#include "Swiften/Client/StanzaChannel.h"
-#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
-#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
 #include <Swiften/Entity/Entity.h>
-
-#include "Swiften/Client/ClientSessionStanzaChannel.h"
+#include <Swiften/JID/JID.h>
+#include <Swiften/Client/ClientError.h>
 
 namespace Swift {
+	class Connector;
+	class Message;
+	class Presence;
+	class Error;
 	class IQRouter;
 	class TLSContextFactory;
 	class ConnectionFactory;
+	class Connection;
 	class TimerFactory;
 	class ClientSession;
+	class StanzaChannel;
+	class Stanza;
 	class BasicSessionStream;
 	class PlatformTLSFactories;
 	class CertificateTrustChecker;
 	class NetworkFactories;
+	class ClientSessionStanzaChannel;
 
 	/** 
 	 * The central class for communicating with an XMPP server.
@@ -80,12 +77,12 @@ namespace Swift {
 			/**
 			 * Sends a message.
 			 */
-			void sendMessage(Message::ref);
+			void sendMessage(boost::shared_ptr<Message>);
 
 			/**
 			 * Sends a presence stanza.
 			 */
-			void sendPresence(Presence::ref);
+			void sendPresence(boost::shared_ptr<Presence>);
 
 			/**
 			 * Sends raw, unchecked data.
@@ -103,9 +100,7 @@ namespace Swift {
 			 * Checks whether the client is connected to the server,
 			 * and stanzas can be sent.
 			 */
-			bool isAvailable() const {
-				return stanzaChannel_->isAvailable();
-			}
+			bool isAvailable() const;
 
 			/**
 			 * Checks whether the client is active.
@@ -118,14 +113,7 @@ namespace Swift {
 			 * Returns the JID of the client. 
 			 * After the session was initialized, this returns the bound JID.
 			 */
-			const JID& getJID() const {
-				if (session_) {
-					return session_->getLocalJID();
-				}
-				else {
-					return jid_;
-				}
-			}
+			const JID& getJID() const;
 
 			/**
 			 * Checks whether stream management is enabled.
@@ -135,13 +123,9 @@ namespace Swift {
 			 *
 			 * \see onStanzaAcked
 			 */
-			bool getStreamManagementEnabled() const {
-				return stanzaChannel_->getStreamManagementEnabled();
-			}
+			bool getStreamManagementEnabled() const;
 
-			StanzaChannel* getStanzaChannel() const {
-				return stanzaChannel_;
-			}
+			StanzaChannel* getStanzaChannel() const;
 
 			/**
 			 * Sets the certificate trust checker.
@@ -197,12 +181,12 @@ namespace Swift {
 			/**
 			 * Emitted when a message is received.
 			 */
-			boost::signal<void (Message::ref)> onMessageReceived;
+			boost::signal<void (boost::shared_ptr<Message>)> onMessageReceived;
 
 			/**
 			 * Emitted when a presence stanza is received.
 			 */
-			boost::signal<void (Presence::ref) > onPresenceReceived;
+			boost::signal<void (boost::shared_ptr<Presence>) > onPresenceReceived;
 
 			/**
 			 * Emitted when the server acknowledges receipt of a
@@ -210,7 +194,7 @@ namespace Swift {
 			 *
 			 * \see getStreamManagementEnabled()
 			 */
-			boost::signal<void (Stanza::ref)> onStanzaAcked;
+			boost::signal<void (boost::shared_ptr<Stanza>)> onStanzaAcked;
 
 		private:
 			void handleConnectorFinished(boost::shared_ptr<Connection>);
@@ -219,9 +203,9 @@ namespace Swift {
 			void handleNeedCredentials();
 			void handleDataRead(const std::string&);
 			void handleDataWritten(const std::string&);
-			void handlePresenceReceived(Presence::ref);
-			void handleMessageReceived(Message::ref);
-			void handleStanzaAcked(Stanza::ref);
+			void handlePresenceReceived(boost::shared_ptr<Presence>);
+			void handleMessageReceived(boost::shared_ptr<Message>);
+			void handleStanzaAcked(boost::shared_ptr<Stanza>);
 
 		private:
 			JID jid_;
@@ -231,7 +215,7 @@ namespace Swift {
 			UseTLS useTLS;
 			ClientSessionStanzaChannel* stanzaChannel_;
 			IQRouter* iqRouter_;
-			Connector::ref connector_;
+			boost::shared_ptr<Connector> connector_;
 			PlatformTLSFactories* tlsFactories;
 			boost::shared_ptr<Connection> connection_;
 			boost::shared_ptr<BasicSessionStream> sessionStream_;
diff --git a/Swiften/Client/FileStorages.h b/Swiften/Client/FileStorages.h
index 451105f..fc05c86 100644
--- a/Swiften/Client/FileStorages.h
+++ b/Swiften/Client/FileStorages.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
 
 #include "Swiften/Client/Storages.h"
 
diff --git a/Swiften/Client/NickResolver.h b/Swiften/Client/NickResolver.h
index 881362a..bf373fa 100644
--- a/Swiften/Client/NickResolver.h
+++ b/Swiften/Client/NickResolver.h
@@ -5,9 +5,9 @@
  */
 
 #include <map>
-#include <boost/signals.hpp>
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/boost_bsignals.h>
 #include <string>
 #include "Swiften/JID/JID.h"
 #include "Swiften/Elements/VCard.h"