From ad5907dd71680a7a46bdff0e5754664b76c9f687 Mon Sep 17 00:00:00 2001 From: Denis Dolzhenko Date: Thu, 27 Oct 2016 17:24:03 +0300 Subject: [PATCH] TizenRefApp-7513 Date line is not deleted after delete all messages from this date range. Change-Id: Ie2e8d92409d332661c40c9f6101fb5d5f10c338d Signed-off-by: Denis Dolzhenko --- src/Common/View/inc/ListView.h | 12 ++++++------ .../ConvList/Controller/src/ConvList.cpp | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Common/View/inc/ListView.h b/src/Common/View/inc/ListView.h index a246b2ef..aed2e8e3 100644 --- a/src/Common/View/inc/ListView.h +++ b/src/Common/View/inc/ListView.h @@ -312,10 +312,10 @@ namespace Msg T *ListView::getNextItem(ListItem &item) const { T *res = nullptr; - ListItem *next = nullptr; + ListItem *next = &item; do { - next = getNextItem(item); + next = getNextItem(*next); res = dynamic_cast(next); } while(next && !res); @@ -326,12 +326,12 @@ namespace Msg T *ListView::getPrevItem(ListItem &item) const { T *res = nullptr; - ListItem *next = nullptr; + ListItem *prev = &item; do { - next = getPrevItem(item); - res = dynamic_cast(next); - } while(next && !res); + prev = getPrevItem(*prev); + res = dynamic_cast(prev); + } while(prev && !res); return res; } diff --git a/src/Conversation/ConvList/Controller/src/ConvList.cpp b/src/Conversation/ConvList/Controller/src/ConvList.cpp index f96586d5..cfa51713 100644 --- a/src/Conversation/ConvList/Controller/src/ConvList.cpp +++ b/src/Conversation/ConvList/Controller/src/ConvList.cpp @@ -282,8 +282,7 @@ void ConvList::dateLineDelIfNec(ConvListItem *item) if(prev) { ListItem *nextItem = m_pList->getNextItem(*item); - needDelDateLine = nextItem ? dynamic_cast(nextItem) != nullptr : true; - + needDelDateLine = nextItem ? dynamic_cast(nextItem) == nullptr : true; if(needDelDateLine) { m_DateLineItemSet.erase(prev->getDateLine()); -- 2.34.1