Remove std::endl from SWIFT_LOG calls

The std::endl is now added by ~Log, but only for output to stderr or a log file. Calls to the Android logging system or manually set callbacks will not include the newline in the logging output. JIRA: SWIFT-430 Test-Information: Unit tests pass on Debian 9 Checked that running Swift with logging to stderr still had a newline. Change-Id: I096fdba78a3b8f87db2097951c28c528592183e8
author: Edwin Mons <edwin.mons@isode.com> 2019-11-19 13:36:05 (GMT)
committer: Edwin Mons <edwin.mons@isode.com> 2019-11-19 13:58:45 (GMT)
commit: 261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch)
tree: c7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swift
parent: 697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff)
download: swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip
swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2
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,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 <Swift/Controllers/AccountController.h>
 
@@ -778,16 +778,16 @@ void AccountController::handleServerDiscoInfoResponse(std::shared_ptr<DiscoInfo>
 }
 
 void AccountController::enableMessageCarbons() {
     auto enableCarbonsRequest = EnableCarbonsRequest::create(client_->getIQRouter());
     enableCarbonsRequestHandlerConnection_ = enableCarbonsRequest->onResponse.connect([&](Payload::ref /*payload*/, ErrorPayload::ref error) {
         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.";
         }
         enableCarbonsRequestHandlerConnection_.disconnect();
     });
     enableCarbonsRequest->send();
 }
 
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,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 <Swift/Controllers/Chat/ChatController.h>
 
@@ -187,13 +187,13 @@ void ChatController::preHandleIncomingMessage(std::shared_ptr<MessageEvent> mess
     chatStateTracker_->handleMessageReceived(message);
     chatStateNotifier_->receivedMessageFromContact(!!message->getPayload<ChatState>());
 
     // handle XEP-0184 Message Receipts
     // incomming receipts
     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()) {
             chatWindow_->setMessageReceiptState(requestedReceipts_[receipt->getReceivedID()], ChatWindow::ReceiptReceived);
             requestedReceipts_.erase(receipt->getReceivedID());
         }
     // incomming errors in response to send out receipts
     } else if (message->getPayload<DeliveryReceiptRequest>() && (message->getType() == Message::Error)) {
@@ -404,40 +404,40 @@ void ChatController::handleWhiteboardSessionRequest(bool senderIsSelf) {
 
 void ChatController::handleWhiteboardStateChange(const ChatWindow::WhiteboardSessionState state) {
     chatWindow_->setWhiteboardSessionStatus(lastWbID_, state);
 }
 
 void ChatController::handleFileTransferCancel(std::string id) {
-    SWIFT_LOG(debug) << "handleFileTransferCancel(" << id << ")" << std::endl;
+    SWIFT_LOG(debug) << "handleFileTransferCancel(" << id << ")";
     if (ftControllers.find(id) != ftControllers.end()) {
         ftControllers[id]->cancel();
     } else {
         std::cerr << "unknown file transfer UI id" << std::endl;
     }
 }
 
 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()) {
         ftControllers[id]->start(description);
     } else {
         std::cerr << "unknown file transfer UI id" << std::endl;
     }
 }
 
 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()) {
         ftControllers[id]->accept(filename);
     } else {
         std::cerr << "unknown file transfer UI id" << std::endl;
     }
 }
 
 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));
 }
 
 void ChatController::handleWhiteboardSessionAccept() {
     eventStream_->send(std::make_shared<AcceptWhiteboardSessionUIEvent>(toJID_));
 }
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,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 <Swift/Controllers/Chat/ChatsManager.h>
 
@@ -172,13 +172,13 @@ ChatsManager::~ChatsManager() {
     roster_->onJIDAdded.disconnect(boost::bind(&ChatsManager::handleJIDAddedToRoster, this, _1));
     roster_->onJIDRemoved.disconnect(boost::bind(&ChatsManager::handleJIDRemovedFromRoster, this, _1));
     roster_->onJIDUpdated.disconnect(boost::bind(&ChatsManager::handleJIDUpdatedInRoster, this, _1));
     roster_->onRosterCleared.disconnect(boost::bind(&ChatsManager::handleRosterCleared, this));
     ftOverview_->onNewFileTransferController.disconnect(boost::bind(&ChatsManager::handleNewFileTransferController, this, _1));
     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_) {
         delete controllerPair.second;
     }
     for (JIDMUCControllerPair controllerPair : mucControllers_) {
         delete controllerPair.second;
     }
@@ -308,13 +308,13 @@ void ChatsManager::loadRecents() {
         std::vector<ChatListWindow::Chat> recentChats;
         std::stringstream deserializeStream(std::string(reinterpret_cast<const char*>(vecptr(debase64)), debase64.size()));
         try {
             boost::archive::text_iarchive ia(deserializeStream);
             ia >> recentChats;
         } 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;
         }
         recentChats.erase(std::remove(recentChats.begin(), recentChats.end(), ChatListWindow::Chat()), recentChats.end());
         for (auto chat : recentChats) {
             chat.statusType = StatusShow::None;
             chat = updateChatStatusAndAvatarHelper(chat);
@@ -933,13 +933,13 @@ void ChatsManager::handleSearchMUCRequest() {
 }
 
 void ChatsManager::handleUserNicknameChanged(MUCController* mucController, const std::string& oldNickname, const std::string& newNickname) {
     JID oldMUCChatJID = mucController->getToJID().withResource(oldNickname);
     JID newMUCChatJID = mucController->getToJID().withResource(newNickname);
 
-    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;
 
     // get current chat controller
     ChatController *chatController = getChatControllerIfExists(oldMUCChatJID);
     if (chatController) {
         // adjust chat controller
         chatController->setToJID(newMUCChatJID);
@@ -980,13 +980,13 @@ void ChatsManager::handleIncomingMessage(std::shared_ptr<Message> incomingMessag
 
             ChatController* controller = getChatControllerOrCreate(toJID);
             if (controller) {
                 controller->handleIncomingOwnMessage(forwardedMessage);
             }
             else {
-                SWIFT_LOG(error) << "Carbons message ignored." << std::endl;
+                SWIFT_LOG(error) << "Carbons message ignored.";
             }
             return;
         }
     }
     JID fromJID = message->getFrom();
 
@@ -1138,13 +1138,13 @@ void ChatsManager::handleLocalServiceFound(const JID& service, std::shared_ptr<D
             if ((identity.getCategory() == "directory"
                 && identity.getType() == "chatroom")
                 || (identity.getCategory() == "conference"
                 && identity.getType() == "text")) {
                 localMUCServiceJID_ = service;
                 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;
             }
     }
 }
 
 void ChatsManager::handleLocalServiceWalkFinished() {
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,8 +1,8 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Chat/MUCSearchController.h>
 
@@ -89,13 +89,13 @@ void MUCSearchController::handleSearchService(const JID& jid) {
         walker_->endWalk();
         walker_->onServiceFound.disconnect(boost::bind(&MUCSearchController::handleDiscoServiceFound, this, _1, _2));
         walker_->onWalkComplete.disconnect(boost::bind(&MUCSearchController::handleDiscoWalkFinished, this));
         delete walker_;
     }
 
-    SWIFT_LOG(debug) << "Starting walking MUC services" << std::endl;
+    SWIFT_LOG(debug) << "Starting walking MUC services";
     itemsInProgress_ = 0;
     walker_ = new DiscoServiceWalker(jid, iqRouter_);
     walker_->onServiceFound.connect(boost::bind(&MUCSearchController::handleDiscoServiceFound, this, _1, _2));
     walker_->onWalkComplete.connect(boost::bind(&MUCSearchController::handleDiscoWalkFinished, this));
     walker_->beginWalk();
 }
@@ -110,44 +110,44 @@ void MUCSearchController::handleDiscoServiceFound(const JID& jid, std::shared_pt
                 && identity.getType() == "text")) {
                 isMUC = true;
                 name = identity.getName();
             }
     }
     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());
         services_.push_back(jid);
         serviceDetails_[jid].setName(name);
         serviceDetails_[jid].setJID(jid);
         serviceDetails_[jid].setComplete(false);
         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_);
         discoItemsRequest->onResponse.connect(boost::bind(&MUCSearchController::handleRoomsItemsResponse, this, _1, _2, jid));
         discoItemsRequest->send();
     }
     else {
         removeService(jid);
     }
     refreshView();
 }
 
 void MUCSearchController::handleDiscoWalkFinished() {
-    SWIFT_LOG(debug) << "MUC Walk finished" << std::endl;
+    SWIFT_LOG(debug) << "MUC Walk finished";
     updateInProgressness();
 }
 
 void MUCSearchController::removeService(const JID& jid) {
     serviceDetails_.erase(jid);
     services_.erase(std::remove(services_.begin(), services_.end(), jid), services_.end());
     refreshView();
 }
 
 void MUCSearchController::handleRoomsItemsResponse(std::shared_ptr<DiscoItems> items, ErrorPayload::ref error, const JID& jid) {
     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();
     if (error) {
         handleDiscoError(jid, error);
         return;
     }
     serviceDetails_[jid].clearRooms();
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
@@ -2,13 +2,13 @@
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2015-2017 Isode Limited.
+ * Copyright (c) 2015-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/FileTransfer/FileTransferController.h>
 
@@ -79,13 +79,13 @@ boost::uintmax_t FileTransferController::getSize() const {
     } else {
         return 0;
     }
 }
 
 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));
     OutgoingFileTransfer::ref outgoingTransfer = ftManager->createOutgoingFileTransfer(otherParty, boost::filesystem::path(filename), description, fileReadStream);
     if (outgoingTransfer) {
         ftProgressInfo = new FileTransferProgressInfo(outgoingTransfer->getFileSizeInBytes());
         ftProgressInfo->onProgressPercentage.connect(boost::bind(&FileTransferController::handleProgressPercentageChange, this, _1));
         outgoingTransfer->onStateChanged.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
@@ -95,13 +95,13 @@ void FileTransferController::start(std::string& description) {
     } else {
         std::cerr << "File transfer not supported!" << std::endl;
     }
 }
 
 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);
     if (incomingTransfer) {
         fileWriteStream = std::make_shared<FileWriteBytestream>(boost::filesystem::path(file));
 
         ftProgressInfo = new FileTransferProgressInfo(transfer->getFileSizeInBytes());
         ftProgressInfo->onProgressPercentage.connect(boost::bind(&FileTransferController::handleProgressPercentageChange, this, _1));
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
@@ -2,13 +2,13 @@
  * Copyright (c) 2012 Maciej Niedzielski
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2014-2017 Isode Limited.
+ * Copyright (c) 2014-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Highlighting/HighlightManager.h>
 
@@ -82,13 +82,13 @@ HighlightConfiguration HighlightManager::highlightConfigurationFromString(const
     try {
         boost::archive::text_iarchive archive(stream);
         archive >> configuration;
     }
     catch (boost::archive::archive_exception&) {
         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.";
     }
     return configuration;
 }
 
 std::string HighlightManager::highlightConfigurationToString(const HighlightConfiguration& configuration) {
     std::stringstream stream;
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,8 +1,8 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Settings/XMLSettingsProvider.h>
 
@@ -17,20 +17,20 @@ namespace Swift {
 
 XMLSettingsProvider::XMLSettingsProvider(const std::string& xmlConfig) : level_(0) {
     if (!xmlConfig.empty()) {
         PlatformXMLParserFactory factory;
         auto parser = factory.createXMLParser(this, true);
         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";
         }
     }
     else {
-        SWIFT_LOG(debug) << "No system config found" << std::endl;
+        SWIFT_LOG(debug) << "No system config found";
     }
 }
 
 XMLSettingsProvider::~XMLSettingsProvider() {
 
 }
@@ -107,13 +107,13 @@ void XMLSettingsProvider::handleStartElement(const std::string& element, const s
     }
 }
 
 void XMLSettingsProvider::handleEndElement(const std::string& /*element*/, const std::string& /*ns*/) {
     if (level_ == SettingLevel) {
         values_[currentElement_] = currentText_;
-        SWIFT_LOG(debug) << "Setting value of " << currentElement_ << " to " << currentText_ << std::endl;
+        SWIFT_LOG(debug) << "Setting value of " << currentElement_ << " to " << currentText_;
     }
     level_--;
 }
 
 void XMLSettingsProvider::handleCharacterData(const std::string& data) {
     if (level_ >= SettingLevel) {
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,8 +1,8 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/StatusCache.h>
 
@@ -73,19 +73,19 @@ void StatusCache::loadRecents() {
                 StatusShow::Type type;
                 try {
                     type = static_cast<StatusShow::Type>(boost::lexical_cast<size_t>(bits[0]));
                     previousStatuses_.push_back(PreviousStatus(boost::trim_copy(bits[1]), type));
                 }
                 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();
                 }
             }
         }
     }
     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();
     }
 }
 
 void StatusCache::saveRecents() {
     try {
         if (!boost::filesystem::exists(path_.parent_path())) {
@@ -97,13 +97,13 @@ void StatusCache::saveRecents() {
             boost::replace_all(message, "\t", " ");
             file << recent.second << "\t" << message << std::endl;
         }
         file.close();
     }
     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,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 <Swift/Controllers/Storages/AvatarFileStorage.h>
 
@@ -27,19 +27,19 @@ AvatarFileStorage::AvatarFileStorage(const boost::filesystem::path& avatarsDir,
                     std::pair<std::string, std::string> r = String::getSplittedAtFirst(line, ' ');
                     JID jid(r.second);
                     if (jid.isValid()) {
                         jidAvatars.insert(std::make_pair(jid, r.first));
                     }
                     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;
                     }
                 }
             }
         }
         catch (...) {
-            SWIFT_LOG(error) << "Error reading avatars file" << std::endl;
+            SWIFT_LOG(error) << "Error reading avatars file";
         }
     }
 }
 
 bool AvatarFileStorage::hasAvatar(const std::string& hash) const {
     return boost::filesystem::exists(getAvatarPath(hash));
@@ -51,22 +51,22 @@ void AvatarFileStorage::addAvatar(const std::string& hash, const ByteArray& avat
     boost::filesystem::path avatarPath = getAvatarPath(hash);
     if (!boost::filesystem::exists(avatarPath.parent_path())) {
         try {
             boost::filesystem::create_directories(avatarPath.parent_path());
         }
         catch (const boost::filesystem::filesystem_error& e) {
-            SWIFT_LOG(error) << "filesystem error: " << e.what() << std::endl;
+            SWIFT_LOG(error) << "filesystem error: " << e.what();
         }
     }
 
     try {
         boost::filesystem::ofstream file(avatarPath, boost::filesystem::ofstream::binary|boost::filesystem::ofstream::out);
         file.write(reinterpret_cast<const char*>(vecptr(avatar)), static_cast<std::streamsize>(avatar.size()));
     }
     catch (const boost::filesystem::filesystem_error& e) {
-        SWIFT_LOG(error) << "filesystem error: " << e.what() << std::endl;
+        SWIFT_LOG(error) << "filesystem error: " << e.what();
     }
 }
 
 boost::filesystem::path AvatarFileStorage::getAvatarPath(const std::string& hash) const {
     return avatarsDir / hash;
 }
@@ -74,13 +74,13 @@ boost::filesystem::path AvatarFileStorage::getAvatarPath(const std::string& hash
 ByteArray AvatarFileStorage::getAvatar(const std::string& hash) const {
     ByteArray data;
     try {
         readByteArrayFromFile(data, getAvatarPath(hash));
     }
     catch (const boost::filesystem::filesystem_error& e) {
-        SWIFT_LOG(error) << "filesystem error: " << e.what() << std::endl;
+        SWIFT_LOG(error) << "filesystem error: " << e.what();
     }
     return data;
 }
 
 void AvatarFileStorage::setAvatarForJID(const JID& jid, const std::string& hash) {
     std::pair<JIDAvatarMap::iterator, bool> r = jidAvatars.insert(std::make_pair(jid, hash));
@@ -104,11 +104,11 @@ void AvatarFileStorage::saveJIDAvatars() {
         for (JIDAvatarMap::const_iterator i = jidAvatars.begin(); i != jidAvatars.end(); ++i) {
             file << i->second << " " << i->first.toString() << std::endl;
         }
         file.close();
     }
     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,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 <Swift/Controllers/Storages/CertificateFileStorage.h>
 
@@ -28,13 +28,13 @@ bool CertificateFileStorage::hasCertificate(Certificate::ref certificate) const
         readByteArrayFromFile(data, certificatePath);
         Certificate::ref storedCertificate(certificateFactory->createCertificateFromDER(data));
         if (storedCertificate && storedCertificate->toDER() == certificate->toDER()) {
             return true;
         }
         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;
         }
     }
     else {
         return false;
     }
@@ -54,13 +54,13 @@ void CertificateFileStorage::addCertificate(Certificate::ref certificate) {
         boost::filesystem::ofstream file(certificatePath, boost::filesystem::ofstream::binary|boost::filesystem::ofstream::out);
         ByteArray data = certificate->toDER();
         file.write(reinterpret_cast<const char*>(vecptr(data)), boost::numeric_cast<std::streamsize>(data.size()));
         file.close();
     }
     catch (...) {
-        SWIFT_LOG(warning) << "Failed to store certificate to " << certificatePath << std::endl;
+        SWIFT_LOG(warning) << "Failed to store certificate to " << certificatePath;
     }
 }
 
 boost::filesystem::path CertificateFileStorage::getCertificatePath(Certificate::ref certificate) const {
     return path / Hexify::hexify(crypto->getSHA1Hash(certificate->toDER()));
 }
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
@@ -77,17 +77,17 @@ std::string selectCAPICertificate() {
     titleLength = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, certificateDialogTitle.c_str(), -1, titleChars, titleLength);
     promptLength = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, certificateDialogPrompt.c_str(), -1, promptChars, promptLength);
 
     if (titleLength == 0 || promptLength == 0) {
         int error = GetLastError();
         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";
 
         }
     }
 
     std::string result;
     /* Call Windows dialog to select a suitable certificate */
@@ -100,13 +100,13 @@ std::string selectCAPICertificate() {
 
     delete[] titleChars;
     delete[] promptChars;
 
     if (hstore) {
         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.";
         }
     }
 
     return result;
 }
 
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,8 +1,8 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtAboutWidget.h>
 
@@ -147,13 +147,13 @@ void QtAboutWidget::openPlainTextWindow(const QString& path) {
         file.close();
         text->resize(500, 600);
         text->show();
         text->activateWindow();
     }
     else {
-        SWIFT_LOG(error) << "Failed to open " << Q2PSTRING(path) << "." << std::endl;
+        SWIFT_LOG(error) << "Failed to open " << Q2PSTRING(path) << ".";
     }
 }
 
 void QtAboutWidget::updateUpdateInfo() {
     updateChannelInfoLabel_->hide();
     updateStateInfoLabel_->hide();
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,8 +1,8 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtScaledAvatarCache.h>
 
@@ -50,14 +50,14 @@ static QPixmap cropToBiggestCenteredSquare(const QPixmap& input) {
 
 QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) {
     QFileInfo avatarFile(path);
     if (avatarFile.exists() && !avatarFile.absolutePath().startsWith(":/")) {
         QString cacheSubPath = QString("ScaledAvatarCacheV%1/%2").arg(QString::number(QT_SCALED_AVATAR_CACHE_VERSION), QString::number(size));
         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;
         }
         QDir targetDir(avatarFile.dir().absoluteFilePath(cacheSubPath));
         QString targetFile = targetDir.absoluteFilePath(avatarFile.baseName());
         if (!QFileInfo(targetFile).exists()) {
             QPixmap avatarPixmap;
@@ -72,13 +72,13 @@ QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) {
                 maskPainter.drawPixmap(0, 0, squaredAvatarPixmap);
                 maskPainter.end();
                 if (!maskedAvatar.scaled(size, size, Qt::KeepAspectRatio, Qt::SmoothTransformation).save(targetFile, "PNG")) {
                     return path;
                 }
             } else {
-                SWIFT_LOG(warning) << "Failed to load " << Q2PSTRING(path) << std::endl;
+                SWIFT_LOG(warning) << "Failed to load " << Q2PSTRING(path);
             }
         }
         return targetFile;
     }
     else {
         return 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
@@ -2,13 +2,13 @@
  * Copyright (c) 2011 Vlad Voicu
  * Licensed under the Simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtSpellCheckerWindow.h>
 
@@ -61,13 +61,13 @@ void QtSpellCheckerWindow::setSupportedLanguages(const std::vector<std::string>&
         languageItems_[shortLang] = item;
         ui_.languageView->addItem(item);
     }
 }
 
 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()) {
         languageItems_[language]->setSelected(true);
     }
 }
 
 void QtSpellCheckerWindow::setAutomaticallyIdentifiesLanguage(bool isAutomaticallyIdentifying) {
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,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 <Swift/QtUI/QtSwift.h>
 
@@ -188,13 +188,13 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
     if (options.count("logfile")) {
         try {
             std::string fileName = options["logfile"].as<std::string>();
             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
     useDelayForLatency_ = options.count("latency-debug") > 0;
 
     // Load fonts
@@ -219,19 +219,19 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
         "themes/Default/Lato2OFL/Lato-ThinItalic.ttf"
     };
 
     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
     QFont::insertSubstitution(QApplication::font().family(), "Segoe UI Emoji");
 #endif
     enableAdHocCommandOnJID_ = options.count("enable-jid-adhocs") > 0;
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,8 +1,8 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtTextEdit.h>
 
@@ -237,13 +237,13 @@ void QtTextEdit::setUpSpellChecker() {
                 checker_->setActiveLanguage(settings_->getSetting(QtUISettingConstants::SPELL_CHECKER_LANGUAGE));
             }
             highlighter_ = new QtSpellCheckHighlighter(document(), checker_);
         }
         else {
             // 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);
         }
 
     }
 }
 #endif
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,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 <Swift/QtUI/QtUIFactory.h>
 
@@ -46,15 +46,15 @@ QtUIFactory::QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider*
     chatWindowFactory_ = new QtChatWindowFactory(netbookSplitter_, settings, qtOnlySettings, tabs_, ":/themes/Default/", emoticons_);
     chatFontSize_ = settings_->getSetting(QtUISettingConstants::CHATWINDOW_FONT_SIZE);
     historyFontSize_ = settings_->getSetting(QtUISettingConstants::HISTORYWINDOW_FONT_SIZE);
 }
 
 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";
     }
     delete chatWindowFactory_;
 }
 
 XMLConsoleWidget* QtUIFactory::createXMLConsoleWidget() {
     QtXMLConsoleWidget* widget = new QtXMLConsoleWidget();
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,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 <Swift/QtUI/QtWebKitChatView.h>
 
@@ -138,13 +138,13 @@ void QtWebKitChatView::addMessageBottom(std::shared_ptr<ChatSnippet> snippet) {
         assert(false);
     }
 }
 
 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!";
 }
 
 void QtWebKitChatView::addToDOM(std::shared_ptr<ChatSnippet> snippet) {
     //qDebug() << snippet->getContent();
     rememberScrolledToBottom();
 
@@ -381,13 +381,13 @@ static QWebElement findElementWithID(QWebElement document, QString elementName,
 }
 
 void QtWebKitChatView::setFileTransferProgress(QString id, const int percentageDone) {
     rememberScrolledToBottom();
     QWebElement ftElement = findElementWithID(document_, "div", id);
     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;
     }
     QWebElement progressBar = ftElement.findFirst("div.progressbar");
     progressBar.setStyleProperty("width", QString::number(percentageDone) + "%");
 
     QWebElement progressBarValue = ftElement.findFirst("div.progressbar-value");
@@ -395,13 +395,13 @@ void QtWebKitChatView::setFileTransferProgress(QString id, const int percentageD
 }
 
 void QtWebKitChatView::setFileTransferStatus(QString id, const ChatWindow::FileTransferState state, const QString& /* msg */) {
     rememberScrolledToBottom();
     QWebElement ftElement = findElementWithID(document_, "div", 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;
     }
 
     QString newInnerHTML = "";
     if (state == ChatWindow::Initialisation) {
         QWebElement filenameSizeDescriptionElement = ftElement.parent().firstChild();
@@ -480,13 +480,13 @@ int QtWebKitChatView::getSnippetPositionByDate(const QDate& date) {
 
     return message.geometry().top();
 }
 
 void QtWebKitChatView::resetTopInsertPoint() {
     // TODO: Implement or refactor later.
-    SWIFT_LOG(error) << "Not yet implemented!" << std::endl;
+    SWIFT_LOG(error) << "Not yet implemented!";
 }
 
 std::string QtWebKitChatView::addMessage(
         const ChatWindow::ChatMessage& message,
         const std::string& senderName,
         bool senderIsSelf,
@@ -621,13 +621,13 @@ void QtWebKitChatView::resizeEvent(QResizeEvent* event) {
         scrollToBottom();
     }
     QWidget::resizeEvent(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_++)));
 
     QString actionText;
     QString htmlString;
     QString formattedFileSize = P2QSTRING(formatSize(sizeInBytes));
     QString sanitizedFileName = QtUtilities::htmlEscape(P2QSTRING(filename));
@@ -723,24 +723,24 @@ static bool isFilePathWritable(const QString& path) {
     }
 }
 
 void QtWebKitChatView::setFileTransferWarning(QString id, QString warningText) {
     QWebElement ftElement = findElementWithID(document_, "div", 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;
     }
 
     removeFileTransferWarning(id);
     ftElement.appendInside(QString("<div class='ft_warning' style='color: red;'><br/>%1</div>").arg(QtUtilities::htmlEscape(warningText)));
 }
 
 void QtWebKitChatView::removeFileTransferWarning(QString id) {
     QWebElement ftElement = findElementWithID(document_, "div", 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;
     }
 
     QWebElement warningElement = ftElement.findFirst(".ft_warning");
     if (!warningElement.isNull()) {
         warningElement.removeFromDocument();
@@ -826,13 +826,13 @@ void QtWebKitChatView::handleHTMLButtonClicked(QString id, QString encodedArgume
     }
     else if (id.startsWith(ButtonResendMessage)) {
         QString chatID = arg1;
         window_->resendMessage(Q2PSTRING(chatID));
     }
     else {
-        SWIFT_LOG(debug) << "Unknown HTML button! ( " << Q2PSTRING(id) << " )" << std::endl;
+        SWIFT_LOG(debug) << "Unknown HTML button! ( " << Q2PSTRING(id) << " )";
     }
 }
 
 void QtWebKitChatView::handleVerticalScrollBarPositionChanged(double position) {
     rememberScrolledToBottom();
     if (position == 0) {
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,8 +1,8 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/Trellis/QtDynamicGridLayout.h>
 
@@ -511,25 +511,25 @@ void QtDynamicGridLayout::updateTabPositions() {
         }
     }
 }
 
 void QtDynamicGridLayout::moveTab(QtTabWidget* tabWidget, int oldIndex, int newIndex) {
 #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);
 
     if (movingTab_) {
         // Install event filter that filters out events issued during the internal movement of the
         // tab but not targeted at the moving tab.
         qApp->installEventFilter(this);
 
         tabWidget->tabBar()->moveTab(oldIndex, newIndex);
 
         qApp->removeEventFilter(this);
-        SWIFT_LOG_ASSERT(movingTab_ == tabWidget->widget(newIndex), error) << std::endl;
+        SWIFT_LOG_ASSERT(movingTab_ == tabWidget->widget(newIndex), error);
     }
     movingTab_ = nullptr;
     tabWidget->widget(newIndex)->setFocus();
 #else
 #warning Qt 4.5 or later is needed. Trying anyway, some things will be disabled.
 #endif
author	Edwin Mons <edwin.mons@isode.com>	2019-11-19 13:36:05 (GMT)
committer	Edwin Mons <edwin.mons@isode.com>	2019-11-19 13:58:45 (GMT)
commit	261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch)
tree	c7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swift
parent	697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff)
download	swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2