1 files changed, 69 insertions, 68 deletions
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp
index c8d8c84..9ab7864 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 //...
 #include <iostream>
+
 #include <boost/bind.hpp>
 
 #include <Swiften/Swiften.h>
@@ -14,80 +15,80 @@ using namespace Swift;
 using namespace boost;
 //...
 class EchoBot {
-	public:
-		EchoBot(NetworkFactories* networkFactories) {
-			//...
-			client = new Client("echobot@wonderland.lit", "mypass", networkFactories);
-			client->setAlwaysTrustCertificates();
-			client->onConnected.connect(bind(&EchoBot::handleConnected, this));
-			client->onMessageReceived.connect(
-					bind(&EchoBot::handleMessageReceived, this, _1));
-			//...
-			client->onPresenceReceived.connect(
-					bind(&EchoBot::handlePresenceReceived, this, _1));
-			//...
-			tracer = new ClientXMLTracer(client);
-			client->connect();
-			//...
-		}
+    public:
+        EchoBot(NetworkFactories* networkFactories) {
+            //...
+            client = new Client("echobot@wonderland.lit", "mypass", networkFactories);
+            client->setAlwaysTrustCertificates();
+            client->onConnected.connect(bind(&EchoBot::handleConnected, this));
+            client->onMessageReceived.connect(
+                    bind(&EchoBot::handleMessageReceived, this, _1));
+            //...
+            client->onPresenceReceived.connect(
+                    bind(&EchoBot::handlePresenceReceived, this, _1));
+            //...
+            tracer = new ClientXMLTracer(client);
+            client->connect();
+            //...
+        }
+
+        //...
+        ~EchoBot() {
+            delete tracer;
+            delete client;
+        }
+
+    private:
+        //...
+        void handlePresenceReceived(Presence::ref presence) {
+            // Automatically approve subscription requests
+            if (presence->getType() == Presence::Subscribe) {
+                Presence::ref response = Presence::create();
+                response->setTo(presence->getFrom());
+                response->setType(Presence::Subscribed);
+                client->sendPresence(response);
+            }
+        }
 
-		//...
-		~EchoBot() {
-			delete tracer;
-			delete client;
-		}
-	
-	private:
-		//...
-		void handlePresenceReceived(Presence::ref presence) {
-			// Automatically approve subscription requests
-			if (presence->getType() == Presence::Subscribe) {
-				Presence::ref response = Presence::create();
-				response->setTo(presence->getFrom());
-				response->setType(Presence::Subscribed);
-				client->sendPresence(response);
-			}
-		}
+        void handleConnected() {
+            // Request the roster
+            GetRosterRequest::ref rosterRequest =
+                    GetRosterRequest::create(client->getIQRouter());
+            rosterRequest->onResponse.connect(
+                    bind(&EchoBot::handleRosterReceived, this, _2));
+            rosterRequest->send();
+        }
 
-		void handleConnected() {
-			// Request the roster
-			GetRosterRequest::ref rosterRequest = 
-					GetRosterRequest::create(client->getIQRouter());
-			rosterRequest->onResponse.connect(
-					bind(&EchoBot::handleRosterReceived, this, _2));
-			rosterRequest->send();
-		}
+        void handleRosterReceived(ErrorPayload::ref error) {
+            if (error) {
+                std::cerr << "Error receiving roster. Continuing anyway.";
+            }
+            // Send initial available presence
+            client->sendPresence(Presence::create("Send me a message"));
+        }
+        //...
 
-		void handleRosterReceived(ErrorPayload::ref error) {
-			if (error) {
-				std::cerr << "Error receiving roster. Continuing anyway.";
-			}
-			// Send initial available presence
-			client->sendPresence(Presence::create("Send me a message"));
-		}
-		//...
-		
-		void handleMessageReceived(Message::ref message) {
-			// Echo back the incoming message
-			message->setTo(message->getFrom());
-			message->setFrom(JID());
-			client->sendMessage(message);
-		}
+        void handleMessageReceived(Message::ref message) {
+            // Echo back the incoming message
+            message->setTo(message->getFrom());
+            message->setFrom(JID());
+            client->sendMessage(message);
+        }
 
-	private:
-		Client* client;
-		ClientXMLTracer* tracer;
-		//...
+    private:
+        Client* client;
+        ClientXMLTracer* tracer;
+        //...
 };
 //...
 
 int main(int, char**) {
-	SimpleEventLoop eventLoop;
-	BoostNetworkFactories networkFactories(&eventLoop);
+    SimpleEventLoop eventLoop;
+    BoostNetworkFactories networkFactories(&eventLoop);
 
-	EchoBot bot(&networkFactories);
+    EchoBot bot(&networkFactories);
 
-	eventLoop.run();
-	return 0;
+    eventLoop.run();
+    return 0;
 }
 //...