5 files changed, 13 insertions, 13 deletions
diff --git a/Swiften/Network/HostAddressPort.cpp b/Swiften/Network/HostAddressPort.cpp
index 76c276e..401ddec 100644
--- a/Swiften/Network/HostAddressPort.cpp
+++ b/Swiften/Network/HostAddressPort.cpp
@@ -18,11 +18,11 @@ HostAddressPort::HostAddressPort(const boost::asio::ip::tcp::endpoint& endpoint)
     port_ = endpoint.port();
 }
 
 std::string HostAddressPort::toString() const {
     std::string portAsString;
     try {
-        portAsString = boost::lexical_cast<std::string>(getPort());
+        portAsString = std::to_string(getPort());
     } catch (boost::bad_lexical_cast&) {
     }
     return getAddress().toString() + ":" + portAsString;
 }
diff --git a/Swiften/Network/MiniUPnPInterface.cpp b/Swiften/Network/MiniUPnPInterface.cpp
index dbe8bcd..2c61ad3 100644
--- a/Swiften/Network/MiniUPnPInterface.cpp
+++ b/Swiften/Network/MiniUPnPInterface.cpp
@@ -77,15 +77,15 @@ boost::optional<NATPortMapping> MiniUPnPInterface::addPortForward(int actualLoca
     if (!p->isValid) {
         return boost::optional<NATPortMapping>();
     }
 
     NATPortMapping mapping(actualLocalPort, actualPublicPort, NATPortMapping::TCP);
 
-    std::string publicPort = boost::lexical_cast<std::string>(mapping.getPublicPort());
-    std::string localPort = boost::lexical_cast<std::string>(mapping.getLocalPort());
-    std::string leaseSeconds = boost::lexical_cast<std::string>(mapping.getLeaseInSeconds());
+    std::string publicPort = std::to_string(mapping.getPublicPort());
+    std::string localPort = std::to_string(mapping.getLocalPort());
+    std::string leaseSeconds = std::to_string(mapping.getLeaseInSeconds());
 
     int ret = UPNP_AddPortMapping(
             p->urls.controlURL,
             p->data.first.servicetype,
             publicPort.c_str(),
             localPort.c_str(),
@@ -104,15 +104,15 @@ boost::optional<NATPortMapping> MiniUPnPInterface::addPortForward(int actualLoca
 
 bool MiniUPnPInterface::removePortForward(const NATPortMapping& mapping) {
     if (!p->isValid) {
         return false;
     }
 
-    std::string publicPort = boost::lexical_cast<std::string>(mapping.getPublicPort());
-    std::string localPort = boost::lexical_cast<std::string>(mapping.getLocalPort());
-    std::string leaseSeconds = boost::lexical_cast<std::string>(mapping.getLeaseInSeconds());
+    std::string publicPort = std::to_string(mapping.getPublicPort());
+    std::string localPort = std::to_string(mapping.getLocalPort());
+    std::string leaseSeconds = std::to_string(mapping.getLeaseInSeconds());
 
     int ret = UPNP_DeletePortMapping(p->urls.controlURL, p->data.first.servicetype, publicPort.c_str(), mapping.getProtocol() == NATPortMapping::TCP ? "TCP" : "UDP", nullptr);
     return ret == UPNPCOMMAND_SUCCESS;
 }
 
 bool MiniUPnPInterface::isAvailable() {
diff --git a/Swiften/Network/StaticDomainNameResolver.cpp b/Swiften/Network/StaticDomainNameResolver.cpp
index b8f4c7a..5a38fc4 100644
--- a/Swiften/Network/StaticDomainNameResolver.cpp
+++ b/Swiften/Network/StaticDomainNameResolver.cpp
@@ -99,13 +99,13 @@ void StaticDomainNameResolver::addAddress(const std::string& domain, const HostA
 void StaticDomainNameResolver::addService(const std::string& service, const DomainNameServiceQuery::Result& result) {
     services.push_back(std::make_pair(service, result));
 }
 
 void StaticDomainNameResolver::addXMPPClientService(const std::string& domain, const HostAddressPort& address) {
     static int hostid = 0;
-    std::string hostname(std::string("host-") + boost::lexical_cast<std::string>(hostid));
+    std::string hostname(std::string("host-") + std::to_string(hostid));
     hostid++;
 
     addService("_xmpp-client._tcp." + domain, ServiceQuery::Result(hostname, address.getPort(), 0, 0));
     addAddress(hostname, address.getAddress());
 }
 
diff --git a/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp b/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
index 5d6fedd..4aeaf24 100644
--- a/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
+++ b/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
@@ -191,13 +191,13 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
             rid++;
             testling->write(createSafeByteArray("<blah/>"));
             eventLoop->processEvents();
             CPPUNIT_ASSERT_EQUAL(st(2), connectionFactory->connections.size()); /* 0 was waiting for response, open and send on 1 */
             CPPUNIT_ASSERT_EQUAL(st(4), boshDataWritten.size()); /* data */
             c1 = connectionFactory->connections[1];
-            std::string fullBody = "<body rid='" + boost::lexical_cast<std::string>(rid) + "' sid='" + sid + "' xmlns='http://jabber.org/protocol/httpbind'><blah/></body>"; /* check empty write */
+            std::string fullBody = "<body rid='" + std::to_string(rid) + "' sid='" + sid + "' xmlns='http://jabber.org/protocol/httpbind'><blah/></body>"; /* check empty write */
             CPPUNIT_ASSERT_EQUAL(fullBody, lastBody());
             CPPUNIT_ASSERT(c0->pending);
             CPPUNIT_ASSERT(c1->pending);
 
 
             rid++;
@@ -307,13 +307,13 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
             testling->restartStream();
             eventLoop->processEvents();
             CPPUNIT_ASSERT_EQUAL(st(2), boshDataWritten.size());
             readResponse("<body></body>", c0);
             eventLoop->processEvents();
             CPPUNIT_ASSERT_EQUAL(st(3), boshDataWritten.size());
-            std::string fullBody = "<body rid='" + boost::lexical_cast<std::string>(initialRID + 2) + "' sid='" + sid + "' xmlns='http://jabber.org/protocol/httpbind'></body>";
+            std::string fullBody = "<body rid='" + std::to_string(initialRID + 2) + "' sid='" + sid + "' xmlns='http://jabber.org/protocol/httpbind'></body>";
             std::string response = boshDataWritten[2];
             size_t bodyPosition = response.find("\r\n\r\n");
             CPPUNIT_ASSERT_EQUAL(fullBody, response.substr(bodyPosition+4));
 
 
         }
@@ -424,26 +424,26 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
                 "HTTP/1.1 200 OK\r\n"
                 "Content-Type: text/xml; charset=utf-8\r\n"
                 "Access-Control-Allow-Origin: *\r\n"
                 "Access-Control-Allow-Headers: Content-Type\r\n"
                 "Content-Length: "));
             connection->onDataRead(data1);
-            std::shared_ptr<SafeByteArray> data2 = std::make_shared<SafeByteArray>(createSafeByteArray(boost::lexical_cast<std::string>(response.size())));
+            std::shared_ptr<SafeByteArray> data2 = std::make_shared<SafeByteArray>(createSafeByteArray(std::to_string(response.size())));
             connection->onDataRead(data2);
             std::shared_ptr<SafeByteArray> data3 = std::make_shared<SafeByteArray>(createSafeByteArray("\r\n\r\n"));
             connection->onDataRead(data3);
             std::shared_ptr<SafeByteArray> data4 = std::make_shared<SafeByteArray>(createSafeByteArray(response));
             connection->onDataRead(data4);
         }
 
         std::string fullRequestFor(const std::string& data) {
             std::string body = data;
             std::string result = "POST /" + path + " HTTP/1.1\r\n"
                         + "Host: " + to + ":" + port + "\r\n"
                         + "Content-Type: text/xml; charset=utf-8\r\n"
-                        + "Content-Length: " + boost::lexical_cast<std::string>(body.size()) + "\r\n\r\n"
+                        + "Content-Length: " + std::to_string(body.size()) + "\r\n\r\n"
                         + body;
             return result;
         }
 
     private:
         URL boshURL;
diff --git a/Swiften/Network/UnitTest/BOSHConnectionTest.cpp b/Swiften/Network/UnitTest/BOSHConnectionTest.cpp
index e34cb96..17d8333 100644
--- a/Swiften/Network/UnitTest/BOSHConnectionTest.cpp
+++ b/Swiften/Network/UnitTest/BOSHConnectionTest.cpp
@@ -315,13 +315,13 @@ class BOSHConnectionTest : public CppUnit::TestFixture {
                 "HTTP/1.1 200 OK\r\n"
                 "Content-Type: text/xml; charset=utf-8\r\n"
                 "Access-Control-Allow-Origin: *\r\n"
                 "Access-Control-Allow-Headers: Content-Type\r\n"
                 "Content-Length: "));
             connection->onDataRead(data1);
-            std::shared_ptr<SafeByteArray> data2 = std::make_shared<SafeByteArray>(createSafeByteArray(boost::lexical_cast<std::string>(response.size())));
+            std::shared_ptr<SafeByteArray> data2 = std::make_shared<SafeByteArray>(createSafeByteArray(std::to_string(response.size())));
             connection->onDataRead(data2);
             std::shared_ptr<SafeByteArray> data3 = std::make_shared<SafeByteArray>(createSafeByteArray("\r\n\r\n"));
             connection->onDataRead(data3);
             std::shared_ptr<SafeByteArray> data4 = std::make_shared<SafeByteArray>(createSafeByteArray(response));
             connection->onDataRead(data4);
         }