[EGIT] [core/efl] master 02/08: elm_focus_legacy: remove useless function

[Marcel Hollerbach]

bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ad3d741fa0b07e0e580506f48b11cd1dccf3319b

commit ad3d741fa0b07e0e580506f48b11cd1dccf3319b
Author: Marcel Hollerbach <mar...@osg.samsung.com>
Date:   Tue May 1 11:34:47 2018 +0200

    elm_focus_legacy: remove useless function
    
    it was only used in one place and had a wrong name.
---
 src/lib/elementary/elm_focus_legacy.c | 26 +++++++-------------------
 src/lib/elementary/elm_priv.h         |  2 +-
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/lib/elementary/elm_focus_legacy.c 
b/src/lib/elementary/elm_focus_legacy.c
index f0e42c604e..634d3312ce 100644
--- a/src/lib/elementary/elm_focus_legacy.c
+++ b/src/lib/elementary/elm_focus_legacy.c
@@ -98,23 +98,6 @@ _custom_chain_set(Efl_Ui_Widget *node, Eina_List *lst)
    _flush_manager(node, pd);
 }
 
-Evas_Object*
-legacy_elm_widget_next_targer(Efl_Ui_Widget *obj, Elm_Focus_Direction dir)
-{
-   API_ENTRY_VAL(NULL)
-   Efl_Ui_Widget *target = NULL;
-
-   #define MAP(direction, field)  if (dir == EFL_UI_FOCUS_DIRECTION_ 
##direction && pd->legacy_focus.field) target = pd->legacy_focus.field;
-
-   if (!target)
-     {
-        MAPPING()
-     }
-   #undef MAP
-
-   return target;
-}
-
 EAPI void
 elm_object_focus_next_object_set(Evas_Object        *obj,
                                  Evas_Object        *next EINA_UNUSED,
@@ -207,14 +190,19 @@ elm_object_focus_next(Evas_Object        *obj,
 
    if (elm_widget_is(logical))
      {
-        Efl_Ui_Focus_Object *legacy_target = 
legacy_elm_widget_next_targer(logical, dir);
+        Efl_Ui_Focus_Object *legacy_target = NULL;
+
+        #define MAP(direction, field)  if (dir == EFL_UI_FOCUS_DIRECTION_ 
##direction && pd->legacy_focus.field) legacy_target = pd->legacy_focus.field;
+        MAPPING()
+        #undef MAP
+
         if (legacy_target)
           {
-             o = legacy_target;
              efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, legacy_target);
              if (elm_object_focused_object_get(top) == legacy_target)
                {
                   legacy_focus_move = EINA_TRUE;
+                  o = legacy_target;
                }
           }
      }
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 8505f2ed85..48e16161a7 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -706,7 +706,7 @@ void                 _elm_win_wl_cursor_set(Evas_Object 
*obj, const char *cursor
 
 void _efl_ui_focus_manager_redirect_events_del(Efl_Ui_Focus_Manager *manager, 
Eo *obj);
 void _efl_ui_focus_manager_redirect_events_add(Efl_Ui_Focus_Manager *manager, 
Eo *obj);
-Evas_Object* legacy_elm_widget_next_targer(Efl_Ui_Widget *obj, 
Elm_Focus_Direction dir);
+
 void _efl_access_shutdown(void);
 
 /* Combobox: no proper support for Efl.Part API yet. */

--