1 files changed, 15 insertions, 15 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
index a6b75da..7fc1388 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2012-2018 Isode Limited.
+ * Copyright (c) 2012-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 /*
  * Copyright (c) 2011 Tobias Markmann
@@ -45,18 +45,18 @@ SOCKS5BytestreamServerManager::SOCKS5BytestreamServerManager(
             state(Start),
             server(nullptr),
             attemptedPortMapping_(false) {
 }
 
 SOCKS5BytestreamServerManager::~SOCKS5BytestreamServerManager() {
-    SWIFT_LOG_ASSERT(!connectionServer, warning) << std::endl;
-    SWIFT_LOG_ASSERT(!getPublicIPRequest, warning) << std::endl;
-    SWIFT_LOG_ASSERT(!forwardPortRequest, warning) << std::endl;
-    SWIFT_LOG_ASSERT(state == Start, warning) << std::endl;
+    SWIFT_LOG_ASSERT(!connectionServer, warning);
+    SWIFT_LOG_ASSERT(!getPublicIPRequest, warning);
+    SWIFT_LOG_ASSERT(!forwardPortRequest, warning);
+    SWIFT_LOG_ASSERT(state == Start, warning);
     if (portMapping && !unforwardPortRequest) {
-        SWIFT_LOG(warning) << "Port forwarding still alive. Trying to remove it now." << std::endl;
+        SWIFT_LOG(warning) << "Port forwarding still alive. Trying to remove it now.";
         unforwardPortRequest = natTraverser->createRemovePortForwardingRequest(portMapping.get().getLocalPort(), portMapping.get().getPublicPort());
         unforwardPortRequest->start();
     }
 }
 
 std::shared_ptr<SOCKS5BytestreamServerResourceUser> SOCKS5BytestreamServerManager::aquireResourceUser() {
@@ -113,31 +113,31 @@ void SOCKS5BytestreamServerManager::initialize() {
         state = Initializing;
 
         // Find a port to listen on
         assert(!connectionServer);
         unsigned short port;
         for (port = LISTEN_PORTS_BEGIN; port < LISTEN_PORTS_END; ++port) {
-            SWIFT_LOG(debug) << "Trying to start server on port " << port << std::endl;
+            SWIFT_LOG(debug) << "Trying to start server on port " << port;
             connectionServer = connectionServerFactory->createConnectionServer(HostAddress::fromString("::").get(), port);
             boost::optional<ConnectionServer::Error> error = connectionServer->tryStart();
             if (!error) {
                 break;
             }
             else if (*error != ConnectionServer::Conflict) {
-                SWIFT_LOG(debug) << "Error starting server" << std::endl;
+                SWIFT_LOG(debug) << "Error starting server";
                 onInitialized(false);
                 return;
             }
             connectionServer.reset();
         }
         if (!connectionServer) {
-            SWIFT_LOG(debug) << "Unable to find an open port" << std::endl;
+            SWIFT_LOG(debug) << "Unable to find an open port";
             onInitialized(false);
             return;
         }
-        SWIFT_LOG(debug) << "Server started succesfully" << std::endl;
+        SWIFT_LOG(debug) << "Server started succesfully";
         connectionServerPort = port;
 
         // Start bytestream server. Should actually happen before the connectionserver is started
         // but that doesn't really matter here.
         assert(!server);
         server = new SOCKS5BytestreamServer(connectionServer, bytestreamRegistry);
@@ -208,30 +208,30 @@ void SOCKS5BytestreamServerManager::stop() {
 
     state = Start;
 }
 
 void SOCKS5BytestreamServerManager::handleGetPublicIPResult(boost::optional<HostAddress> address) {
     if (address) {
-        SWIFT_LOG(debug) << "Public IP discovered as " << address.get().toString() << "." << std::endl;
+        SWIFT_LOG(debug) << "Public IP discovered as " << address.get().toString() << ".";
     }
     else {
-        SWIFT_LOG(debug) << "No public IP discoverable." << std::endl;
+        SWIFT_LOG(debug) << "No public IP discoverable.";
     }
 
     publicAddress = address;
 
     getPublicIPRequest->stop();
     getPublicIPRequest.reset();
 }
 
 void SOCKS5BytestreamServerManager::handleForwardPortResult(boost::optional<NATPortMapping> mapping) {
     if (mapping) {
-        SWIFT_LOG(debug) << "Mapping port was successful." << std::endl;
+        SWIFT_LOG(debug) << "Mapping port was successful.";
     }
     else {
-        SWIFT_LOG(debug) << "Mapping port has failed." << std::endl;
+        SWIFT_LOG(debug) << "Mapping port has failed.";
     }
 
     portMapping = mapping;
     onPortForwardingSetup(mapping.is_initialized());
 
     forwardPortRequest->stop();
@@ -240,13 +240,13 @@ void SOCKS5BytestreamServerManager::handleForwardPortResult(boost::optional<NATP
 
 void SOCKS5BytestreamServerManager::handleUnforwardPortResult(boost::optional<bool> result) {
     if (result.is_initialized() && result.get()) {
         portMapping.reset();
     }
     else {
-        SWIFT_LOG(warning) << "Failed to remove port forwarding." << std::endl;
+        SWIFT_LOG(warning) << "Failed to remove port forwarding.";
     }
     attemptedPortMapping_ = false;
     unforwardPortRequest.reset();
 }
 
 void SOCKS5BytestreamServerManager::checkInitializeFinished() {