9 files changed, 36 insertions, 36 deletions
diff --git a/Swift/QtUI/CAPICertificateSelector.cpp b/Swift/QtUI/CAPICertificateSelector.cpp
index e47121b..7e4bc0b 100644
--- a/Swift/QtUI/CAPICertificateSelector.cpp
+++ b/Swift/QtUI/CAPICertificateSelector.cpp
@@ -82,7 +82,7 @@ std::string selectCAPICertificate() {
         switch (error) {
-            case ERROR_INSUFFICIENT_BUFFER: SWIFT_LOG(error) << "Insufficient buffer for rendering cert dialog" << std::endl;break;
-            case ERROR_INVALID_FLAGS: SWIFT_LOG(error) << "Invalid flags for rendering cert dialog" << std::endl;break;
-            case ERROR_INVALID_PARAMETER: SWIFT_LOG(error) << "Invalid parameter for rendering cert dialog" << std::endl;break;
-            case ERROR_NO_UNICODE_TRANSLATION: SWIFT_LOG(error) << "Invalid unicode for rendering cert dialog" << std::endl;break;
-            default: SWIFT_LOG(error) << "Unexpected multibyte conversion errorcode" << std::endl;
+            case ERROR_INSUFFICIENT_BUFFER: SWIFT_LOG(error) << "Insufficient buffer for rendering cert dialog"; break;
+            case ERROR_INVALID_FLAGS: SWIFT_LOG(error) << "Invalid flags for rendering cert dialog"; break;
+            case ERROR_INVALID_PARAMETER: SWIFT_LOG(error) << "Invalid parameter for rendering cert dialog"; break;
+            case ERROR_NO_UNICODE_TRANSLATION: SWIFT_LOG(error) << "Invalid unicode for rendering cert dialog"; break;
+            default: SWIFT_LOG(error) << "Unexpected multibyte conversion errorcode";
 
@@ -105,3 +105,3 @@ std::string selectCAPICertificate() {
         if (CertCloseStore(hstore, 0) == FALSE) {
-            SWIFT_LOG(debug) << "Failed to close the certificate store handle." << std::endl;
+            SWIFT_LOG(debug) << "Failed to close the certificate store handle.";
         }
diff --git a/Swift/QtUI/QtAboutWidget.cpp b/Swift/QtUI/QtAboutWidget.cpp
index 2db0c9d..0a4e0ba 100644
--- a/Swift/QtUI/QtAboutWidget.cpp
+++ b/Swift/QtUI/QtAboutWidget.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -152,3 +152,3 @@ void QtAboutWidget::openPlainTextWindow(const QString& path) {
     else {
-        SWIFT_LOG(error) << "Failed to open " << Q2PSTRING(path) << "." << std::endl;
+        SWIFT_LOG(error) << "Failed to open " << Q2PSTRING(path) << ".";
     }
diff --git a/Swift/QtUI/QtScaledAvatarCache.cpp b/Swift/QtUI/QtScaledAvatarCache.cpp
index 37ea6a9..e3a28d6 100644
--- a/Swift/QtUI/QtScaledAvatarCache.cpp
+++ b/Swift/QtUI/QtScaledAvatarCache.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2019 Isode Limited.
  * All rights reserved.
@@ -55,4 +55,4 @@ QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) {
         if (!avatarFile.dir().mkpath(cacheSubPath)) {
-            SWIFT_LOG(error) << "avatarFile.dir(): " << Q2PSTRING(avatarFile.dir().absolutePath()) << std::endl;
-            SWIFT_LOG(error) << "Failed creating cache folder: " << Q2PSTRING(cacheSubPath) << std::endl;
+            SWIFT_LOG(error) << "avatarFile.dir(): " << Q2PSTRING(avatarFile.dir().absolutePath());
+            SWIFT_LOG(error) << "Failed creating cache folder: " << Q2PSTRING(cacheSubPath);
             return path;
@@ -77,3 +77,3 @@ QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) {
             } else {
-                SWIFT_LOG(warning) << "Failed to load " << Q2PSTRING(path) << std::endl;
+                SWIFT_LOG(warning) << "Failed to load " << Q2PSTRING(path);
             }
diff --git a/Swift/QtUI/QtSpellCheckerWindow.cpp b/Swift/QtUI/QtSpellCheckerWindow.cpp
index a8178c4..23b0963 100644
--- a/Swift/QtUI/QtSpellCheckerWindow.cpp
+++ b/Swift/QtUI/QtSpellCheckerWindow.cpp
@@ -7,3 +7,3 @@
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2019 Isode Limited.
  * All rights reserved.
@@ -66,3 +66,3 @@ void QtSpellCheckerWindow::setSupportedLanguages(const std::vector<std::string>&
 void QtSpellCheckerWindow::setActiveLanguage(const std::string& language) {
-    SWIFT_LOG_ASSERT(languageItems_.find(language) != languageItems_.end(), warning) << "Language '" << language << "' is not available." << std::endl;
+    SWIFT_LOG_ASSERT(languageItems_.find(language) != languageItems_.end(), warning) << "Language '" << language << "' is not available.";
     if (languageItems_.find(language) != languageItems_.end()) {
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index f1ad38e..73fd733 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -193,3 +193,3 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
         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";
         }
@@ -224,3 +224,3 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
         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;
     }
@@ -230,3 +230,3 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
     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");
diff --git a/Swift/QtUI/QtTextEdit.cpp b/Swift/QtUI/QtTextEdit.cpp
index e63cd4f..b3c57a7 100644
--- a/Swift/QtUI/QtTextEdit.cpp
+++ b/Swift/QtUI/QtTextEdit.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -242,3 +242,3 @@ void QtTextEdit::setUpSpellChecker() {
             // Spellchecking is not working, as we did not get a valid checker from the factory. Disable spellchecking.
-            SWIFT_LOG(warning) << "Spellchecking is currently misconfigured in Swift (e.g. missing dictionary or broken dictionary file). Disable spellchecking." << std::endl;
+            SWIFT_LOG(warning) << "Spellchecking is currently misconfigured in Swift (e.g. missing dictionary or broken dictionary file). Disable spellchecking.";
             settings_->storeSetting(QtUISettingConstants::SPELL_CHECKER, false);
diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp
index 93fca5f..49f55dd 100644
--- a/Swift/QtUI/QtUIFactory.cpp
+++ b/Swift/QtUI/QtUIFactory.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -51,5 +51,5 @@ QtUIFactory::QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider*
 QtUIFactory::~QtUIFactory() {
-    SWIFT_LOG(debug) << "Entering QtUIFactory destructor. chatWindows size:" << chatWindows_.size() << std::endl;
+    SWIFT_LOG(debug) << "Entering QtUIFactory destructor. chatWindows size:" << chatWindows_.size();
     for (auto chat : chatWindows_) {
-        SWIFT_LOG_ASSERT(chat.isNull(), debug) << "QtUIFactory has active chat windows and has not been reset properly" << std::endl;
+        SWIFT_LOG_ASSERT(chat.isNull(), debug) << "QtUIFactory has active chat windows and has not been reset properly";
     }
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index bca9e2e..75a23f8 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -143,3 +143,3 @@ void QtWebKitChatView::addMessageTop(std::shared_ptr<ChatSnippet> /* snippet */)
     // TODO: Implement this in a sensible manner later.
-    SWIFT_LOG(error) << "Not yet implemented!" << std::endl;
+    SWIFT_LOG(error) << "Not yet implemented!";
 }
@@ -386,3 +386,3 @@ void QtWebKitChatView::setFileTransferProgress(QString id, const int percentageD
     if (ftElement.isNull()) {
-        SWIFT_LOG(debug) << "Tried to access FT UI via invalid id!" << std::endl;
+        SWIFT_LOG(debug) << "Tried to access FT UI via invalid id!";
         return;
@@ -400,3 +400,3 @@ void QtWebKitChatView::setFileTransferStatus(QString id, const ChatWindow::FileT
     if (ftElement.isNull()) {
-        SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id) << std::endl;
+        SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id);
         return;
@@ -485,3 +485,3 @@ void QtWebKitChatView::resetTopInsertPoint() {
     // TODO: Implement or refactor later.
-    SWIFT_LOG(error) << "Not yet implemented!" << std::endl;
+    SWIFT_LOG(error) << "Not yet implemented!";
 }
@@ -626,3 +626,3 @@ void QtWebKitChatView::resizeEvent(QResizeEvent* event) {
 std::string QtWebKitChatView::addFileTransfer(const std::string& senderName, const std::string& avatarPath, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes, const std::string& description) {
-    SWIFT_LOG(debug) << "addFileTransfer" << std::endl;
+    SWIFT_LOG(debug) << "addFileTransfer";
     QString ft_id = QString("ft%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++)));
@@ -728,3 +728,3 @@ void QtWebKitChatView::setFileTransferWarning(QString id, QString warningText) {
     if (ftElement.isNull()) {
-        SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id) << std::endl;
+        SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id);
         return;
@@ -739,3 +739,3 @@ void QtWebKitChatView::removeFileTransferWarning(QString id) {
     if (ftElement.isNull()) {
-        SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id) << std::endl;
+        SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id);
         return;
@@ -831,3 +831,3 @@ void QtWebKitChatView::handleHTMLButtonClicked(QString id, QString encodedArgume
     else {
-        SWIFT_LOG(debug) << "Unknown HTML button! ( " << Q2PSTRING(id) << " )" << std::endl;
+        SWIFT_LOG(debug) << "Unknown HTML button! ( " << Q2PSTRING(id) << " )";
     }
diff --git a/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp b/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp
index 2402529..53e2733 100644
--- a/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp
+++ b/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2019 Isode Limited.
  * All rights reserved.
@@ -516,5 +516,5 @@ void QtDynamicGridLayout::moveTab(QtTabWidget* tabWidget, int oldIndex, int newI
 #if QT_VERSION >= 0x040500
-    SWIFT_LOG_ASSERT(movingTab_ == nullptr, error) << std::endl;
+    SWIFT_LOG_ASSERT(movingTab_ == nullptr, error);
     movingTab_ = qobject_cast<QtTabbable*>(tabWidget->widget(oldIndex));
-    SWIFT_LOG_ASSERT(movingTab_ != nullptr, error) << std::endl;
+    SWIFT_LOG_ASSERT(movingTab_ != nullptr, error);
 
@@ -528,3 +528,3 @@ void QtDynamicGridLayout::moveTab(QtTabWidget* tabWidget, int oldIndex, int newI
         qApp->removeEventFilter(this);
-        SWIFT_LOG_ASSERT(movingTab_ == tabWidget->widget(newIndex), error) << std::endl;
+        SWIFT_LOG_ASSERT(movingTab_ == tabWidget->widget(newIndex), error);
     }