3 files changed, 29 insertions, 29 deletions
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp
index bb9be58..1114336 100644
--- a/Swiften/Client/ClientSession.cpp
+++ b/Swiften/Client/ClientSession.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -88,7 +88,7 @@ ClientSession::ClientSession(
             authenticationPort(-1) {
 #ifdef SWIFTEN_PLATFORM_WIN32
 if (WindowsRegistry::isFIPSEnabled()) {
-    SWIFT_LOG(info) << "Windows is running in FIPS-140 mode. Some authentication methods will be unavailable." << std::endl;
+    SWIFT_LOG(info) << "Windows is running in FIPS-140 mode. Some authentication methods will be unavailable.";
 }
 #endif
 }
@@ -122,7 +122,7 @@ void ClientSession::sendStanza(std::shared_ptr<Stanza> stanza) {
 }
 
 void ClientSession::handleStreamStart(const ProtocolHeader&) {
-    CHECK_STATE_OR_RETURN(State::WaitingForStreamStart);
+    CHECK_STATE_OR_RETURN(State::WaitingForStreamStart)
     state = State::Negotiating;
 }
 
@@ -214,7 +214,7 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
         }
     }
     else if (StreamFeatures* streamFeatures = dynamic_cast<StreamFeatures*>(element.get())) {
-        CHECK_STATE_OR_RETURN(State::Negotiating);
+        CHECK_STATE_OR_RETURN(State::Negotiating)
 
         if (streamFeatures->hasStartTLS() && stream->supportsTLSEncryption() && useTLS != NeverUseTLS) {
             state = State::WaitingForEncrypt;
@@ -320,7 +320,7 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
         }
     }
     else if (std::dynamic_pointer_cast<Compressed>(element)) {
-        CHECK_STATE_OR_RETURN(State::Compressing);
+        CHECK_STATE_OR_RETURN(State::Compressing)
         state = State::WaitingForStreamStart;
         stream->addZLibCompression();
         stream->resetXMPPParser();
@@ -343,7 +343,7 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
         continueSessionInitialization();
     }
     else if (AuthChallenge* challenge = dynamic_cast<AuthChallenge*>(element.get())) {
-        CHECK_STATE_OR_RETURN(State::Authenticating);
+        CHECK_STATE_OR_RETURN(State::Authenticating)
         assert(authenticator);
         if (authenticator->setChallenge(challenge->getValue())) {
             stream->writeElement(std::make_shared<AuthResponse>(authenticator->getResponse()));
@@ -361,7 +361,7 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
         }
     }
     else if (AuthSuccess* authSuccess = dynamic_cast<AuthSuccess*>(element.get())) {
-        CHECK_STATE_OR_RETURN(State::Authenticating);
+        CHECK_STATE_OR_RETURN(State::Authenticating)
         assert(authenticator);
         if (!authenticator->setChallenge(authSuccess->getValue())) {
             finishSession(Error::ServerVerificationFailedError);
@@ -378,7 +378,7 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
         finishSession(Error::AuthenticationFailedError);
     }
     else if (dynamic_cast<TLSProceed*>(element.get())) {
-        CHECK_STATE_OR_RETURN(State::WaitingForEncrypt);
+        CHECK_STATE_OR_RETURN(State::WaitingForEncrypt)
         state = State::Encrypting;
         stream->addTLSEncryption();
     }
@@ -433,7 +433,7 @@ void ClientSession::sendCredentials(const SafeByteArray& password) {
 
 void ClientSession::handleTLSEncrypted() {
     if (!std::dynamic_pointer_cast<BOSHSessionStream>(stream)) {
-        CHECK_STATE_OR_RETURN(State::Encrypting);
+        CHECK_STATE_OR_RETURN(State::Encrypting)
     }
 
     std::vector<Certificate::ref> certificateChain = stream->getPeerCertificateChain();
@@ -531,7 +531,7 @@ void ClientSession::finish() {
         finishSession(std::shared_ptr<Error>());
     }
     else {
-        SWIFT_LOG(warning) << "Session already finished or finishing." << std::endl;
+        SWIFT_LOG(warning) << "Session already finished or finishing.";
     }
 }
 
@@ -544,7 +544,7 @@ void ClientSession::finishSession(std::shared_ptr<Swift::Error> error) {
         error_ = error;
     }
     else {
-        SWIFT_LOG(warning) << "Session finished twice" << std::endl;
+        SWIFT_LOG(warning) << "Session finished twice";
     }
     assert(stream->isOpen());
     if (stanzaAckResponder_) {
diff --git a/Swiften/Client/ClientSessionStanzaChannel.cpp b/Swiften/Client/ClientSessionStanzaChannel.cpp
index f48b306..6a5d07d 100644
--- a/Swiften/Client/ClientSessionStanzaChannel.cpp
+++ b/Swiften/Client/ClientSessionStanzaChannel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -49,7 +49,7 @@ std::string ClientSessionStanzaChannel::getNewIQID() {
 
 void ClientSessionStanzaChannel::send(std::shared_ptr<Stanza> stanza) {
     if (!isAvailable()) {
-        SWIFT_LOG(warning) << "Client: Trying to send a stanza while disconnected." << std::endl;
+        SWIFT_LOG(warning) << "Client: Trying to send a stanza while disconnected.";
         return;
     }
     session->sendStanza(stanza);
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,5 +1,5 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -69,21 +69,21 @@ void CoreClient::connect(const ClientOptions& o) {
     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) {
@@ -91,18 +91,18 @@ void CoreClient::connect(const ClientOptions& o) {
                     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) {
@@ -110,12 +110,12 @@ void CoreClient::connect(const ClientOptions& o) {
                     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;
@@ -134,7 +134,7 @@ void CoreClient::connect(const ClientOptions& o) {
             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;
         }
@@ -174,7 +174,7 @@ void CoreClient::connect(const ClientOptions& o) {
         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();
@@ -423,7 +423,7 @@ void CoreClient::sendPresence(std::shared_ptr<Presence> 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);
@@ -507,11 +507,11 @@ void CoreClient::resetSession() {
 
 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();
     }
 }