1 files changed, 102 insertions, 102 deletions
diff --git a/Sluift/SluiftClient.h b/Sluift/SluiftClient.h
index 07073ce..d7c3b32 100644
--- a/Sluift/SluiftClient.h
+++ b/Sluift/SluiftClient.h
@@ -28,106 +28,106 @@
 #include <Sluift/Watchdog.h>
 
 namespace Swift {
-	struct SluiftGlobals;
-	class ClientXMLTracer;
-	class Client;
-	class Stanza;
-	class Payload;
-	class ErrorPayload;
-	class JID;
-
-	class SluiftClient {
-		public:
-			struct Event {
-				enum Type {
-					MessageType,
-					PresenceType,
-					PubSubEventType
-				};
-
-				Event(boost::shared_ptr<Message> stanza) : type(MessageType), stanza(stanza) {}
-				Event(boost::shared_ptr<Presence> stanza) : type(PresenceType), stanza(stanza) {}
-				Event(const JID& from, boost::shared_ptr<PubSubEventPayload> payload) : type(PubSubEventType), from(from), pubsubEvent(payload) {}
-
-				Type type;
-
-				// Message & Presence
-				boost::shared_ptr<Stanza> stanza;
-
-				// PubSubEvent
-				JID from;
-				boost::shared_ptr<PubSubEventPayload> pubsubEvent;
-			};
-
-			SluiftClient(
-					const JID& jid, 
-					const std::string& password, 
-					NetworkFactories* networkFactories, 
-					SimpleEventLoop* eventLoop);
-			~SluiftClient();
-
-			Client* getClient() {
-				return client;
-			}
-
-			ClientOptions& getOptions() {
-				return options;
-			}
-
-			void connect();
-			void connect(const std::string& host, int port);
-			void waitConnected(int timeout);
-			bool isConnected() const;
-			void setTraceEnabled(bool b);
-
-			template<typename T>
-				Sluift::Response sendPubSubRequest(
-					IQ::Type type, const JID& jid, boost::shared_ptr<T> payload, int timeout) {
-				return sendRequest(client->getPubSubManager()->createRequest(
-							type, jid, payload), timeout);
-			}
-
-			template<typename REQUEST_TYPE>
-			Sluift::Response sendRequest(REQUEST_TYPE request, int timeout) {
-				boost::signals::scoped_connection c = request->onResponse.connect(
-						boost::bind(&SluiftClient::handleRequestResponse, this, _1, _2));
-				return doSendRequest(request, timeout);
-			}
-
-			template<typename REQUEST_TYPE>
-			Sluift::Response sendVoidRequest(REQUEST_TYPE request, int timeout) {
-				boost::signals::scoped_connection c = request->onResponse.connect(
-						boost::bind(&SluiftClient::handleRequestResponse, this, boost::shared_ptr<Payload>(), _1));
-				return doSendRequest(request, timeout);
-			}
-
-			void disconnect();
-			void setSoftwareVersion(const std::string& name, const std::string& version, const std::string& os);
-			boost::optional<SluiftClient::Event> getNextEvent(int timeout, 
-					boost::function<bool (const Event&)> condition = 0);
-			std::vector<XMPPRosterItem> getRoster(int timeout);
-
-		private:
-			Sluift::Response doSendRequest(boost::shared_ptr<Request> request, int timeout);
-
-			void handleIncomingMessage(boost::shared_ptr<Message> stanza);
-			void handleIncomingPresence(boost::shared_ptr<Presence> stanza);
-			void handleIncomingPubSubEvent(const JID& from, boost::shared_ptr<PubSubEventPayload> event);
-			void handleInitialRosterPopulated();
-			void handleRequestResponse(boost::shared_ptr<Payload> response, boost::shared_ptr<ErrorPayload> error);
-			void handleDisconnected(const boost::optional<ClientError>& error);
-		
-		private:
-			NetworkFactories* networkFactories;
-			SimpleEventLoop* eventLoop;
-			Client* client;
-			ClientOptions options;
-			ClientXMLTracer* tracer;
-			bool rosterReceived;
-			std::deque<Event> pendingEvents;
-			boost::optional<ClientError> disconnectedError;
-			bool requestResponseReceived;
-			boost::shared_ptr<Payload> requestResponse;
-			boost::shared_ptr<ErrorPayload> requestError;
-	};
+    struct SluiftGlobals;
+    class ClientXMLTracer;
+    class Client;
+    class Stanza;
+    class Payload;
+    class ErrorPayload;
+    class JID;
+
+    class SluiftClient {
+        public:
+            struct Event {
+                enum Type {
+                    MessageType,
+                    PresenceType,
+                    PubSubEventType
+                };
+
+                Event(boost::shared_ptr<Message> stanza) : type(MessageType), stanza(stanza) {}
+                Event(boost::shared_ptr<Presence> stanza) : type(PresenceType), stanza(stanza) {}
+                Event(const JID& from, boost::shared_ptr<PubSubEventPayload> payload) : type(PubSubEventType), from(from), pubsubEvent(payload) {}
+
+                Type type;
+
+                // Message & Presence
+                boost::shared_ptr<Stanza> stanza;
+
+                // PubSubEvent
+                JID from;
+                boost::shared_ptr<PubSubEventPayload> pubsubEvent;
+            };
+
+            SluiftClient(
+                    const JID& jid,
+                    const std::string& password,
+                    NetworkFactories* networkFactories,
+                    SimpleEventLoop* eventLoop);
+            ~SluiftClient();
+
+            Client* getClient() {
+                return client;
+            }
+
+            ClientOptions& getOptions() {
+                return options;
+            }
+
+            void connect();
+            void connect(const std::string& host, int port);
+            void waitConnected(int timeout);
+            bool isConnected() const;
+            void setTraceEnabled(bool b);
+
+            template<typename T>
+                Sluift::Response sendPubSubRequest(
+                    IQ::Type type, const JID& jid, boost::shared_ptr<T> payload, int timeout) {
+                return sendRequest(client->getPubSubManager()->createRequest(
+                            type, jid, payload), timeout);
+            }
+
+            template<typename REQUEST_TYPE>
+            Sluift::Response sendRequest(REQUEST_TYPE request, int timeout) {
+                boost::signals::scoped_connection c = request->onResponse.connect(
+                        boost::bind(&SluiftClient::handleRequestResponse, this, _1, _2));
+                return doSendRequest(request, timeout);
+            }
+
+            template<typename REQUEST_TYPE>
+            Sluift::Response sendVoidRequest(REQUEST_TYPE request, int timeout) {
+                boost::signals::scoped_connection c = request->onResponse.connect(
+                        boost::bind(&SluiftClient::handleRequestResponse, this, boost::shared_ptr<Payload>(), _1));
+                return doSendRequest(request, timeout);
+            }
+
+            void disconnect();
+            void setSoftwareVersion(const std::string& name, const std::string& version, const std::string& os);
+            boost::optional<SluiftClient::Event> getNextEvent(int timeout,
+                    boost::function<bool (const Event&)> condition = 0);
+            std::vector<XMPPRosterItem> getRoster(int timeout);
+
+        private:
+            Sluift::Response doSendRequest(boost::shared_ptr<Request> request, int timeout);
+
+            void handleIncomingMessage(boost::shared_ptr<Message> stanza);
+            void handleIncomingPresence(boost::shared_ptr<Presence> stanza);
+            void handleIncomingPubSubEvent(const JID& from, boost::shared_ptr<PubSubEventPayload> event);
+            void handleInitialRosterPopulated();
+            void handleRequestResponse(boost::shared_ptr<Payload> response, boost::shared_ptr<ErrorPayload> error);
+            void handleDisconnected(const boost::optional<ClientError>& error);
+
+        private:
+            NetworkFactories* networkFactories;
+            SimpleEventLoop* eventLoop;
+            Client* client;
+            ClientOptions options;
+            ClientXMLTracer* tracer;
+            bool rosterReceived;
+            std::deque<Event> pendingEvents;
+            boost::optional<ClientError> disconnectedError;
+            bool requestResponseReceived;
+            boost::shared_ptr<Payload> requestResponse;
+            boost::shared_ptr<ErrorPayload> requestError;
+    };
 }