From 28d64620f301a9b0f0a9280d5f9d3389d3e67dad Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 7 Aug 2017 15:28:11 +0200 Subject: [PATCH] fix(MessagesCountNotifier): avoid pure virtual call --- src/components/core/CoreManager.cpp | 5 ++++- .../AbstractMessagesCountNotifier.cpp | 4 ---- .../AbstractMessagesCountNotifier.hpp | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/core/CoreManager.cpp b/src/components/core/CoreManager.cpp index d41c2ade7..15e25a549 100644 --- a/src/components/core/CoreManager.cpp +++ b/src/components/core/CoreManager.cpp @@ -62,7 +62,10 @@ CoreManager::CoreManager (QObject *parent, const QString &configPath) : CoreHandlers *coreHandlers = mHandlers.get(); QObject::connect(coreHandlers, &CoreHandlers::coreStarted, this, [] { - new MessagesCountNotifier(mInstance); + { + MessagesCountNotifier *messagesCountNotifier = new MessagesCountNotifier(mInstance); + messagesCountNotifier->updateUnreadMessagesCount(); + } mInstance->mCallsListModel = new CallsListModel(mInstance); mInstance->mContactsListModel = new ContactsListModel(mInstance); diff --git a/src/components/core/messages-count-notifier/AbstractMessagesCountNotifier.cpp b/src/components/core/messages-count-notifier/AbstractMessagesCountNotifier.cpp index e0ddd1cd0..e10a086e7 100644 --- a/src/components/core/messages-count-notifier/AbstractMessagesCountNotifier.cpp +++ b/src/components/core/messages-count-notifier/AbstractMessagesCountNotifier.cpp @@ -38,14 +38,10 @@ AbstractMessagesCountNotifier::AbstractMessagesCountNotifier (QObject *parent) : coreManager->getHandlers().get(), &CoreHandlers::messageReceived, this, &AbstractMessagesCountNotifier::handleMessageReceived ); - - updateUnreadMessagesCount(); } // ----------------------------------------------------------------------------- -void AbstractMessagesCountNotifier::notifyUnreadMessagesCount (int) {} - void AbstractMessagesCountNotifier::updateUnreadMessagesCount () { mUnreadMessagesCount = 0; for (const auto &chatRoom : CoreManager::getInstance()->getCore()->getChatRooms()) diff --git a/src/components/core/messages-count-notifier/AbstractMessagesCountNotifier.hpp b/src/components/core/messages-count-notifier/AbstractMessagesCountNotifier.hpp index 60e7376a9..9ff15113f 100644 --- a/src/components/core/messages-count-notifier/AbstractMessagesCountNotifier.hpp +++ b/src/components/core/messages-count-notifier/AbstractMessagesCountNotifier.hpp @@ -39,11 +39,12 @@ public: AbstractMessagesCountNotifier (QObject *parent = Q_NULLPTR); virtual ~AbstractMessagesCountNotifier () = default; + void updateUnreadMessagesCount (); + protected: virtual void notifyUnreadMessagesCount (int n) = 0; private: - void updateUnreadMessagesCount (); void internalNotifyUnreadMessagesCount (); void handleChatModelCreated (const std::shared_ptr &chatModel);