1 files changed, 16 insertions, 16 deletions
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index ccde0c2..7579bca 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Client/CoreClient.h>
 
@@ -66,59 +66,59 @@ void CoreClient::connect(const ClientOptions& o) {
     assert(proxyConnectionFactories.empty());
     bool useDirectConnection = true;
     HostAddressPort systemSOCKS5Proxy = networkFactories->getProxyProvider()->getSOCKS5Proxy();
     HostAddressPort systemHTTPConnectProxy = networkFactories->getProxyProvider()->getHTTPConnectProxy();
     switch (o.proxyType) {
         case ClientOptions::NoProxy:
-            SWIFT_LOG(debug) << " without a proxy" << std::endl;
+            SWIFT_LOG(debug) << " without a proxy";
             break;
         case ClientOptions::SystemConfiguredProxy:
-            SWIFT_LOG(debug) << " with a system configured proxy" << std::endl;
+            SWIFT_LOG(debug) << " with a system configured proxy";
             if (systemSOCKS5Proxy.isValid()) {
-                SWIFT_LOG(debug) << "Found SOCK5 Proxy: " << systemSOCKS5Proxy.getAddress().toString() << ":" << systemSOCKS5Proxy.getPort() << std::endl;
+                SWIFT_LOG(debug) << "Found SOCK5 Proxy: " << systemSOCKS5Proxy.getAddress().toString() << ":" << systemSOCKS5Proxy.getPort();
                 proxyConnectionFactories.push_back(new SOCKS5ProxiedConnectionFactory(networkFactories->getDomainNameResolver(), networkFactories->getConnectionFactory(), networkFactories->getTimerFactory(), systemSOCKS5Proxy.getAddress().toString(), systemSOCKS5Proxy.getPort()));
             }
             if (systemHTTPConnectProxy.isValid()) {
-                SWIFT_LOG(debug) << "Found HTTPConnect Proxy: " << systemHTTPConnectProxy.getAddress().toString() << ":" << systemHTTPConnectProxy.getPort() << std::endl;
+                SWIFT_LOG(debug) << "Found HTTPConnect Proxy: " << systemHTTPConnectProxy.getAddress().toString() << ":" << systemHTTPConnectProxy.getPort();
                 proxyConnectionFactories.push_back(new HTTPConnectProxiedConnectionFactory(networkFactories->getDomainNameResolver(), networkFactories->getConnectionFactory(), networkFactories->getTimerFactory(), systemHTTPConnectProxy.getAddress().toString(), systemHTTPConnectProxy.getPort()));
             }
             break;
         case ClientOptions::SOCKS5Proxy: {
-            SWIFT_LOG(debug) << " with manual configured SOCKS5 proxy" << std::endl;
+            SWIFT_LOG(debug) << " with manual configured SOCKS5 proxy";
             std::string proxyHostname = o.manualProxyHostname.empty() ? systemSOCKS5Proxy.getAddress().toString() : o.manualProxyHostname;
             auto proxyPort = systemSOCKS5Proxy.getPort();
             if (o.manualProxyPort != -1) {
                 try {
                     proxyPort = boost::numeric_cast<unsigned short>(o.manualProxyPort);
                 }
                 catch (const boost::numeric::bad_numeric_cast& e) {
-                    SWIFT_LOG(warning) << "Manual proxy port " << o.manualProxyPort << " is invalid: " << e.what() << std::endl;
+                    SWIFT_LOG(warning) << "Manual proxy port " << o.manualProxyPort << " is invalid: " << e.what();
                     onDisconnected(boost::optional<ClientError>(ClientError::ConnectionError));
                     return;
                 }
             }
-            SWIFT_LOG(debug) << "Proxy: " << proxyHostname << ":" << proxyPort << std::endl;
+            SWIFT_LOG(debug) << "Proxy: " << proxyHostname << ":" << proxyPort;
             proxyConnectionFactories.push_back(new SOCKS5ProxiedConnectionFactory(networkFactories->getDomainNameResolver(), networkFactories->getConnectionFactory(), networkFactories->getTimerFactory(), proxyHostname, proxyPort));
             useDirectConnection = false;
             break;
         }
         case ClientOptions::HTTPConnectProxy: {
-            SWIFT_LOG(debug) << " with manual configured HTTPConnect proxy" << std::endl;
+            SWIFT_LOG(debug) << " with manual configured HTTPConnect proxy";
             std::string proxyHostname = o.manualProxyHostname.empty() ? systemHTTPConnectProxy.getAddress().toString() : o.manualProxyHostname;
             unsigned short proxyPort = systemHTTPConnectProxy.getPort();
             if (o.manualProxyPort != -1) {
                 try {
                     proxyPort = boost::numeric_cast<unsigned short>(o.manualProxyPort);
                 }
                 catch (const boost::numeric::bad_numeric_cast& e) {
-                    SWIFT_LOG(warning) << "Manual proxy port " << o.manualProxyPort << " is invalid: " << e.what() << std::endl;
+                    SWIFT_LOG(warning) << "Manual proxy port " << o.manualProxyPort << " is invalid: " << e.what();
                     onDisconnected(boost::optional<ClientError>(ClientError::ConnectionError));
                     return;
                 }
             }
-            SWIFT_LOG(debug) << "Proxy: " << proxyHostname << ":" << proxyPort << std::endl;
+            SWIFT_LOG(debug) << "Proxy: " << proxyHostname << ":" << proxyPort;
             proxyConnectionFactories.push_back(new HTTPConnectProxiedConnectionFactory(networkFactories->getDomainNameResolver(), networkFactories->getConnectionFactory(), networkFactories->getTimerFactory(), proxyHostname, proxyPort, o.httpTrafficFilter));
             useDirectConnection = false;
             break;
         }
     }
     std::vector<ConnectionFactory*> connectionFactories(proxyConnectionFactories);
@@ -131,13 +131,13 @@ void CoreClient::connect(const ClientOptions& o) {
     unsigned short port = 0;
     if (o.manualPort != -1) {
         try {
             port = boost::numeric_cast<unsigned short>(o.manualPort);
         }
         catch (const boost::numeric::bad_numeric_cast& e) {
-            SWIFT_LOG(warning) << "Invalid manual port " << o.manualPort << ": " << e.what() << std::endl;
+            SWIFT_LOG(warning) << "Invalid manual port " << o.manualPort << ": " << e.what();
             onDisconnected(boost::optional<ClientError>(ClientError::ConnectionError));
             return;
         }
     }
     boost::optional<std::string> serviceLookupPrefix;
     if (o.manualHostname.empty()) {
@@ -171,13 +171,13 @@ void CoreClient::connect(const ClientOptions& o) {
             options.tlsOptions,
             options.httpTrafficFilter));
         sessionStream_ = boshSessionStream_;
         sessionStream_->onDataRead.connect(boost::bind(&CoreClient::handleDataRead, this, _1));
         sessionStream_->onDataWritten.connect(boost::bind(&CoreClient::handleDataWritten, this, _1));
         if (certificate_ && !certificate_->isNull()) {
-            SWIFT_LOG(debug) << "set certificate" << std::endl;
+            SWIFT_LOG(debug) << "set certificate";
             sessionStream_->setTLSCertificate(certificate_);
         }
         boshSessionStream_->open();
         bindSessionToStream();
     }
 
@@ -420,13 +420,13 @@ void CoreClient::sendMessage(std::shared_ptr<Message> message) {
 void CoreClient::sendPresence(std::shared_ptr<Presence> presence) {
     stanzaChannel_->sendPresence(presence);
 }
 
 void CoreClient::sendData(const std::string& data) {
     if (!sessionStream_) {
-        SWIFT_LOG(warning) << "Client: Trying to send data while disconnected." << std::endl;
+        SWIFT_LOG(warning) << "Client: Trying to send data while disconnected.";
         return;
     }
     sessionStream_->writeData(data);
 }
 
 bool CoreClient::isActive() const {
@@ -504,16 +504,16 @@ void CoreClient::resetSession() {
     sessionStream_.reset();
     connection_.reset();
 }
 
 void CoreClient::forceReset() {
     if (connector_) {
-        SWIFT_LOG(warning) << "Client not disconnected properly: Connector still active" << std::endl;
+        SWIFT_LOG(warning) << "Client not disconnected properly: Connector still active";
         resetConnector();
     }
     if (sessionStream_ || connection_) {
-        SWIFT_LOG(warning) << "Client not disconnected properly: Session still active" << std::endl;
+        SWIFT_LOG(warning) << "Client not disconnected properly: Session still active";
         resetSession();
     }
 }
 
 }