wdg_get() refactoring

11 files changed, 44 insertions, 46 deletions

diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 5e8f8bc..e4d6da5 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -879,7 +879,7 @@ _content_set(Gui_Session *session, const Gui_Widget *container, const Gui_Widget
                    * container is "Box";
                    * w is "Button" */
                   Dep_Id dep_id = DEP_ID_GET(value);
-                  Gui_Widget *w = wdg_get(wdg_context_get(container), NULL, dep_id);
+                  Gui_Widget *w = wdg_get(wdg_context_get(container), dep_id);
                   wdg_data_set(w, CONTAINER, (void *) container);
                }
           }
@@ -1373,10 +1373,15 @@ _prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, void *event_info)
         else if (type == GUI_TYPE_OBJECT)
           {
              Dep_Id old_dep_id = (uintptr_t) DEP_ID_GET(val);
+             Dep_Id new_dep_id = gui_context_dep_data_get_id_by_name(_active_context_get(), new_enum_value);
+             if (!new_dep_id)
+               {
+                  ERR("Resource not exist for: \"%s\"", new_enum_value);
+               }
              /* FIXME: need to check if widget wasn't deleted yet*/
              const char *cur_param = gui_context_dep_data_get(_active_context_get(), old_dep_id);
-             Gui_Widget *cur_param_wdg = wdg_get(_active_context_get(), cur_param, 0);
-             Gui_Widget *new_param_wdg = wdg_get(_active_context_get(), new_enum_value, 0);
+             Gui_Widget *cur_param_wdg = wdg_get(_active_context_get(), old_dep_id);
+             Gui_Widget *new_param_wdg = wdg_get(_active_context_get(), new_dep_id);
              /* GUI_TYPE_OBJECT ops depend on other widgets, check that widget exists.
               * or new one not equal old one.*/
              if ((!new_param_wdg) || (cur_param_wdg == new_param_wdg))
@@ -1385,11 +1390,6 @@ _prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, void *event_info)
                }
              /* If I simply change value in prop: t.e. "but1"->"but2" change parent of "but1".*/
              /* and change dependencies. */
-             Dep_Id new_dep_id = gui_context_dep_data_get_id_by_name(_active_context_get(), new_enum_value);
-             if (!new_dep_id)
-               {
-                  ERR("Resource not exist for: \"%s\"", new_enum_value);
-               }
              gui_value_name_id_set(val, type, new_dep_id);
 
              /* Update parent, if op supports it. */
@@ -1497,7 +1497,7 @@ _prop_del_from_propview(void *data, Eo *obj EINA_UNUSED, void *ev EINA_UNUSED)
              if (gui_value_type_get(val) == GUI_TYPE_OBJECT)
                {
                   Dep_Id dep_id = DEP_ID_GET(val);
-                  Gui_Widget *param_wdg = wdg_get(_active_context_get(), NULL, dep_id);
+                  Gui_Widget *param_wdg = wdg_get(_active_context_get(), dep_id);
                   if (param_wdg)
                     {
                        const Gui_Widget *parent_win = wdg_parent_win_wdg_get(param_wdg);
@@ -1598,7 +1598,8 @@ _content_del_from_propview(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descr
 
    /* Need to remove parent container from widget. */
    const char* wdg_name = wdg_container_name_get_by_id(wdg, idx);
-   Gui_Widget *param_wdg = wdg_get(_active_context_get(), wdg_name, 0);
+   Dep_Id name_id = gui_context_dep_data_get_id_by_name(_active_context_get(), wdg_name);
+   Gui_Widget *param_wdg = wdg_get(_active_context_get(), name_id);
    wdg_data_set(param_wdg, CONTAINER, NULL);
    /* Need to change parent for content being unset from container.
     * Set parent window as parent for widget. */
@@ -1804,6 +1805,11 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_De
         eo_do(obj, old_value = elm_obj_widget_part_text_get(NULL));
         if (!strcmp(new_value, old_value))
           return EO_CALLBACK_CONTINUE;
+
+        Dep_Id old_name_id, new_name_id;
+        old_name_id = gui_context_dep_data_get_id_by_name(_active_context_get(), old_value);
+        new_name_id = gui_context_dep_data_get_id_by_name(_active_context_get(), new_value);
+
         eo_do(obj, elm_obj_widget_part_text_set(NULL, new_value));
 
         if (type == GUI_TYPE_ENUM)
@@ -1813,8 +1819,8 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_De
           }
         if (type == GUI_TYPE_OBJECT)
           {
-             Gui_Widget *old_param_wdg = wdg_get(_active_context_get(), old_value, 0);
-             Gui_Widget *new_param_wdg = wdg_get(_active_context_get(), new_value, 0);
+             Gui_Widget *old_param_wdg = wdg_get(_active_context_get(), old_name_id);
+             Gui_Widget *new_param_wdg = wdg_get(_active_context_get(), new_name_id);
 
              /* Check if new_widget was packed previously.
               * If so, we need to unpack widget and delete from contents*/
diff --git a/src/bin/egui_gui/egui_logic.c b/src/bin/egui_gui/egui_logic.c
index 77761e6..dac6c1b 100644
--- a/src/bin/egui_gui/egui_logic.c
+++ b/src/bin/egui_gui/egui_logic.c
@@ -499,7 +499,7 @@ _graphviz_sequence_build(Agraph_t *ag, Gui_Sequence *seq)
            case CREATION_ACTION:
                 {
                    Dep_Id wdg_id = action_widget_id_get(action);
-                   Gui_Widget *w = wdg_get(sequence_ctx_get(seq), NULL, wdg_id);
+                   Gui_Widget *w = wdg_get(sequence_ctx_get(seq), wdg_id);
                    Agnode_t *wdg_node = _graphviz_widget_build(ag, w);
                    agedge(ag, seq_node, wdg_node, 0, 1);
                    break;
diff --git a/src/bin/egui_gui/seqview.c b/src/bin/egui_gui/seqview.c
index 2b9de61..5a846b1 100644
--- a/src/bin/egui_gui/seqview.c
+++ b/src/bin/egui_gui/seqview.c
@@ -148,7 +148,7 @@ _action_prop_selected(void *data, Eo *obj EINA_UNUSED, void *event_info)
           {
              Dep_Id wdg_id = action_widget_id_get(action);
 
-             Gui_Widget *wdg = wdg_id ? wdg_get(action_ctx_get(action), NULL, wdg_id) : NULL;
+             Gui_Widget *wdg = wdg_id ? wdg_get(action_ctx_get(action), wdg_id) : NULL;
              Op_Desc *op = db_mro_op_desc_get(wdg_class_name_get(wdg), prop_name);
              Gui_Widget_Property *prop = prop_create_for_op(op);
              action_property_set(action, prop);
@@ -234,8 +234,8 @@ _action_prop_update(void *data, Eo *obj, void *event_info)
           {
              Dep_Id dep_id = DEP_ID_GET(val);
              Dep_Id new_name_id = gui_context_dep_data_get_id_by_name(_active_ctx, new_enum_value);
-             Gui_Widget *cur_param_wdg = wdg_get(_active_ctx, NULL, dep_id);
-             Gui_Widget *new_param_wdg = wdg_get(_active_ctx, NULL, new_name_id);
+             Gui_Widget *cur_param_wdg = wdg_get(_active_ctx, dep_id);
+             Gui_Widget *new_param_wdg = wdg_get(_active_ctx, new_name_id);
              /* GUI_TYPE_OBJECT ops depend on other widgets, check that widget exists.
               * or new one not equal old one.*/
              if ((!new_param_wdg) || (cur_param_wdg == new_param_wdg))
@@ -321,7 +321,7 @@ _action_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part E
         if (act_type == MODIF_ACTION)
           {
              Dep_Id wdg_id = action_widget_id_get(action);
-             Gui_Widget *wdg = wdg_id ? wdg_get(action_ctx_get(action), NULL, wdg_id) : NULL;
+             Gui_Widget *wdg = wdg_id ? wdg_get(action_ctx_get(action), wdg_id) : NULL;
              Gui_Widget_Property *prop = action_property_get(action);
              Eo *props_hover = props_hoversel_object_ops_add(box, elm_widget_top_get(lst), "   ---   ", wdg);
              evas_object_smart_callback_add(props_hover, "selected", _action_prop_selected, action);
diff --git a/src/lib/ffi_abstraction.c b/src/lib/ffi_abstraction.c
index e8a3a7f..6b2870c 100644
--- a/src/lib/ffi_abstraction.c
+++ b/src/lib/ffi_abstraction.c
@@ -100,8 +100,7 @@ _ffi_eo_do(const Gui_Session *session, const Gui_Widget *wdg, const Gui_Widget_P
                {
                   Dep_Id dep_id = DEP_ID_GET(gui_value);
 
-                  Eo *tobj = session_eo_get(session,
-                        wdg_get(wdg_context_get(wdg), NULL, dep_id));
+                  Eo *tobj = session_eo_get(session, wdg_get(wdg_context_get(wdg), dep_id));
                   objects[i] = tobj;
                   p = &objects[i];
                }
@@ -306,8 +305,7 @@ _ffi_eo_do_content(const Gui_Session *session, const Gui_Widget *wdg, const Gui_
              if (gui_value_type_get(gui_value) == GUI_TYPE_OBJECT)
                {
                   Dep_Id dep_id = DEP_ID_GET(gui_value);
-                  Eo *tobj = session_eo_get(session,
-                        wdg_get(wdg_context_get(wdg), NULL, dep_id));
+                  Eo *tobj = session_eo_get(session, wdg_get(wdg_context_get(wdg), dep_id));
                   objects[i] = tobj;
                   p = &objects[i];
                }
@@ -428,10 +426,8 @@ _ffi_eo_item_add(const Gui_Session *session, const Gui_Widget *wdg, const Gui_Wi
 
                   Dep_Id dep_id = DEP_ID_GET(gui_value);
                   const Gui_Context *ctx = wdg_context_get(wdg);
-                  const char *wdg_name = gui_context_dep_data_get(ctx, dep_id);
 
-                  Eo *tobj = session_eo_get(session,
-                        wdg_get(ctx, wdg_name, 0));
+                  Eo *tobj = session_eo_get(session, wdg_get(ctx, dep_id));
                   objects[i] = tobj;
                   p = &objects[i];
                }
diff --git a/src/lib/ffi_glue.c b/src/lib/ffi_glue.c
index 084a841..21f8c6d 100644
--- a/src/lib/ffi_glue.c
+++ b/src/lib/ffi_glue.c
@@ -50,7 +50,7 @@ _wdg_prop_eo_do_test(Gui_Session *session, const Gui_Widget *wdg, const Gui_Widg
         if (gui_value_type_get(val) == GUI_TYPE_OBJECT)
           {
              Dep_Id dep_id = DEP_ID_GET(val);
-             Gui_Widget *wdg_tmp = wdg_get(wdg_context_get(wdg), NULL, dep_id);
+             Gui_Widget *wdg_tmp = wdg_get(wdg_context_get(wdg), dep_id);
 
              if (!session_wdg_exists(session, wdg_tmp))
                {
@@ -116,7 +116,7 @@ manager_widget_content_add(Gui_Session *session, const Gui_Widget *wdg, Action_M
                {
                   Dep_Id dep_id = DEP_ID_GET(val);
                   /* FIXME: check if object exists, if not delete this property from container. */
-                  w = wdg_get(wdg_context_get(wdg), NULL, dep_id);
+                  w = wdg_get(wdg_context_get(wdg), dep_id);
                }
           }
 
diff --git a/src/lib/generator.c b/src/lib/generator.c
index 474f430..f31ab24 100644
--- a/src/lib/generator.c
+++ b/src/lib/generator.c
@@ -462,7 +462,7 @@ _sequence_generate(Gui_Session *session, Gui_Sequence *seq, Global_Gen_Context *
            case CREATION_ACTION:
                 {
                    Dep_Id wdg_id = action_widget_id_get(action);
-                   Gui_Widget *w = wdg_get(gl_ctx->ctx, NULL, wdg_id);
+                   Gui_Widget *w = wdg_get(gl_ctx->ctx, wdg_id);
                    if (!w)
                      {
                         ERR("Failed to find \"%d\" widget.", wdg_id);
@@ -483,7 +483,7 @@ _sequence_generate(Gui_Session *session, Gui_Sequence *seq, Global_Gen_Context *
                    const Gui_Context *ctx = gl_ctx->ctx;
                    Dep_Id wdg_id = action_widget_id_get(action);
                    const char *wdg_name = gui_context_dep_data_get(ctx, wdg_id);
-                   Gui_Widget *wdg = wdg_get(ctx, NULL, wdg_id);
+                   Gui_Widget *wdg = wdg_get(ctx, wdg_id);
                    Gui_Widget_Property *prop = action_property_get(action);
 
                    /* If parameter of action's property is object, need to declare it as (static) global. */
diff --git a/src/lib/gui_parser.c b/src/lib/gui_parser.c
index 3679dc6..8572a18 100644
--- a/src/lib/gui_parser.c
+++ b/src/lib/gui_parser.c
@@ -661,7 +661,7 @@ _sequence_parse(Gui_Context *gui_ctx, Dep_Id seq_id, Eina_Json_Value *sequence_j
                        const char *wdg_modif_name = eina_json_string_get(eina_json_array_nth_get(cur, 0));
                        // check if modif widget is already created
                        Dep_Id wdg_id = gui_context_dep_data_get_id_by_name(gui_ctx, wdg_modif_name);
-                       Gui_Widget *modif_wdg = wdg_get(gui_ctx, NULL, wdg_id);
+                       Gui_Widget *modif_wdg = wdg_get(gui_ctx, wdg_id);
                        if (!modif_wdg)
                          {
                             goto end;
diff --git a/src/lib/gui_widget.c b/src/lib/gui_widget.c
index 6b4757a..2ec51f9 100644
--- a/src/lib/gui_widget.c
+++ b/src/lib/gui_widget.c
@@ -382,10 +382,6 @@ gui_context_free_name_get(const Gui_Context *ctx, const char *class_name)
              eina_hash_set(ctx->names_hash, class_name, (void *) (uintptr_t) id);
              break;
           }
-        else
-          {
-             ERR("Name: \"%s\" exist.", name);
-          }
      }
    return name;
 }
@@ -675,15 +671,10 @@ wdg_prop_del(Gui_Widget *wdg, Gui_Widget_Property *prop)
 }
 
 Gui_Widget*
-wdg_get(const Gui_Context *ctx, const char *wdg_name, Dep_Id _dep_id)
+wdg_get(const Gui_Context *ctx, Dep_Id dep_id)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, NULL);
-   Dep_Id dep_id = _dep_id;
    Gui_Widget *wdg = NULL;
-   if (wdg_name)
-     {
-        dep_id = (uintptr_t) eina_hash_find(ctx->deps_by_name, wdg_name);
-     }
    if (dep_id == 0)
      return NULL;
    wdg = eina_hash_find(ctx->wdg_hash, &dep_id);
@@ -919,9 +910,13 @@ wdg_parent_set(Gui_Widget *wdg, const char *parent_name)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(wdg, EINA_FALSE);
    Gui_Widget *parent_wdg = NULL;
+   Dep_Id name_id = 0;
+
    if (parent_name)
-     parent_wdg = wdg_get(wdg->ctx, parent_name, 0);
-   if ((parent_name) && (!parent_wdg))
+     name_id = gui_context_dep_data_get_id_by_name(wdg_context_get(wdg), parent_name);
+   if (name_id)
+     parent_wdg = wdg_get(wdg->ctx, name_id);
+   if ((name_id) && (!parent_wdg))
      {
         return EINA_FALSE;
      }
@@ -942,7 +937,8 @@ wdg_parent_win_wdg_get(const Gui_Widget *wdg)
         parent_name = wdg_parent_name_get(wdg);
         while (parent_name)
           {
-             wdg = wdg_get(wdg_context_get(wdg), parent_name, 0);
+             Dep_Id name_id = gui_context_dep_data_get_id_by_name(wdg_context_get(wdg), parent_name);
+             wdg = wdg_get(wdg_context_get(wdg), name_id);
              if (IS_WIN(wdg)) return wdg;
              parent_name = wdg_parent_name_get(wdg);
           }
diff --git a/src/lib/gui_widget.h b/src/lib/gui_widget.h
index ccc1ac3..aa2c39a 100644
--- a/src/lib/gui_widget.h
+++ b/src/lib/gui_widget.h
@@ -240,7 +240,7 @@ wdg_new(const Gui_Context *_ctx, const char *class_name, Dep_Id dep_id);
 
 /* Get widget by name. */
 Gui_Widget*
-wdg_get(const Gui_Context *ctx, const char *wdg_name, Dep_Id dep_id);
+wdg_get(const Gui_Context *ctx, Dep_Id dep_id);
 
 /* Find first widget, which has name like "wdg_name"*/
 Gui_Widget*
diff --git a/src/lib/simulator.c b/src/lib/simulator.c
index 8f4cc93..3ddc06f 100644
--- a/src/lib/simulator.c
+++ b/src/lib/simulator.c
@@ -58,7 +58,7 @@ _execute_sequence(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *d
            case CREATION_ACTION:
                 {
                    Dep_Id wdg_id = action_widget_id_get(action);
-                   Gui_Widget *wdg = wdg_get(ctx, NULL, wdg_id);
+                   Gui_Widget *wdg = wdg_get(ctx, wdg_id);
                    /* EINA_TRUE is passed to force creation of first widget.
                     * Have to remove this bloody flag cause bigbang action is here for that.
                     */
@@ -69,7 +69,7 @@ _execute_sequence(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *d
            case MODIF_ACTION:
                 {
                    Dep_Id wdg_id = action_widget_id_get(action);
-                   Gui_Widget *wdg = wdg_get(ctx, NULL, wdg_id);
+                   Gui_Widget *wdg = wdg_get(ctx, wdg_id);
                    if (!wdg)
                      {
                         ERR("Widget \"%d\" doesn't exist in project", wdg_id);
diff --git a/src/tests/suite.c b/src/tests/suite.c
index 7d4b584..a24b61c 100644
--- a/src/tests/suite.c
+++ b/src/tests/suite.c
@@ -176,7 +176,7 @@ START_TEST(test_wdg)
    Dep_Id wdg_id = gui_context_dep_data_set(ctx, "class_name");
    wdg_tmp = wdg_new(ctx, wdg_name, wdg_id);
    fail_if(!wdg_tmp);
-   wdg = wdg_get(wdg_context_get(wdg_tmp), wdg_name, 0);
+   wdg = wdg_get(wdg_context_get(wdg_tmp), NULL, wdg_id);
    fail_if(!wdg);
    ck_assert_str_eq(wdg_name_get(wdg), wdg_name);