1 files changed, 61 insertions, 60 deletions
diff --git a/Swiften/Examples/SendMessage/SendMessage.cpp b/Swiften/Examples/SendMessage/SendMessage.cpp
index e32c9e8..0b46b41 100644
--- a/Swiften/Examples/SendMessage/SendMessage.cpp
+++ b/Swiften/Examples/SendMessage/SendMessage.cpp
@@ -1,90 +1,91 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include <boost/bind.hpp>
-#include <boost/thread.hpp>
 #include <iostream>
+#include <thread>
+
+#include <boost/bind.hpp>
 
 #include <Swiften/Client/Client.h>
+#include <Swiften/Client/ClientXMLTracer.h>
 #include <Swiften/Elements/Message.h>
-#include <Swiften/Network/BoostNetworkFactories.h>
-#include <Swiften/Network/TimerFactory.h>
 #include <Swiften/EventLoop/EventLoop.h>
-#include <Swiften/Client/ClientXMLTracer.h>
 #include <Swiften/EventLoop/SimpleEventLoop.h>
+#include <Swiften/Network/BoostNetworkFactories.h>
+#include <Swiften/Network/TimerFactory.h>
 
 using namespace Swift;
 
 static SimpleEventLoop eventLoop;
 static BoostNetworkFactories networkFactories(&eventLoop);
 
-static Client* client = 0;
+static Client* client = nullptr;
 static JID recipient;
 static std::string messageBody;
 static int exitCode = 2;
-static boost::bsignals::connection errorConnection;
+static boost::signals2::connection errorConnection;
 
 
 static void handleConnected() {
-	boost::shared_ptr<Message> message(new Message());
-	message->setBody(messageBody);
-	message->setTo(recipient);
-	client->sendMessage(message);
-	exitCode = 0;
-	errorConnection.disconnect();
-	client->disconnect();
-	eventLoop.stop();
+    std::shared_ptr<Message> message(new Message());
+    message->setBody(messageBody);
+    message->setTo(recipient);
+    client->sendMessage(message);
+    exitCode = 0;
+    errorConnection.disconnect();
+    client->disconnect();
+    eventLoop.stop();
 }
 
 static void handleDisconnected(const boost::optional<ClientError>&) {
-	std::cerr << "Error!" << std::endl;
-	exitCode = 1;
-	eventLoop.stop();
+    std::cerr << "Error!" << std::endl;
+    exitCode = 1;
+    eventLoop.stop();
 }
 
 int main(int argc, char* argv[]) {
-	if (argc < 5 || argc > 6) {
-		std::cerr << "Usage: " << argv[0] << " <jid> [<connect_host>]<password> <recipient> <message>" << std::endl;
-		return -1;
-	}
-
-	int argi = 1;
-	
-	std::string jid = argv[argi++];
-	std::string connectHost = "";
-	if (argc == 6) {
-		connectHost = argv[argi++];
-	}
-
-	client = new Swift::Client(JID(jid), std::string(argv[argi++]), &networkFactories);
-	client->setAlwaysTrustCertificates();
-
-	recipient = JID(argv[argi++]);
-	messageBody = std::string(argv[argi++]);
-
-	ClientXMLTracer* tracer = new ClientXMLTracer(client);
-	client->onConnected.connect(&handleConnected);
-	errorConnection = client->onDisconnected.connect(&handleDisconnected);
-	if (!connectHost.empty()) {
-		ClientOptions options;
-		options.manualHostname = connectHost;
-		client->connect(options);
-	} else {
-		client->connect();
-	}
-
-	{
-		Timer::ref timer = networkFactories.getTimerFactory()->createTimer(30000);
-		timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop));
-		timer->start();
-
-		eventLoop.run();
-	}
-
-	delete tracer;
-	delete client;
-	return exitCode;
+    if (argc < 5 || argc > 6) {
+        std::cerr << "Usage: " << argv[0] << " <jid> [<connect_host>]<password> <recipient> <message>" << std::endl;
+        return -1;
+    }
+
+    int argi = 1;
+
+    std::string jid = argv[argi++];
+    std::string connectHost = "";
+    if (argc == 6) {
+        connectHost = argv[argi++];
+    }
+
+    client = new Swift::Client(JID(jid), std::string(argv[argi++]), &networkFactories);
+    client->setAlwaysTrustCertificates();
+
+    recipient = JID(argv[argi++]);
+    messageBody = std::string(argv[argi++]);
+
+    ClientXMLTracer* tracer = new ClientXMLTracer(client);
+    client->onConnected.connect(&handleConnected);
+    errorConnection = client->onDisconnected.connect(&handleDisconnected);
+    if (!connectHost.empty()) {
+        ClientOptions options;
+        options.manualHostname = connectHost;
+        client->connect(options);
+    } else {
+        client->connect();
+    }
+
+    {
+        Timer::ref timer = networkFactories.getTimerFactory()->createTimer(30000);
+        timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop));
+        timer->start();
+
+        eventLoop.run();
+    }
+
+    delete tracer;
+    delete client;
+    return exitCode;
 }