15 files changed, 28 insertions, 26 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp
index 8a26a56..3805084 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.cpp
+++ b/Swift/Controllers/Chat/ChatControllerBase.cpp
@@ -116,12 +116,12 @@ void ChatControllerBase::handleAllMessagesRead() {
         unreadMessages_.clear();
         updateMessageCount();
     }
 }
 
-int ChatControllerBase::getUnreadCount() {
-    return boost::numeric_cast<int>(targetedUnreadMessages_.size());
+size_t ChatControllerBase::getUnreadCount() {
+    return targetedUnreadMessages_.size();
 }
 
 void ChatControllerBase::handleSendMessageRequest(const std::string &body, bool isCorrectionMessage) {
     if (!stanzaChannel_->isAvailable() || body.empty()) {
         return;
@@ -191,15 +191,14 @@ ChatWindow::ChatMessage ChatControllerBase::buildChatWindowChatMessage(const std
     chatMessage = chatMessageParser_->parseMessageBody(message, senderName, senderIsSelf);
     return chatMessage;
 }
 
 void ChatControllerBase::updateMessageCount() {
-    int intCount = boost::numeric_cast<int>(unreadMessages_.size());
-    chatWindow_->setUnreadMessageCount(intCount);
     auto baseJID = getBaseJID();
     auto state = chattables_.getState(baseJID);
-    state.unreadCount = intCount;
+    state.unreadCount = unreadMessages_.size();
+    chatWindow_->setUnreadMessageCount(state.unreadCount);
     chattables_.setState(baseJID, state);
 #ifndef NOT_YET
     onUnreadCountChanged();
 #endif
 }
diff --git a/Swift/Controllers/Chat/ChatControllerBase.h b/Swift/Controllers/Chat/ChatControllerBase.h
index 527196c..92c6175 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.h
+++ b/Swift/Controllers/Chat/ChatControllerBase.h
@@ -71,11 +71,11 @@ namespace Swift {
             virtual void setToJID(const JID& jid) {toJID_ = jid;}
             /** Used for determining when something is recent.*/
             boost::signals2::signal<void (const std::string& /*activity*/)> onActivity;
             boost::signals2::signal<void ()> onUnreadCountChanged;
             boost::signals2::signal<void ()> onWindowClosed;
-            int getUnreadCount();
+            size_t getUnreadCount();
             const JID& getToJID() {return toJID_;}
             void handleCapsChanged(const JID& jid);
             void setCanStartImpromptuChats(bool supportsImpromptu);
             virtual ChatWindow* detachChatWindow();
             boost::signals2::signal<void(ChatWindow* /*window to reuse*/, const std::vector<JID>& /*invite people*/, const std::string& /*reason*/)> onConvertToMUC;
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index 532b925..6530a7e 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -370,11 +370,11 @@ void ChatsManager::handleMUCBookmarkRemoved(const MUCBookmark& bookmark) {
 #endif
 }
 
 #ifndef NOT_YET
 ChatListWindow::Chat ChatsManager::createChatListChatItem(const JID& jid, const std::string& activity, bool privateMessage) {
-    int unreadCount = 0;
+    size_t unreadCount = 0;
     if (mucRegistry_->isMUC(jid)) {
         MUCController* controller = mucControllers_[jid.toBare()];
         StatusShow::Type type = StatusShow::None;
         std::string nick = "";
         std::string password = "";
@@ -445,11 +445,11 @@ void ChatsManager::handleChatClosed(const JID& /*jid*/) {
 }
 
 #ifndef NOT_YET
 
 void ChatsManager::handleUnreadCountChanged(ChatControllerBase* controller) {
-    int unreadTotal = 0;
+    size_t unreadTotal = 0;
     bool controllerIsMUC = dynamic_cast<MUCController*>(controller);
     bool isPM = controller && !controllerIsMUC && mucRegistry_->isMUC(controller->getToJID().toBare());
     for (ChatListWindow::Chat& chatItem : recentChats_) {
         bool match = false;
         if (controller) {
diff --git a/Swift/Controllers/Chat/Chattables.h b/Swift/Controllers/Chat/Chattables.h
index c115fb3..3b5817a 100644
--- a/Swift/Controllers/Chat/Chattables.h
+++ b/Swift/Controllers/Chat/Chattables.h
@@ -20,11 +20,11 @@ class Chattables {
         struct State {
             enum class Type {Room, Person};
             JID jid;
             /// Empty for no name
             std::string name;
-            int unreadCount = 0;
+            size_t unreadCount = 0;
             Type type;
             StatusShow::Type status = StatusShow::None;
             //avatar
             //status
         };
diff --git a/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp b/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp
index e052aff..f30e3fd 100644
--- a/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp
+++ b/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp
@@ -7,10 +7,13 @@
 #include <gtest/gtest.h>
 #include <hippomocks.h>
 
 #include <Swift/Controllers/Chat/Chattables.h>
 
+// Clang wrongly things that tests for 0 are using 0 as null.
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+
 using namespace Swift;
 
 class ChattablesTest : public ::testing::Test {
     protected:
         void SetUp() {
diff --git a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
index 395b050..1d980d3 100644
--- a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
+++ b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
@@ -18,11 +18,11 @@ namespace Swift {
             void removeMUCBookmark(const MUCBookmark& /*bookmark*/) {}
             void addWhiteboardSession(const ChatListWindow::Chat& /*chat*/) {}
             void removeWhiteboardSession(const JID& /*jid*/) {}
             void setBookmarksEnabled(bool /*enabled*/) {}
             void setRecents(const std::list<ChatListWindow::Chat>& /*recents*/) {}
-            void setUnreadCount(int /*unread*/) {}
+            void setUnreadCount(size_t /*unread*/) {}
             void clearBookmarks() {}
             void setOnline(bool /*isOnline*/) {}
     };
 
 }
diff --git a/Swift/Controllers/Storages/CertificateFileStorage.cpp b/Swift/Controllers/Storages/CertificateFileStorage.cpp
index 3fe6d54..8ba7d12 100644
--- a/Swift/Controllers/Storages/CertificateFileStorage.cpp
+++ b/Swift/Controllers/Storages/CertificateFileStorage.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Storages/CertificateFileStorage.h>
diff --git a/Swift/Controllers/UIInterfaces/ChatListWindow.h b/Swift/Controllers/UIInterfaces/ChatListWindow.h
index 29097e9..6aa729b 100644
--- a/Swift/Controllers/UIInterfaces/ChatListWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatListWindow.h
@@ -24,11 +24,11 @@ namespace Swift {
     class ChatListWindow {
         public:
             class Chat {
                 public:
                     Chat() : statusType(StatusShow::None), isMUC(false), unreadCount(0), isPrivateMessage(false) {}
-                    Chat(const JID& jid, const std::string& chatName, const std::string& activity, int unreadCount, StatusShow::Type statusType, const boost::filesystem::path& avatarPath, bool isMUC, bool isPrivateMessage = false, const std::string& nick = "", const boost::optional<std::string> password = boost::optional<std::string>())
+                    Chat(const JID& jid, const std::string& chatName, const std::string& activity, size_t unreadCount, StatusShow::Type statusType, const boost::filesystem::path& avatarPath, bool isMUC, bool isPrivateMessage = false, const std::string& nick = "", const boost::optional<std::string> password = boost::optional<std::string>())
                     : jid(jid), chatName(chatName), activity(activity), statusType(statusType), isMUC(isMUC), nick(nick), password(password), unreadCount(unreadCount), avatarPath(avatarPath), isPrivateMessage(isPrivateMessage) {}
                     /** Assume that nicks and other transient features aren't important for equality */
                     bool operator==(const Chat& other) const {
                         if (impromptuJIDs.empty()) {
                             return jid.toBare() == other.jid.toBare()
@@ -51,11 +51,11 @@ namespace Swift {
                                 }
                             }
                             return key_compare(inviteesNames, other.inviteesNames);
                         }
                     }
-                    void setUnreadCount(int unread) {
+                    void setUnreadCount(size_t unread) {
                         unreadCount = unread;
                     }
                     void setStatusType(StatusShow::Type type) {
                         statusType = type;
                     }
@@ -91,11 +91,11 @@ namespace Swift {
                     std::string activity;
                     StatusShow::Type statusType;
                     bool isMUC;
                     std::string nick;
                     boost::optional<std::string> password;
-                    int unreadCount;
+                    size_t unreadCount;
                     boost::filesystem::path avatarPath;
                     std::map<std::string, JID> impromptuJIDs;
                     std::map<JID, std::string> inviteesNames;
                     bool isPrivateMessage;
             };
@@ -105,11 +105,11 @@ namespace Swift {
             virtual void addMUCBookmark(const MUCBookmark& bookmark) = 0;
             virtual void addWhiteboardSession(const ChatListWindow::Chat& chat) = 0;
             virtual void removeWhiteboardSession(const JID& jid) = 0;
             virtual void removeMUCBookmark(const MUCBookmark& bookmark) = 0;
             virtual void setRecents(const std::list<Chat>& recents) = 0;
-            virtual void setUnreadCount(int unread) = 0;
+            virtual void setUnreadCount(size_t unread) = 0;
             virtual void clearBookmarks() = 0;
             virtual void setOnline(bool isOnline) = 0;
 
             boost::signals2::signal<void (const MUCBookmark&)> onMUCBookmarkActivated;
             boost::signals2::signal<void (const Chat&)> onRecentActivated;
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index daece0e..1c36ffc 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -200,11 +200,11 @@ namespace Swift {
             virtual void activate() = 0;
             virtual void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) = 0;
             virtual void setSecurityLabelsEnabled(bool enabled) = 0;
             virtual void setCorrectionEnabled(Tristate enabled) = 0;
             virtual void setFileTransferEnabled(Tristate enabled) = 0;
-            virtual void setUnreadMessageCount(int count) = 0;
+            virtual void setUnreadMessageCount(size_t count) = 0;
             virtual void convertToMUC(MUCType mucType) = 0;
 //            virtual TreeWidget *getTreeWidget() = 0;
             virtual void setSecurityLabelsError() = 0;
             virtual SecurityLabelsCatalog::Item getSelectedSecurityLabel() = 0;
             virtual void setOnline(bool online) = 0;
diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h
index 389d787..38b3b1f 100644
--- a/Swift/Controllers/UnitTest/MockChatWindow.h
+++ b/Swift/Controllers/UnitTest/MockChatWindow.h
@@ -71,11 +71,11 @@ namespace Swift {
             virtual void show() {}
             virtual bool isVisible() const { return true; }
             virtual void activate() {}
             virtual void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) {labels_ = labels;}
             virtual void setSecurityLabelsEnabled(bool enabled) {labelsEnabled_ = enabled;}
-            virtual void setUnreadMessageCount(int /*count*/) {}
+            virtual void setUnreadMessageCount(size_t /*count*/) {}
 
             virtual void convertToMUC(MUCType mucType) {
                 mucType_ = mucType;
             }
 
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.cpp b/Swift/QtUI/ChatList/QtChatListWindow.cpp
index e92ba0d..2fd05c4 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.cpp
+++ b/Swift/QtUI/ChatList/QtChatListWindow.cpp
@@ -128,11 +128,11 @@ void QtChatListWindow::removeWhiteboardSession(const JID& jid) {
 
 void QtChatListWindow::setRecents(const std::list<ChatListWindow::Chat>& recents) {
     model_->setRecents(recents);
 }
 
-void QtChatListWindow::setUnreadCount(int unread) {
+void QtChatListWindow::setUnreadCount(size_t unread) {
     emit onCountUpdated(unread);
 }
 
 void QtChatListWindow::setOnline(bool isOnline) {
     isOnline_ = isOnline;
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.h b/Swift/QtUI/ChatList/QtChatListWindow.h
index 001650c..3322001 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.h
+++ b/Swift/QtUI/ChatList/QtChatListWindow.h
@@ -25,16 +25,16 @@ namespace Swift {
             void removeMUCBookmark(const MUCBookmark& bookmark);
             void addWhiteboardSession(const ChatListWindow::Chat& chat);
             void removeWhiteboardSession(const JID& jid);
             void setBookmarksEnabled(bool enabled);
             void setRecents(const std::list<ChatListWindow::Chat>& recents);
-            void setUnreadCount(int unread);
+            void setUnreadCount(size_t unread);
             void clearBookmarks();
             virtual void setOnline(bool isOnline);
 
         signals:
-            void onCountUpdated(int count);
+            void onCountUpdated(size_t count);
         private slots:
             void handleItemActivated(const QModelIndex&);
             void handleEditBookmark();
             void handleRemoveBookmark();
             void handleClicked(const QModelIndex& index);
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index a413b4d..82c65ce 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -503,11 +503,11 @@ void QtChatWindow::setOnline(bool online) {
 void QtChatWindow::showEvent(QShowEvent* event) {
     emit windowOpening();
     QWidget::showEvent(event);
 }
 
-void QtChatWindow::setUnreadMessageCount(int count) {
+void QtChatWindow::setUnreadMessageCount(size_t count) {
     if (unreadCount_ != count) {
         unreadCount_ = count;
         updateTitleWithUnreadCount();
         emit countUpdated();
     }
@@ -545,11 +545,11 @@ void QtChatWindow::updateTitleWithUnreadCount() {
 
 void QtChatWindow::flash() {
     emit requestFlash();
 }
 
-int QtChatWindow::getCount() {
+size_t QtChatWindow::getCount() {
     return unreadCount_;
 }
 
 void QtChatWindow::replaceSystemMessage(const ChatWindow::ChatMessage& message, const std::string& id, const ChatWindow::TimestampBehaviour timestampBehaviour) {
     messageLog_->replaceSystemMessage(message, id, timestampBehaviour);
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 8cc3283..b876d1e 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -104,11 +104,11 @@ namespace Swift {
             void setWhiteboardSessionStatus(std::string id, const ChatWindow::WhiteboardSessionState state);
 
             void show();
             bool isVisible() const;
             void activate();
-            void setUnreadMessageCount(int count);
+            void setUnreadMessageCount(size_t count);
             void convertToMUC(MUCType mucType);
 //            TreeWidget *getTreeWidget();
             void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels);
             void setSecurityLabelsEnabled(bool enabled);
             void setSecurityLabelsError();
@@ -117,11 +117,11 @@ namespace Swift {
             void setOnline(bool online);
             QtTabbable::AlertType getWidgetAlertState();
             void setContactChatState(ChatState::ChatStateType state);
             void setRosterModel(Roster* roster);
             void setTabComplete(TabComplete* completer);
-            int getCount();
+            size_t getCount();
             virtual void replaceSystemMessage(const ChatMessage& message, const std::string& id, const TimestampBehaviour timestampBehaviour);
             void replaceLastMessage(const ChatMessage& message, const TimestampBehaviour timestampBehaviour);
             void setAckState(const std::string& id, AckState state);
 
             // message receipts
@@ -199,11 +199,11 @@ namespace Swift {
             void setChatSecurityMarking(const std::string& markingValue, const std::string& markingForegroundColorValue, const std::string& markingBackgroundColorValue);
             void removeChatSecurityMarking();
             void handleFocusTimerTick();
 
         private:
-            int unreadCount_;
+            size_t unreadCount_;
             bool contactIsTyping_;
             LastLineTracker lastLineTracker_;
             std::string id_;
             QString contact_;
             QString lastSentMessage_;
diff --git a/Swift/QtUI/QtTabbable.h b/Swift/QtUI/QtTabbable.h
index 5837702..63c60f4 100644
--- a/Swift/QtUI/QtTabbable.h
+++ b/Swift/QtUI/QtTabbable.h
@@ -17,11 +17,11 @@ namespace Swift {
             enum AlertType {NoActivity, WaitingActivity, ImpendingActivity};
             virtual ~QtTabbable();
 
             bool isWidgetSelected();
             virtual AlertType getWidgetAlertState() {return NoActivity;}
-            virtual int getCount() {return 0;}
+            virtual size_t getCount() {return 0;}
             virtual std::string getID() const = 0;
             virtual void setEmphasiseFocus(bool /*emphasise*/) {}
 
         protected:
             QtTabbable();