6 files changed, 12 insertions, 10 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
@@ -112,20 +112,20 @@ void ChatControllerBase::handleAllMessagesRead() {
         targetedUnreadMessages_.clear();
         for (std::shared_ptr<StanzaEvent> stanzaEvent : unreadMessages_) {
             stanzaEvent->conclude();
         }
         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;
     }
     std::shared_ptr<Message> message(new Message());
     message->setTo(toJID_);
     message->setType(Swift::Message::Chat);
@@ -187,23 +187,22 @@ bool ChatControllerBase::hasOpenWindow() const {
 }
 
 ChatWindow::ChatMessage ChatControllerBase::buildChatWindowChatMessage(const std::string& message, const std::string& senderName, bool senderIsSelf) {
     ChatWindow::ChatMessage chatMessage;
     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
 }
 
 std::string ChatControllerBase::addMessage(const ChatWindow::ChatMessage& chatMessage, const std::string& senderName, bool senderIsSelf, const std::shared_ptr<SecurityLabel> label, const boost::filesystem::path& avatarPath, const boost::posix_time::ptime& time) {
     auto displayedLabel = label;
 
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
@@ -67,19 +67,19 @@ namespace Swift {
             std::string addMessage(const ChatWindow::ChatMessage& chatMessage, const std::string& senderName, bool senderIsSelf, std::shared_ptr<SecurityLabel> label, const boost::filesystem::path& avatarPath, const boost::posix_time::ptime& time);
             void replaceMessage(const ChatWindow::ChatMessage& chatMessage, const std::string& id, const boost::posix_time::ptime& time);
             virtual void setOnline(bool online);
             void setEnabled(bool enabled);
             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;
 
         protected:
             ChatControllerBase(const JID& self, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, const JID &toJID, NickResolver* nickResolver, PresenceOracle* presenceOracle, AvatarManager* avatarManager, bool useDelayForLatency, UIEventStream* eventStream, EventController* eventController, EntityCapsProvider* entityCapsProvider, HistoryController* historyController, MUCRegistry* mucRegistry, HighlightManager* highlightManager, std::shared_ptr<ChatMessageParser> chatMessageParser, AutoAcceptMUCInviteDecider* autoAcceptMUCInviteDecider, SettingsProvider* settings, Chattables& chattables);
 
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
@@ -366,19 +366,19 @@ void ChatsManager::handleMUCBookmarkAdded(const MUCBookmark& bookmark) {
 
 void ChatsManager::handleMUCBookmarkRemoved(const MUCBookmark& bookmark) {
 #ifndef NOT_YET
     chatListWindow_->removeMUCBookmark(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 = "";
         if (controller) {
             unreadCount = controller->getUnreadCount();
             if (controller->isJoined()) {
                 type = StatusShow::Online;
@@ -441,19 +441,19 @@ void ChatsManager::handleChatClosed(const JID& /*jid*/) {
     cleanupPrivateMessageRecents();
 #ifndef NOT_YET
     chatListWindow_->setRecents(recentChats_);
 #endif
 }
 
 #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) {
             /* Matching MUC item */
             match |= chatItem.isMUC == controllerIsMUC && chatItem.jid.toBare() == controller->getToJID().toBare();
             /* Matching PM */
             match |= isPM &&  chatItem.jid == controller->getToJID();
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
@@ -16,19 +16,19 @@
 
 namespace Swift {
 class Chattables {
     public:
         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
         };
         const std::vector<JID>& get() const;
         const State& getState(const JID& jid) const;
 
         void addJID(const JID& jid, State::Type type);
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
@@ -3,18 +3,21 @@
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #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() {
             beginListSize_ = 0;
             endListSize_ = 0;
             callsToBegin_ = 0;
             callsToEnd_ = 0;
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
@@ -14,15 +14,15 @@ namespace Swift {
         public:
             MockChatListWindow() {}
             virtual ~MockChatListWindow() {}
             void addMUCBookmark(const MUCBookmark& /*bookmark*/) {}
             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*/) {}
     };
 
 }