Refactored HistoryUI service 86/45786/2
authorJanusz Majnert <j.majnert@samsung.com>
Tue, 11 Aug 2015 08:44:06 +0000 (10:44 +0200)
committerJanusz Majnert <j.majnert@samsung.com>
Wed, 12 Aug 2015 06:23:01 +0000 (08:23 +0200)
[Issue#]   https://bugs.tizen.org/jira/browse/TT-72
[Problem]  Lots of style fixes, several fixes for build warnings
[Cause]    n/a
[Solution] Reformat code, fix casting and remove unused variables
[Verify]   1. Check that there are no build problems caused by this change
           2. Run the browser and explore the history ui to see if nothing got broken

List of changes:
* tabs -> spaces
* proper indentation
* other minor style fixes
* removing unused variables' declarations
* renaming a few class members to better express their use
* replacing reinterpret_cast with static_cast where appropriate
* adding null-checks in callback functions
* replacing deprecated Elementary API call with its successor

Change-Id: Id2c4c020573138d641a8e6a676942830a6505ab5

services/HistoryUI/HistoryUI.cpp
services/HistoryUI/HistoryUI.h

index be63ad0bbcd164bf634205ead03a7df45188d8e8..c2724dadaf90f14ccaf9aacf9953a9371052770b 100644 (file)
@@ -17,6 +17,8 @@
 #include <Elementary.h>
 #include <boost/concept_check.hpp>
 #include <vector>
+#include <string>
+#include <string.h>
 #include <AbstractMainWindow.h>
 
 #include "HistoryUI.h"
@@ -33,43 +35,41 @@ EXPORT_SERVICE(HistoryUI, "org.tizen.browser.historyui")
 
 typedef struct _HistoryItemData
 {
-       std::shared_ptr<tizen_browser::services::HistoryItem> item;
-       std::shared_ptr<tizen_browser::base_ui::HistoryUI> historyUI;
+    std::shared_ptr<tizen_browser::services::HistoryItem> item;
+    std::shared_ptr<tizen_browser::base_ui::HistoryUI> historyUI;
 } HistoryItemData;
 
 struct ItemData{
-        tizen_browser::base_ui::HistoryUI* historyUI;
-        Elm_Object_Item * e_item;
+    tizen_browser::base_ui::HistoryUI* historyUI;
+    Elm_Object_Item * e_item;
 };
 
-static std::vector<HistoryItemData*> m_history_item_data;
+static std::vector<HistoryItemData*> _history_item_data;
 
-#define efl_scale       (elm_config_scale_get() / elm_app_base_scale_get())
 HistoryUI::HistoryUI()
-    : m_gengrid(NULL)
-    , m_parent(NULL)
-    , m_item_class(NULL)
-    , m_gengridSetup(false)
-    , m_history_layout(NULL)
-    , m_historyitem_layout(NULL)
-    , m_genListActionBar(NULL)
-    , m_genListToday(NULL)
-    , m_itemClassToday(NULL)
+    : m_history_layout(nullptr)
+    , m_genListActionBar(nullptr)
+    , m_genListToday(nullptr)
+    , m_itemClassToday(nullptr)
+    , m_gengrid(nullptr)
+    , m_parent(nullptr)
+    , m_item_class(nullptr)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    edjFilePath = EDJE_DIR;
-    edjFilePath.append("HistoryUI/History.edj");
+    m_edjFilePath = EDJE_DIR;
+    m_edjFilePath.append("HistoryUI/History.edj");
 }
 
 HistoryUI::~HistoryUI()
 {
+
 }
 
 void HistoryUI::show(Evas_Object* parent)
 {
-    elm_theme_extension_add(NULL, edjFilePath.c_str());
+    elm_theme_extension_add(nullptr, m_edjFilePath.c_str());
     m_history_layout = elm_layout_add(parent);
-    elm_layout_file_set(m_history_layout, edjFilePath.c_str(), "history-layout");
+    elm_layout_file_set(m_history_layout, m_edjFilePath.c_str(), "history-layout");
     evas_object_size_hint_weight_set(m_history_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     evas_object_size_hint_align_set(m_history_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show(m_history_layout);
@@ -79,41 +79,36 @@ void HistoryUI::show(Evas_Object* parent)
     m_gengrid = elm_gengrid_add(m_history_layout);
     elm_object_part_content_set(m_history_layout, "history_gengird", m_gengrid);
 
-    /*evas_object_smart_callback_add(m_gengrid, "item,focused", focusItem, NULL);
-    evas_object_smart_callback_add(m_gengrid, "item,unfocused", unFocusItem, NULL);
-    evas_object_smart_callback_add(m_gengrid, "activated", _itemSelected, this);*/
-
-      if (!m_item_class) {
-            m_item_class = elm_gengrid_item_class_new();
-            m_item_class->item_style = "history_item";
-            m_item_class->func.text_get = _grid_text_get;
-            m_item_class->func.content_get =  _history_grid_content_get;
-            m_item_class->func.state_get = NULL;
-            m_item_class->func.del = NULL;
-        }
+    if (!m_item_class) {
+        m_item_class = elm_gengrid_item_class_new();
+        m_item_class->item_style = "history_item";
+        m_item_class->func.text_get = _grid_text_get;
+        m_item_class->func.content_get =  _history_grid_content_get;
+        m_item_class->func.state_get = nullptr;
+        m_item_class->func.del = nullptr;
+    }
 
-    M_ASSERT(m_parent);
-        elm_gengrid_align_set(m_gengrid, 0, 0);
-        elm_gengrid_select_mode_set(m_gengrid, ELM_OBJECT_SELECT_MODE_ALWAYS);
-        elm_gengrid_multi_select_set(m_gengrid, EINA_FALSE);
-        elm_gengrid_horizontal_set(m_gengrid, EINA_TRUE);
-        elm_gengrid_highlight_mode_set(m_gengrid, EINA_TRUE);
-        elm_scroller_policy_set(m_gengrid, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON);
-        elm_scroller_page_size_set(m_gengrid, 0, 580);
+    elm_gengrid_align_set(m_gengrid, 0, 0);
+    elm_gengrid_select_mode_set(m_gengrid, ELM_OBJECT_SELECT_MODE_ALWAYS);
+    elm_gengrid_multi_select_set(m_gengrid, EINA_FALSE);
+    elm_gengrid_horizontal_set(m_gengrid, EINA_TRUE);
+    elm_gengrid_highlight_mode_set(m_gengrid, EINA_TRUE);
+    elm_scroller_policy_set(m_gengrid, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON);
+    elm_scroller_page_size_set(m_gengrid, 0, 580);
 
-        evas_object_size_hint_weight_set(m_gengrid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_align_set(m_gengrid, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_weight_set(m_gengrid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set(m_gengrid, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
+    double efl_scale = elm_config_scale_get() / elm_app_base_scale_get();
     elm_gengrid_item_size_set(m_gengrid, 580 * efl_scale, 580 * efl_scale);
 
     addItems();
-
 }
 
 void HistoryUI::showActionBar()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    elm_theme_extension_add(NULL, edjFilePath.c_str());
+    elm_theme_extension_add(nullptr, m_edjFilePath.c_str());
     m_genListActionBar = elm_genlist_add(m_history_layout);
     elm_object_part_content_set(m_history_layout, "action_bar_history_genlist", m_genListActionBar);
     elm_genlist_homogeneous_set(m_genListActionBar, EINA_FALSE);
@@ -125,98 +120,106 @@ void HistoryUI::showActionBar()
 
     m_itemClassActionBar = elm_genlist_item_class_new();
     m_itemClassActionBar->item_style = "action_bar_history_items";
-    m_itemClassActionBar->func.text_get = NULL; // &listTopItemTextGet;
-    m_itemClassActionBar->func.content_get = &listActionBarContentGet;
-    m_itemClassActionBar->func.state_get = 0;
-    m_itemClassActionBar->func.del = 0;
+    m_itemClassActionBar->func.text_get = nullptr; // &listTopItemTextGet;
+    m_itemClassActionBar->func.content_get = &_listActionBarContentGet;
+    m_itemClassActionBar->func.state_get = nullptr;
+    m_itemClassActionBar->func.del = nullptr;
 
-    ItemData * id = new ItemData;
+    ItemData *id = new ItemData;
     id->historyUI = this;
-    Elm_Object_Item* elmItem = elm_genlist_item_append(m_genListActionBar,            //genlist
-                                                       m_itemClassActionBar,          //item Class
-                                                      id,
-                                                      NULL,                    //parent item
-                                                      ELM_GENLIST_ITEM_NONE,//item type
-                                                      NULL,
-                                                      NULL                  //data passed to above function
-                                                     );
+    Elm_Object_Item *elmItem = elm_genlist_item_append(m_genListActionBar,    //genlist
+                                                       m_itemClassActionBar,  //item Class
+                                                       id,
+                                                       nullptr,               //parent item
+                                                       ELM_GENLIST_ITEM_NONE, //item type
+                                                       nullptr,
+                                                       nullptr                //data passed to above function
+                                                      );
     id->e_item = elmItem;
-    ItemData * id2 = new ItemData;
+    ItemData *id2 = new ItemData;
     id2->historyUI = this;
-    Elm_Object_Item* elmItem2 = elm_genlist_item_append(m_genListActionBar,            //genlist
-                                                       m_itemClassActionBar,          //item Class
-                                                      id2,
-                                                      NULL,                    //parent item
-                                                      ELM_GENLIST_ITEM_NONE,//item type
-                                                      NULL,
-                                                      NULL                  //data passed to above function
-                                                     );
+    Elm_Object_Item *elmItem2 = elm_genlist_item_append(m_genListActionBar,    //genlist
+                                                        m_itemClassActionBar,  //item Class
+                                                        id2,
+                                                        nullptr,               //parent item
+                                                        ELM_GENLIST_ITEM_NONE, //item type
+                                                        nullptr,
+                                                        nullptr                //data passed to above function
+                                                       );
     id2->e_item = elmItem2;
 }
 
-Evas_Object* HistoryUI::listActionBarContentGet(void* data, Evas_Object* obj , const char* part)
+Evas_Object* HistoryUI::_listActionBarContentGet(void* data, Evas_Object* obj , const char* part)
 {
-        BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-        if(!strcmp(part, "clearhistory_click"))
-        {
-                Evas_Object *clearHistoryButton = elm_button_add(obj);
-                elm_object_style_set(clearHistoryButton, "history_button");
-                evas_object_smart_callback_add(clearHistoryButton, "clicked", tizen_browser::base_ui::HistoryUI::_clearhistory_clicked, data);
-                return clearHistoryButton;
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    if (obj && part) {
+        const char *part_name1 = "clearhistory_click";
+        static const int part_name1_len = strlen(part_name1);
+        const char *part_name2 = "close_click";
+        static const int part_name2_len = strlen(part_name2);
+
+        if (!strncmp(part_name1, part, part_name1_len)) {
+            Evas_Object *clearHistoryButton = elm_button_add(obj);
+            elm_object_style_set(clearHistoryButton, "history_button");
+            evas_object_smart_callback_add(clearHistoryButton, "clicked", tizen_browser::base_ui::HistoryUI::_clearhistory_clicked, data);
+            return clearHistoryButton;
+        }
+        if (!strncmp(part_name2, part, part_name2_len)) {
+            Evas_Object *close_click = elm_button_add(obj);
+            elm_object_style_set(close_click, "history_button");
+            evas_object_smart_callback_add(close_click, "clicked", HistoryUI::_close_clicked_cb, data);
+            return close_click;
         }
-       else if(!strcmp(part, "close_click"))
-       {
-               Evas_Object *close_click = elm_button_add(obj);
-               elm_object_style_set(close_click, "history_button");
-               evas_object_smart_callback_add(close_click, "clicked", HistoryUI::close_clicked_cb, data);
-               return close_click;
-       }
-          
-        return NULL;
+    }
+    return nullptr;
 }
 
-void HistoryUI::close_clicked_cb(void * data, Evas_Object * /* obj */, void * event_info)
+void HistoryUI::_close_clicked_cb(void * data, Evas_Object*, void*)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    ItemData * id = static_cast<ItemData *>(data);
-    id->historyUI->closeHistoryUIClicked(std::string());
-    id->historyUI->clearItems();
-}      
+    if (data) {
+        ItemData *id = static_cast<ItemData*>(data);
+        id->historyUI->closeHistoryUIClicked(std::string());
+        id->historyUI->clearItems();
+    }
+}
 
-char* HistoryUI::listTodayTextGet(void* data, Evas_Object* obj , const char* part)
+char* HistoryUI::_listTodayTextGet(void* data, Evas_Object*, const char* part)
 {
-     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    HistoryItemData * id = static_cast<HistoryItemData *>(data);
-    if(!strcmp(part, "history_url_text"))
-    {
-        if(!id->item->getUrl().empty()){
-           std::string str = id->item->getTitle() + " - " + id->item->getUrl();
-            return strdup(str.c_str());
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    if (data) {
+        HistoryItemData *id = static_cast<HistoryItemData*>(data);
+        const char *part_name = "history_url_text";
+        static const int part_name_len = strlen(part_name);
+
+        if (!strncmp(part_name, part, part_name_len)) {
+            if (!id->item->getUrl().empty()) {
+                std::string str = id->item->getTitle() + " - " + id->item->getUrl();
+                return strdup(str.c_str());
+            }
         }
     }
-    return NULL;
+    return nullptr;
 }
 
-void HistoryUI::_clearhistory_clicked(void * data, Evas_Object * /* obj */, void * event_info)
+void HistoryUI::_clearhistory_clicked(void*, Evas_Object*, void*)
 {
-        /*
-        BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-        ItemData* itemData = reinterpret_cast<ItemData *>(data);
-        itemData->tabUI->clearItems();
-        itemData->tabUI->newTabClicked(std::string());
-        */
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+//    ItemData *itemData = static_cast<ItemData*>(data);
+//    itemData->tabUI->clearItems();
+//    itemData->tabUI->newTabClicked(std::string());
 }
 
 void HistoryUI::addItems()
 {
-         BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
-         for (size_t i = 0; i < 1; i++) {
-             HistoryItemData *itemData = new HistoryItemData();
-             itemData->historyUI = std::shared_ptr<tizen_browser::base_ui::HistoryUI>(this);
-             Elm_Object_Item* historyView = elm_gengrid_item_append(m_gengrid, m_item_class, itemData, NULL, this);
-             elm_gengrid_item_selected_set(historyView, EINA_FALSE);
-         }
-         BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
+    BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
+    for (size_t i = 0; i < 1; i++) {
+        HistoryItemData *itemData = new HistoryItemData();
+        itemData->historyUI = std::shared_ptr<tizen_browser::base_ui::HistoryUI>(this);
+        Elm_Object_Item* historyView = elm_gengrid_item_append(m_gengrid, m_item_class, itemData, nullptr, this);
+        elm_gengrid_item_selected_set(historyView, EINA_FALSE);
+    }
+    BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
 }
 
 void HistoryUI::addHistoryItem(std::shared_ptr<tizen_browser::services::HistoryItem> hi)
@@ -225,68 +228,71 @@ void HistoryUI::addHistoryItem(std::shared_ptr<tizen_browser::services::HistoryI
     HistoryItemData *itemData = new HistoryItemData();
     itemData->item = hi;
     itemData->historyUI = std::shared_ptr<tizen_browser::base_ui::HistoryUI>(this);
-    m_history_item_data.push_back(itemData);
+    _history_item_data.push_back(itemData);
     setEmptyGengrid(false);
 }
 
 void HistoryUI::addHistoryItems(std::vector<std::shared_ptr<tizen_browser::services::HistoryItem> > items)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
-    m_history_item_data.clear();
+    _history_item_data.clear();
     for (auto it = items.begin(); it != items.end(); ++it)
-       addHistoryItem(*it);
+        addHistoryItem(*it);
 }
 
-char* HistoryUI::_grid_text_get(void *data, Evas_Object *obj, const char *part)
+char* HistoryUI::_grid_text_get(void*, Evas_Object*, const char *part)
 {
     BROWSER_LOGD("%s:%d %s part=%s", __FILE__, __LINE__, __func__, part);
-    HistoryItemData *itemData = reinterpret_cast<HistoryItemData*>(data);
-    const char* item_name = NULL;
-    if (!strcmp(part, "menu_label")) {
-            item_name = "Today"; 
-           return strdup(item_name);
+    const char* part_name = "menu_label";
+    static const int part_name_len = strlen(part_name);
+
+    if (!strncmp(part_name, part, part_name_len)) {
+        return strdup("Today");
     }
-    return NULL;
+    return nullptr;
 }
 
-Evas_Object * HistoryUI::_history_grid_content_get(void *data, Evas_Object *obj, const char *part)
+Evas_Object * HistoryUI::_history_grid_content_get(void *data, Evas_Object*, const char *part)
 {
     BROWSER_LOGD("[%s:%d] part : %s", __PRETTY_FUNCTION__, __LINE__, part);
-    HistoryItemData * id = static_cast<HistoryItemData *>(data);
-    if(!strcmp(part, "history_genlist"))
-    {
-       id->historyUI->m_genListToday = elm_genlist_add(id->historyUI->m_history_layout);
-
-       elm_genlist_homogeneous_set(id->historyUI->m_genListToday, EINA_FALSE);
-       elm_genlist_multi_select_set(id->historyUI->m_genListToday, EINA_FALSE);
-       elm_genlist_select_mode_set(id->historyUI->m_genListToday, ELM_OBJECT_SELECT_MODE_ALWAYS);
-        elm_genlist_mode_set(id->historyUI->m_genListToday, ELM_LIST_LIMIT);
-        elm_genlist_decorate_mode_set(id->historyUI->m_genListToday, EINA_TRUE);
-        evas_object_size_hint_weight_set(id->historyUI->m_genListToday, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-       id->historyUI->m_itemClassToday = elm_genlist_item_class_new();
-       id->historyUI->m_itemClassToday->item_style = "history_url_items";
-       id->historyUI->m_itemClassToday->func.text_get =  &listTodayTextGet;
-       id->historyUI->m_itemClassToday->func.content_get = NULL;
-       id->historyUI->m_itemClassToday->func.state_get = 0;
-       id->historyUI->m_itemClassToday->func.del = 0;
-
-       for(auto it = m_history_item_data.begin(); it != m_history_item_data.end(); it++) {
-               Elm_Object_Item* historyView = elm_genlist_item_append(id->historyUI->m_genListToday, id->historyUI->m_itemClassToday, *it, NULL, ELM_GENLIST_ITEM_NONE, NULL, id->historyUI.get());
-               id->historyUI->m_map_history_views.insert(std::pair<std::string,Elm_Object_Item*>((*it)->item->getUrl(), historyView));
-       }
-
-       return id->historyUI->m_genListToday;
+    if (data && part) {
+        HistoryItemData *id = static_cast<HistoryItemData*>(data);
+        const char *part_name = "history_genlist";
+        static const int part_name_len = strlen(part_name);
+
+        if(!strncmp(part_name, part, part_name_len)) {
+            id->historyUI->m_genListToday = elm_genlist_add(id->historyUI->m_history_layout);
+
+            elm_genlist_homogeneous_set(id->historyUI->m_genListToday, EINA_FALSE);
+            elm_genlist_multi_select_set(id->historyUI->m_genListToday, EINA_FALSE);
+            elm_genlist_select_mode_set(id->historyUI->m_genListToday, ELM_OBJECT_SELECT_MODE_ALWAYS);
+            elm_genlist_mode_set(id->historyUI->m_genListToday, ELM_LIST_LIMIT);
+            elm_genlist_decorate_mode_set(id->historyUI->m_genListToday, EINA_TRUE);
+            evas_object_size_hint_weight_set(id->historyUI->m_genListToday, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+            id->historyUI->m_itemClassToday = elm_genlist_item_class_new();
+            id->historyUI->m_itemClassToday->item_style = "history_url_items";
+            id->historyUI->m_itemClassToday->func.text_get =  &_listTodayTextGet;
+            id->historyUI->m_itemClassToday->func.content_get = nullptr;
+            id->historyUI->m_itemClassToday->func.state_get = nullptr;
+            id->historyUI->m_itemClassToday->func.del = nullptr;
+
+            for(auto it = _history_item_data.begin(); it != _history_item_data.end(); it++) {
+                Elm_Object_Item* historyView = elm_genlist_item_append(id->historyUI->m_genListToday, id->historyUI->m_itemClassToday, *it, nullptr, ELM_GENLIST_ITEM_NONE, nullptr, id->historyUI.get());
+                id->historyUI->m_map_history_views.insert(std::pair<std::string,Elm_Object_Item*>((*it)->item->getUrl(), historyView));
+            }
+
+            return id->historyUI->m_genListToday;
+        }
     }
-    return NULL;
+    return nullptr;
 }
 
 void HistoryUI::removeHistoryItem(const std::string& uri)
 {
     BROWSER_LOGD("[%s] uri=%s", __func__, uri.c_str());
-    if(m_map_history_views.find(uri) == m_map_history_views.end()) {
+    if(m_map_history_views.find(uri) == m_map_history_views.end())
         return;
-    }
 
     Elm_Object_Item* historyView = m_map_history_views.at(uri);
     elm_object_item_del(historyView);
@@ -295,34 +301,9 @@ void HistoryUI::removeHistoryItem(const std::string& uri)
     setEmptyGengrid(0 == m_map_history_views.size());
 }
 
-void  HistoryUI::_item_deleted(void * /* data */, Evas_Object * /* obj */)
-{
-
-}
-
-void HistoryUI::_itemSelected(void * data, Evas_Object * /* obj */, void * event_info)
-{
-        Elm_Object_Item * selected = reinterpret_cast<Elm_Object_Item *>(event_info);
-        HistoryItemData * itemData = reinterpret_cast<HistoryItemData *>(elm_object_item_data_get(selected));
-        HistoryUI * self = reinterpret_cast<HistoryUI *>(data);
-
-        self->historyItemClicked(itemData->item);
-}
-
-void HistoryUI::_deleteHistory(void *data, Evas_Object * /* obj */, void * /* event_info */)
-{
-        HistoryItemData * itemData = reinterpret_cast<HistoryItemData *>(data);
-        //itemData->historysUI->historyDeleteClicked(itemData->item);
-}
-
-void HistoryUI::_thumbSelected(void * data, Evas_Object * /* obj */, void * /* event_info */)
-{
-        HistoryItemData * itemData = reinterpret_cast<HistoryItemData *>(data);
-       // itemData->historysUI->historyClicked(itemData->item);
-}
-
-Evas_Object* HistoryUI::createNoHistorysLabel()
+Evas_Object* HistoryUI::createNoHistoryLabel()
 {
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     Evas_Object *label = elm_label_add(m_parent);
     elm_object_text_set(label, "No favorite websites.");
     evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -332,11 +313,9 @@ Evas_Object* HistoryUI::createNoHistorysLabel()
 
 void HistoryUI::setEmptyGengrid(bool setEmpty)
 {
-    if(setEmpty) {
-        elm_object_part_content_set(m_gengrid, "elm.swallow.empty", createNoHistorysLabel());
-    } else {
-        elm_object_part_content_set(m_gengrid, "elm.swallow.empty", NULL);
-    }
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    Evas_Object *obj = (setEmpty ? createNoHistoryLabel() : nullptr);
+    elm_object_part_content_set(m_gengrid, "elm.swallow.empty", obj);
 }
 
 void HistoryUI::hide()
@@ -350,35 +329,15 @@ void HistoryUI::hide()
 
 void HistoryUI::clearItems()
 {
-    hide();
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    hide();
     elm_genlist_clear(m_genListToday);
     elm_gengrid_clear(m_gengrid);
     elm_genlist_clear(m_genListActionBar);
     m_map_history_views.clear();
-    m_history_item_data.clear();
+    _history_item_data.clear();
     setEmptyGengrid(true);
 }
 
-void HistoryUI::focusItem(void* /*data*/, Evas_Object* /*obj*/, void* event_info)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    Elm_Object_Item *item = reinterpret_cast<Elm_Object_Item*>(event_info);
-    elm_object_item_signal_emit( item, "mouse,in", "over2");
-
-    // selected manually
-    elm_gengrid_item_selected_set(item, EINA_TRUE);
-}
-
-void HistoryUI::unFocusItem(void* /*data*/, Evas_Object* /*obj*/, void* event_info)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    Elm_Object_Item *item = reinterpret_cast<Elm_Object_Item*>(event_info);
-    elm_object_item_signal_emit( item, "mouse,out", "over2");
-
-    // unselected manually
-    elm_gengrid_item_selected_set(item, EINA_FALSE);
-}
-
 }
 }
index 89c26a372365b9bb27641a33e7248baa9bf1595e..20bcc535f7065b5c52d65a416d1bb2021348a711 100644 (file)
@@ -30,8 +30,8 @@ namespace tizen_browser{
 namespace base_ui{
 
 class BROWSER_EXPORT HistoryUI
-        : public tizen_browser::interfaces::AbstractUIComponent
-        , public tizen_browser::core::AbstractService
+    : public tizen_browser::interfaces::AbstractUIComponent
+    , public tizen_browser::core::AbstractService
 {
 public:
     HistoryUI();
@@ -53,21 +53,14 @@ private:
     static char* _grid_text_get(void *data, Evas_Object *obj, const char *part);
     static Evas_Object * _history_grid_content_get(void *data, Evas_Object *obj, const char *part); 
     static Evas_Object * _grid_content_get(void *data, Evas_Object *obj, const char *part);
-    static Evas_Object* listActionBarContentGet(void *data, Evas_Object *obj, const char *part);
-    static Evas_Object* listTodayContentGet(void *data, Evas_Object *obj, const char *part);
-    static void _itemSelected(void * data, Evas_Object * obj, void * event_info);
-    static void _item_deleted(void *data, Evas_Object *obj);
-    static void _thumbSelected(void * data, Evas_Object * obj, void * event_info);
-    static void _deleteHistory(void *data, Evas_Object *obj, void *event_info);
+    static Evas_Object* _listActionBarContentGet(void *data, Evas_Object *obj, const char *part);
     static void _clearhistory_clicked(void *data, Evas_Object *obj, void *event_info);
+    static char* _listTodayTextGet(void* data, Evas_Object* obj , const char* part);
+    static void _close_clicked_cb(void *data, Evas_Object *obj, void *event_info);
+
     void setEmptyGengrid(bool setEmpty);
-    static char* listTodayTextGet(void* data, Evas_Object* obj , const char* part);
-    static void close_clicked_cb(void *data, Evas_Object *obj, void *event_info);
 
-private:
-    
     Evas_Object *m_history_layout;
-    Evas_Object *m_historyitem_layout;
     Evas_Object *m_genListActionBar;
     Evas_Object *m_genListToday;
     Elm_Genlist_Item_Class *m_itemClassActionBar;
@@ -76,15 +69,10 @@ private:
     Evas_Object *m_parent;
     Elm_Gengrid_Item_Class * m_item_class;
     std::map<std::string,Elm_Object_Item*> m_map_history_views;
-    bool m_gengridSetup;
-    std::string edjFilePath;
-    Evas_Object *createNoHistorysLabel();
-
-    static void focusItem(void* data, Evas_Object* obj, void* event_info);
-    static void unFocusItem(void* data, Evas_Object* obj, void* event_info);
+    std::string m_edjFilePath;
+    Evas_Object *createNoHistoryLabel();
 };
 
-
 }
 }