put missing changes :(

These changes should be puhsed with a previous commit.

Change-Id: I177c90c2943a2f53c77baa0ff8e707d57331578a

diff --git a/src/lib/efl/mobile/ui_view.cpp b/src/lib/efl/mobile/ui_view.cpp
index 2339d07..bf75728 100644 (file)
--- a/src/lib/efl/mobile/ui_view.cpp
+++ b/src/lib/efl/mobile/ui_view.cpp
@@ -329,11 +329,6 @@ bool ui_view::set_toolbar(Elm_Toolbar *toolbar)
        return true;
 }
 
-void ui_view::unload_content()
-{
-       ui_base_view::set_content (NULL);
-}
-
 ui_menu *ui_view::on_menu_pre()
 {
        if (!this->menu)
@@ -362,7 +357,7 @@ void ui_view::on_menu_post()
 
 void ui_view::set_event_block(bool block)
 {
-       ui_iface_view::set_event_block(block);
+       ui_base_view::set_event_block(block);
        evas_object_freeze_events_set(this->get_base(), block);
 }
 

diff --git a/src/lib/efl/ui_base_view.cpp b/src/lib/efl/ui_base_view.cpp
index f76f279..4774364 100644 (file)
--- a/src/lib/efl/ui_base_view.cpp
+++ b/src/lib/efl/ui_base_view.cpp
@@ -70,14 +70,6 @@ Evas_Object *ui_base_view::get_base()
        return viewmgr->get_base();
 }
 
-//FIXME: seems it could be replaced with set_content(NULL);
-void ui_base_view::unload_content()
-{
-       Evas_Object *pcontent = this->get_content();
-       if (pcontent) evas_object_del(pcontent);
-       this->set_content(NULL);
-}
-
 Evas_Object *ui_base_view ::get_parent()
 {
        ui_base_viewmgr *viewmgr = UI_BASE_VIEWMGR;
@@ -109,17 +101,6 @@ void ui_base_view::set_indicator(ui_view_indicator indicator)
        viewmgr->set_indicator(indicator);
 }
 
-void ui_base_view::on_back()
-{
-       ui_base_viewmgr *viewmgr = UI_BASE_VIEWMGR;
-       if (!viewmgr)
-       {
-               LOGE("Failed to get a viewmgr");
-               return;
-       }
-       viewmgr->pop_view();
-}
-
 void ui_base_view::on_rotate(int degree)
 {
 }

diff --git a/src/lib/efl/ui_base_viewmgr.cpp b/src/lib/efl/ui_base_viewmgr.cpp
index 5f6b0c3..ae256e2 100644 (file)
--- a/src/lib/efl/ui_base_viewmgr.cpp
+++ b/src/lib/efl/ui_base_viewmgr.cpp
@@ -387,16 +387,12 @@ ui_base_view * ui_base_viewmgr::push_view(ui_base_view *view)
 
 bool ui_base_viewmgr::insert_view_before(ui_base_view *view, ui_base_view *before)
 {
-       ui_iface_viewmgr::insert_view_before(view, before);
-
-       return true;
+       return ui_iface_viewmgr::insert_view_before(view, before);
 }
 
 bool ui_base_viewmgr::insert_view_after(ui_base_view *view, ui_base_view *after)
 {
-       ui_iface_viewmgr::insert_view_after(view, after);
-
-       return true;
+       return ui_iface_viewmgr::insert_view_after(view, after);
 }
 
 ui_base_view *ui_base_viewmgr::get_view(unsigned int idx)