From 87b88898def208b0133797af6c41ae57cb621920 Mon Sep 17 00:00:00 2001 From: Denis Dolzhenko Date: Thu, 10 Nov 2016 15:24:00 +0200 Subject: [PATCH] Removed MsgType and MsgTime lables from ComposeItem Change-Id: I1be641ae76116e16cb74c326d63d2b4f67b38498 Signed-off-by: Denis Dolzhenko --- .../ConvList/Controller/inc/ComposeListItem.h | 2 -- .../ConvList/Controller/src/ComposeListItem.cpp | 10 ---------- .../ConvList/View/inc/ComposeListViewItem.h | 3 --- .../ConvList/View/src/ComposeListViewItem.cpp | 13 ------------- 4 files changed, 28 deletions(-) diff --git a/src/Conversation/ConvList/Controller/inc/ComposeListItem.h b/src/Conversation/ConvList/Controller/inc/ComposeListItem.h index 7309476a..4ec7634c 100644 --- a/src/Conversation/ConvList/Controller/inc/ComposeListItem.h +++ b/src/Conversation/ConvList/Controller/inc/ComposeListItem.h @@ -44,8 +44,6 @@ namespace Msg protected: virtual Evas_Object *getBubbleContent(); - virtual std::string getTime(); - virtual std::string getMsgType(); private: // IBubbleViewItemListener: diff --git a/src/Conversation/ConvList/Controller/src/ComposeListItem.cpp b/src/Conversation/ConvList/Controller/src/ComposeListItem.cpp index 2ccfd86d..d41da7db 100644 --- a/src/Conversation/ConvList/Controller/src/ComposeListItem.cpp +++ b/src/Conversation/ConvList/Controller/src/ComposeListItem.cpp @@ -119,16 +119,6 @@ Evas_Object *ComposeListItem::getBubbleContent() return *bubble; } -std::string ComposeListItem::getTime() -{ - return TimeUtils::makeBubbleTimeString(time(nullptr)); -} - -std::string ComposeListItem::getMsgType() -{ - return msg("IDS_MSGF_BODY_MMS"); -} - void ComposeListItem::deleteEntity(BubbleEntity &entity) { auto it = std::find(m_BubbleEntityList.begin(), m_BubbleEntityList.end(), &entity); diff --git a/src/Conversation/ConvList/View/inc/ComposeListViewItem.h b/src/Conversation/ConvList/View/inc/ComposeListViewItem.h index a78ef377..7849d882 100644 --- a/src/Conversation/ConvList/View/inc/ComposeListViewItem.h +++ b/src/Conversation/ConvList/View/inc/ComposeListViewItem.h @@ -34,13 +34,10 @@ namespace Msg protected: virtual Evas_Object *getBubbleContent() = 0; - virtual std::string getTime() = 0; - virtual std::string getMsgType() = 0; void updateBubblePart(); private: - virtual std::string getText(ListItem &item, const char *part); virtual Evas_Object *getContent(ListItem &item, const char *part); virtual bool getFilter(ListItem &item, void *key); diff --git a/src/Conversation/ConvList/View/src/ComposeListViewItem.cpp b/src/Conversation/ConvList/View/src/ComposeListViewItem.cpp index a87143bf..4005f80d 100644 --- a/src/Conversation/ConvList/View/src/ComposeListViewItem.cpp +++ b/src/Conversation/ConvList/View/src/ComposeListViewItem.cpp @@ -24,10 +24,7 @@ using namespace Msg; namespace { ListItemStyleRef sentStyle = ListItemStyle::create("sentbubble"); - const char *bubbleContentPart = "bubble.content"; - const char *timeTextPart = "info.time"; - const char *msgType = "msg.type"; } ComposeListViewItem::ComposeListViewItem() @@ -41,16 +38,6 @@ ComposeListViewItem::~ComposeListViewItem() } -std::string ComposeListViewItem::getText(ListItem &item, const char *part) -{ - if(!strcmp(part, timeTextPart)) - return getTime(); - else if(!strcmp(part, msgType)) - return getMsgType(); - - return ""; -} - Evas_Object *ComposeListViewItem::getContent(ListItem &item, const char *part) { if(!strcmp(part, bubbleContentPart)) -- 2.34.1