1 files changed, 20 insertions, 20 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 8de5d70..73fd733 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.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.
  */
@@ -191,7 +191,7 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
             Log::setLogFile(fileName);
         }
         catch (...) {
-            SWIFT_LOG(error) << "Error while retrieving the specified log file name from the command line" << std::endl;
+            SWIFT_LOG(error) << "Error while retrieving the specified log file name from the command line";
         }
     }
     //TODO this old option can be purged
@@ -222,13 +222,13 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
     for (auto&& fontName : fontNames) {
         std::string fontPath = std::string(":/") + fontName;
         int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath));
-        SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath << std::endl;
+        SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath;
     }
 
 #ifdef SWIFTEN_PLATFORM_LINUX
     std::string fontPath = std::string(":/themes/Default/Noto/NotoColorEmoji.ttf");
     int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath));
-    SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath << std::endl;
+    SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath;
     QFont::insertSubstitution(QApplication::font().family(),"NotoColorEmoji");
 #endif
 #ifdef SWIFTEN_PLATFORM_WINDOWS
@@ -446,34 +446,34 @@ ClientOptions QtSwift::parseClientOptions(const std::string& optionString) {
     std::string stringVal;
     std::vector<std::string> segments = String::split(optionString, ',');
 
-    PARSE_BOOL(useStreamCompression, 1);
-    PARSE_INT_RAW(-1);
+    PARSE_BOOL(useStreamCompression, 1)
+    PARSE_INT_RAW(-1)
     switch (intVal) {
     case 1: result.useTLS = ClientOptions::NeverUseTLS; break;
     case 2: result.useTLS = ClientOptions::UseTLSWhenAvailable; break;
     case 3: result.useTLS = ClientOptions::RequireTLS; break;
     default:;
     }
-    PARSE_BOOL(allowPLAINWithoutTLS, 0);
-    PARSE_BOOL(useStreamResumption, 0);
-    PARSE_BOOL(useAcks, 1);
-    PARSE_STRING(manualHostname);
-    PARSE_INT(manualPort, -1);
-    PARSE_INT_RAW(-1);
+    PARSE_BOOL(allowPLAINWithoutTLS, 0)
+    PARSE_BOOL(useStreamResumption, 0)
+    PARSE_BOOL(useAcks, 1)
+    PARSE_STRING(manualHostname)
+    PARSE_INT(manualPort, -1)
+    PARSE_INT_RAW(-1)
     switch (intVal) {
     case 1: result.proxyType = ClientOptions::NoProxy; break;
     case 2: result.proxyType = ClientOptions::SystemConfiguredProxy; break;
     case 3: result.proxyType = ClientOptions::SOCKS5Proxy; break;
     case 4: result.proxyType = ClientOptions::HTTPConnectProxy; break;
     }
-    PARSE_STRING(manualProxyHostname);
-    PARSE_INT(manualProxyPort, -1);
-    PARSE_URL(boshURL);
-    PARSE_URL(boshHTTPConnectProxyURL);
-    PARSE_SAFE_STRING(boshHTTPConnectProxyAuthID);
-    PARSE_SAFE_STRING(boshHTTPConnectProxyAuthPassword);
-    PARSE_BOOL(tlsOptions.schannelTLS1_0Workaround, false);
-    PARSE_BOOL(singleSignOn, false);
+    PARSE_STRING(manualProxyHostname)
+    PARSE_INT(manualProxyPort, -1)
+    PARSE_URL(boshURL)
+    PARSE_URL(boshHTTPConnectProxyURL)
+    PARSE_SAFE_STRING(boshHTTPConnectProxyAuthID)
+    PARSE_SAFE_STRING(boshHTTPConnectProxyAuthPassword)
+    PARSE_BOOL(tlsOptions.schannelTLS1_0Workaround, false)
+    PARSE_BOOL(singleSignOn, false)
 
     return result;
 }