From 3d6c7672d09f5d298b3c7199ed135fbbcb822cb7 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Mon, 30 Apr 2018 16:39:07 -0400
Subject: [PATCH] conversationmodel: add force option to
getFilteredConversations
Change-Id: I3c9c92e2d177eac375de98091c189485ba92aa50
Reviewed-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
---
src/api/conversationmodel.h | 2 +-
src/conversationmodel.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/api/conversationmodel.h b/src/api/conversationmodel.h
index 7a85f8b6..8b2857ee 100644
--- a/src/api/conversationmodel.h
+++ b/src/api/conversationmodel.h
@@ -78,7 +78,7 @@ public:
* Get a custom filtered set of conversations
* @return conversations filtered
*/
- const ConversationQueue& getFilteredConversations(const profile::Type& filter = profile::Type::INVALID) const;
+ const ConversationQueue& getFilteredConversations(const profile::Type& filter = profile::Type::INVALID, bool forceUpdate = false) const;
/**
* Get the conversation at row in the filtered conversations
* @param row
diff --git a/src/conversationmodel.cpp b/src/conversationmodel.cpp
index 500c0dae..20e898cd 100644
--- a/src/conversationmodel.cpp
+++ b/src/conversationmodel.cpp
@@ -315,9 +315,9 @@ ConversationModel::allFilteredConversations() const
}
const ConversationModel::ConversationQueue&
-ConversationModel::getFilteredConversations(const profile::Type& filter) const
+ConversationModel::getFilteredConversations(const profile::Type& filter, bool forceUpdate) const
{
- if (pimpl_->customTypeFilter == filter && !pimpl_->dirtyConversations.second)
+ if (pimpl_->customTypeFilter == filter && !pimpl_->dirtyConversations.second && !forceUpdate)
return pimpl_->customFilteredConversations;
pimpl_->customTypeFilter = filter;
--
GitLab