19 files changed, 81 insertions, 81 deletions
diff --git a/Swift/Controllers/AccountController.cpp b/Swift/Controllers/AccountController.cpp
index b877ce9..a257cc4 100644
--- a/Swift/Controllers/AccountController.cpp
+++ b/Swift/Controllers/AccountController.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -783,6 +783,6 @@ void AccountController::enableMessageCarbons() {
         if (error) {
-            SWIFT_LOG(warning) << "Failed to enable carbons." << std::endl;
+            SWIFT_LOG(warning) << "Failed to enable carbons.";
         }
         else {
-            SWIFT_LOG(debug) << "Successfully enabled carbons." << std::endl;
+            SWIFT_LOG(debug) << "Successfully enabled carbons.";
         }
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index 5f441f8..debd83f 100644
--- a/Swift/Controllers/Chat/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -192,3 +192,3 @@ void ChatController::preHandleIncomingMessage(std::shared_ptr<MessageEvent> mess
     if (std::shared_ptr<DeliveryReceipt> receipt = message->getPayload<DeliveryReceipt>()) {
-        SWIFT_LOG(debug) << "received receipt for id: " << receipt->getReceivedID() << std::endl;
+        SWIFT_LOG(debug) << "received receipt for id: " << receipt->getReceivedID();
         if (requestedReceipts_.find(receipt->getReceivedID()) != requestedReceipts_.end()) {
@@ -409,3 +409,3 @@ void ChatController::handleWhiteboardStateChange(const ChatWindow::WhiteboardSes
 void ChatController::handleFileTransferCancel(std::string id) {
-    SWIFT_LOG(debug) << "handleFileTransferCancel(" << id << ")" << std::endl;
+    SWIFT_LOG(debug) << "handleFileTransferCancel(" << id << ")";
     if (ftControllers.find(id) != ftControllers.end()) {
@@ -418,3 +418,3 @@ void ChatController::handleFileTransferCancel(std::string id) {
 void ChatController::handleFileTransferStart(std::string id, std::string description) {
-    SWIFT_LOG(debug) << "handleFileTransferStart(" << id << ", " << description << ")" << std::endl;
+    SWIFT_LOG(debug) << "handleFileTransferStart(" << id << ", " << description << ")";
     if (ftControllers.find(id) != ftControllers.end()) {
@@ -427,3 +427,3 @@ void ChatController::handleFileTransferStart(std::string id, std::string descrip
 void ChatController::handleFileTransferAccept(std::string id, std::string filename) {
-    SWIFT_LOG(debug) << "handleFileTransferAccept(" << id << ", " << filename << ")" << std::endl;
+    SWIFT_LOG(debug) << "handleFileTransferAccept(" << id << ", " << filename << ")";
     if (ftControllers.find(id) != ftControllers.end()) {
@@ -436,3 +436,3 @@ void ChatController::handleFileTransferAccept(std::string id, std::string filena
 void ChatController::handleSendFileRequest(std::string filename) {
-    SWIFT_LOG(debug) << "ChatController::handleSendFileRequest(" << filename << ")" << std::endl;
+    SWIFT_LOG(debug) << "ChatController::handleSendFileRequest(" << filename << ")";
     eventStream_->send(std::make_shared<SendFileUIEvent>(getToJID(), filename));
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index 6530a7e..193af7f 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -177,3 +177,3 @@ ChatsManager::~ChatsManager() {
     delete joinMUCWindow_;
-    SWIFT_LOG(debug) << "Destroying ChatsManager, containing " << chatControllers_.size() << " chats and " << mucControllers_.size() << " MUCs" << std::endl;
+    SWIFT_LOG(debug) << "Destroying ChatsManager, containing " << chatControllers_.size() << " chats and " << mucControllers_.size() << " MUCs";
     for (JIDChatControllerPair controllerPair : chatControllers_) {
@@ -313,3 +313,3 @@ void ChatsManager::loadRecents() {
         } catch (const boost::archive::archive_exception& e) {
-            SWIFT_LOG(debug) << "Failed to load recents: " << e.what() << std::endl;
+            SWIFT_LOG(debug) << "Failed to load recents: " << e.what();
             return;
@@ -938,3 +938,3 @@ void ChatsManager::handleUserNicknameChanged(MUCController* mucController, const
 
-    SWIFT_LOG(debug) << "nickname change in " << mucController->getToJID().toString() << " from " << oldNickname << " to " << newNickname << std::endl;
+    SWIFT_LOG(debug) << "nickname change in " << mucController->getToJID().toString() << " from " << oldNickname << " to " << newNickname;
 
@@ -985,3 +985,3 @@ void ChatsManager::handleIncomingMessage(std::shared_ptr<Message> incomingMessag
             else {
-                SWIFT_LOG(error) << "Carbons message ignored." << std::endl;
+                SWIFT_LOG(error) << "Carbons message ignored.";
             }
@@ -1143,3 +1143,3 @@ void ChatsManager::handleLocalServiceFound(const JID& service, std::shared_ptr<D
                 localMUCServiceFinderWalker_->endWalk();
-                SWIFT_LOG(debug) << "Use following MUC service for impromptu chats: " << localMUCServiceJID_ << std::endl;
+                SWIFT_LOG(debug) << "Use following MUC service for impromptu chats: " << localMUCServiceJID_;
                 break;
diff --git a/Swift/Controllers/Chat/MUCSearchController.cpp b/Swift/Controllers/Chat/MUCSearchController.cpp
index 5db917a..0b54d25 100644
--- a/Swift/Controllers/Chat/MUCSearchController.cpp
+++ b/Swift/Controllers/Chat/MUCSearchController.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -94,3 +94,3 @@ void MUCSearchController::handleSearchService(const JID& jid) {
 
-    SWIFT_LOG(debug) << "Starting walking MUC services" << std::endl;
+    SWIFT_LOG(debug) << "Starting walking MUC services";
     itemsInProgress_ = 0;
@@ -115,3 +115,3 @@ void MUCSearchController::handleDiscoServiceFound(const JID& jid, std::shared_pt
     if (isMUC) {
-        SWIFT_LOG(debug) << "MUC Service found: " << jid << std::endl;
+        SWIFT_LOG(debug) << "MUC Service found: " << jid;
         services_.erase(std::remove(services_.begin(), services_.end(), jid), services_.end());
@@ -122,3 +122,3 @@ void MUCSearchController::handleDiscoServiceFound(const JID& jid, std::shared_pt
         itemsInProgress_++;
-        SWIFT_LOG(debug) << "Requesting items of " << jid << " (" << itemsInProgress_ << " item requests in progress)" << std::endl;
+        SWIFT_LOG(debug) << "Requesting items of " << jid << " (" << itemsInProgress_ << " item requests in progress)";
         GetDiscoItemsRequest::ref discoItemsRequest = GetDiscoItemsRequest::create(jid, iqRouter_);
@@ -134,3 +134,3 @@ void MUCSearchController::handleDiscoServiceFound(const JID& jid, std::shared_pt
 void MUCSearchController::handleDiscoWalkFinished() {
-    SWIFT_LOG(debug) << "MUC Walk finished" << std::endl;
+    SWIFT_LOG(debug) << "MUC Walk finished";
     updateInProgressness();
@@ -146,3 +146,3 @@ void MUCSearchController::handleRoomsItemsResponse(std::shared_ptr<DiscoItems> i
     itemsInProgress_--;
-    SWIFT_LOG(debug) << "Items received for " << jid << " (" << itemsInProgress_ << " item requests in progress)" << std::endl;
+    SWIFT_LOG(debug) << "Items received for " << jid << " (" << itemsInProgress_ << " item requests in progress)";
     updateInProgressness();
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index 27e9dbf..5b86a7b 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -7,3 +7,3 @@
 /*
- * Copyright (c) 2015-2017 Isode Limited.
+ * Copyright (c) 2015-2019 Isode Limited.
  * All rights reserved.
@@ -84,3 +84,3 @@ boost::uintmax_t FileTransferController::getSize() const {
 void FileTransferController::start(std::string& description) {
-    SWIFT_LOG(debug) << "FileTransferController::start" << std::endl;
+    SWIFT_LOG(debug) << "FileTransferController::start";
     fileReadStream = std::make_shared<FileReadBytestream>(boost::filesystem::path(filename));
@@ -100,3 +100,3 @@ void FileTransferController::start(std::string& description) {
 void FileTransferController::accept(std::string& file) {
-    SWIFT_LOG(debug) << "FileTransferController::accept" << std::endl;
+    SWIFT_LOG(debug) << "FileTransferController::accept";
     IncomingFileTransfer::ref incomingTransfer = std::dynamic_pointer_cast<IncomingFileTransfer>(transfer);
diff --git a/Swift/Controllers/Highlighting/HighlightManager.cpp b/Swift/Controllers/Highlighting/HighlightManager.cpp
index 2ca77e7..f09d94c 100644
--- a/Swift/Controllers/Highlighting/HighlightManager.cpp
+++ b/Swift/Controllers/Highlighting/HighlightManager.cpp
@@ -7,3 +7,3 @@
 /*
- * Copyright (c) 2014-2017 Isode Limited.
+ * Copyright (c) 2014-2019 Isode Limited.
  * All rights reserved.
@@ -87,3 +87,3 @@ HighlightConfiguration HighlightManager::highlightConfigurationFromString(const
         configuration = getDefaultConfig();
-        SWIFT_LOG(warning) << "Failed to load highlight configuration. Will use default configuration instead." << std::endl;
+        SWIFT_LOG(warning) << "Failed to load highlight configuration. Will use default configuration instead.";
     }
diff --git a/Swift/Controllers/Settings/XMLSettingsProvider.cpp b/Swift/Controllers/Settings/XMLSettingsProvider.cpp
index f1049f1..a316cef 100644
--- a/Swift/Controllers/Settings/XMLSettingsProvider.cpp
+++ b/Swift/Controllers/Settings/XMLSettingsProvider.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2019 Isode Limited.
  * All rights reserved.
@@ -22,6 +22,6 @@ XMLSettingsProvider::XMLSettingsProvider(const std::string& xmlConfig) : level_(
         if (parser->parse(xmlConfig)) {
-            SWIFT_LOG(debug) << "Found and parsed system config" << std::endl;
+            SWIFT_LOG(debug) << "Found and parsed system config";
         }
         else {
-            SWIFT_LOG(debug) << "Found invalid system config" << std::endl;
+            SWIFT_LOG(debug) << "Found invalid system config";
         }
@@ -29,3 +29,3 @@ XMLSettingsProvider::XMLSettingsProvider(const std::string& xmlConfig) : level_(
     else {
-        SWIFT_LOG(debug) << "No system config found" << std::endl;
+        SWIFT_LOG(debug) << "No system config found";
     }
@@ -112,3 +112,3 @@ void XMLSettingsProvider::handleEndElement(const std::string& /*element*/, const
         values_[currentElement_] = currentText_;
-        SWIFT_LOG(debug) << "Setting value of " << currentElement_ << " to " << currentText_ << std::endl;
+        SWIFT_LOG(debug) << "Setting value of " << currentElement_ << " to " << currentText_;
     }
diff --git a/Swift/Controllers/StatusCache.cpp b/Swift/Controllers/StatusCache.cpp
index 3c6baed..f9196f6 100644
--- a/Swift/Controllers/StatusCache.cpp
+++ b/Swift/Controllers/StatusCache.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2019 Isode Limited.
  * All rights reserved.
@@ -78,3 +78,3 @@ void StatusCache::loadRecents() {
                 catch (const boost::bad_lexical_cast& e) {
-                    SWIFT_LOG(error) << "Failed to load recent status cache entry: " << e.what() << std::endl;
+                    SWIFT_LOG(error) << "Failed to load recent status cache entry: " << e.what();
                 }
@@ -84,3 +84,3 @@ void StatusCache::loadRecents() {
     catch (const boost::filesystem::filesystem_error& e) {
-        SWIFT_LOG(error) << "Failed to load recents: " << e.what() << std::endl;
+        SWIFT_LOG(error) << "Failed to load recents: " << e.what();
     }
@@ -102,3 +102,3 @@ void StatusCache::saveRecents() {
     catch (const boost::filesystem::filesystem_error& e) {
-        SWIFT_LOG(error) << "Failed to save recents: " << e.what() << std::endl;
+        SWIFT_LOG(error) << "Failed to save recents: " << e.what();
     }
diff --git a/Swift/Controllers/Storages/AvatarFileStorage.cpp b/Swift/Controllers/Storages/AvatarFileStorage.cpp
index 9d9b9ea..808c432 100644
--- a/Swift/Controllers/Storages/AvatarFileStorage.cpp
+++ b/Swift/Controllers/Storages/AvatarFileStorage.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -32,3 +32,3 @@ AvatarFileStorage::AvatarFileStorage(const boost::filesystem::path& avatarsDir,
                     else if (!r.first.empty() || !r.second.empty()) {
-                        SWIFT_LOG(error) << "Invalid entry in avatars file: " << r.second << std::endl;
+                        SWIFT_LOG(error) << "Invalid entry in avatars file: " << r.second;
                     }
@@ -38,3 +38,3 @@ AvatarFileStorage::AvatarFileStorage(const boost::filesystem::path& avatarsDir,
         catch (...) {
-            SWIFT_LOG(error) << "Error reading avatars file" << std::endl;
+            SWIFT_LOG(error) << "Error reading avatars file";
         }
@@ -56,3 +56,3 @@ void AvatarFileStorage::addAvatar(const std::string& hash, const ByteArray& avat
         catch (const boost::filesystem::filesystem_error& e) {
-            SWIFT_LOG(error) << "filesystem error: " << e.what() << std::endl;
+            SWIFT_LOG(error) << "filesystem error: " << e.what();
         }
@@ -65,3 +65,3 @@ void AvatarFileStorage::addAvatar(const std::string& hash, const ByteArray& avat
     catch (const boost::filesystem::filesystem_error& e) {
-        SWIFT_LOG(error) << "filesystem error: " << e.what() << std::endl;
+        SWIFT_LOG(error) << "filesystem error: " << e.what();
     }
@@ -79,3 +79,3 @@ ByteArray AvatarFileStorage::getAvatar(const std::string& hash) const {
     catch (const boost::filesystem::filesystem_error& e) {
-        SWIFT_LOG(error) << "filesystem error: " << e.what() << std::endl;
+        SWIFT_LOG(error) << "filesystem error: " << e.what();
     }
@@ -109,3 +109,3 @@ void AvatarFileStorage::saveJIDAvatars() {
     catch (...) {
-        SWIFT_LOG(error) << "Error writing avatars file" << std::endl;
+        SWIFT_LOG(error) << "Error writing avatars file";
     }
diff --git a/Swift/Controllers/Storages/CertificateFileStorage.cpp b/Swift/Controllers/Storages/CertificateFileStorage.cpp
index 2e1343f..a8661df 100644
--- a/Swift/Controllers/Storages/CertificateFileStorage.cpp
+++ b/Swift/Controllers/Storages/CertificateFileStorage.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
@@ -33,3 +33,3 @@ bool CertificateFileStorage::hasCertificate(Certificate::ref certificate) const
         else {
-            SWIFT_LOG(warning) << "Stored certificate does not match received certificate" << std::endl;
+            SWIFT_LOG(warning) << "Stored certificate does not match received certificate";
             return false;
@@ -59,3 +59,3 @@ void CertificateFileStorage::addCertificate(Certificate::ref certificate) {
     catch (...) {
-        SWIFT_LOG(warning) << "Failed to store certificate to " << certificatePath << std::endl;
+        SWIFT_LOG(warning) << "Failed to store certificate to " << certificatePath;
     }
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);
     }