1 files changed, 8 insertions, 10 deletions
diff --git a/Swiften/Network/MiniUPnPInterface.cpp b/Swiften/Network/MiniUPnPInterface.cpp
index dbe8bcd..8425c77 100644
--- a/Swiften/Network/MiniUPnPInterface.cpp
+++ b/Swiften/Network/MiniUPnPInterface.cpp
@@ -1,27 +1,25 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/MiniUPnPInterface.h>
 
 #include <memory>
 
-#include <boost/lexical_cast.hpp>
-
 #include <miniupnpc.h>
 #include <upnpcommands.h>
 #include <upnperrors.h>
 
 #include <Swiften/Base/Log.h>
 
 namespace Swift {
 
 struct MiniUPnPInterface::Private {
@@ -67,28 +65,28 @@ boost::optional<HostAddress> MiniUPnPInterface::getPublicIP() {
     int ret = UPNP_GetExternalIPAddress(p->urls.controlURL, p->data.first.servicetype, externalIPAddress);
     if (ret != UPNPCOMMAND_SUCCESS) {
         return boost::optional<HostAddress>();
     }
     else {
         return HostAddress::fromString(std::string(externalIPAddress));
     }
 }
 
-boost::optional<NATPortMapping> MiniUPnPInterface::addPortForward(int actualLocalPort, int actualPublicPort) {
+boost::optional<NATPortMapping> MiniUPnPInterface::addPortForward(unsigned short actualLocalPort, unsigned short actualPublicPort) {
     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(),
             p->localAddress.c_str(),
             "Swift",
             mapping.getProtocol() == NATPortMapping::TCP ? "TCP" : "UDP",
@@ -101,21 +99,21 @@ boost::optional<NATPortMapping> MiniUPnPInterface::addPortForward(int actualLoca
         return boost::optional<NATPortMapping>();
     }
 }
 
 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() {
     return p->isValid;
 }