3 files changed, 18 insertions, 18 deletions
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();