hover/hoversel: clean up code for getting edje_object_data

Summary:
There are several lines to get edje_object_data from elm_hover
or elm_hoversel like edje_object_data_get(elm_layout_edje_get(obj), "key");
These codes can be replaced with elm_layout_data_get(obj, "key");

Reviewers: Hermet, cedric

Reviewed By: cedric

Differential Revision: https://phab.enlightenment.org/D3193

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>

diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c
index 11c85fe..6fb1f4f 100644 (file)
--- a/legacy/elementary/src/lib/elc_hoversel.c
+++ b/legacy/elementary/src/lib/elc_hoversel.c
@@ -111,7 +111,7 @@ _on_hover_clicked(void *data EINA_UNUSED,
 {
    const char *dismissstr;
 
-   dismissstr = edje_object_data_get(elm_layout_edje_get(obj), "dismiss");
+   dismissstr = elm_layout_data_get(obj, "dismiss");
 
    if (!dismissstr || strcmp(dismissstr, "on"))
      elm_hoversel_hover_end(data); // for backward compatibility
@@ -258,7 +258,7 @@ _resizing_eval(Evas_Object *obj, Elm_Hoversel_Data *sd)
    box_w += vw;
    box_h += vh;
 
-   max_size_str = edje_object_data_get(elm_layout_edje_get(sd->hover), "max_size");
+   max_size_str = elm_layout_data_get(sd->hover, "max_size");
    if (max_size_str)
      max_size = (int)(atoi(max_size_str)
                       * elm_config_scale_get()
@@ -350,7 +350,7 @@ _hover_end_finished(void *data,
 
    ELM_HOVERSEL_DATA_GET(data, sd);
 
-   dismissstr = edje_object_data_get(elm_layout_edje_get(sd->hover), "dismiss");
+   dismissstr = elm_layout_data_get(sd->hover, "dismiss");
 
    if (dismissstr && !strcmp(dismissstr, "on"))
      {
@@ -686,7 +686,7 @@ _elm_hoversel_hover_end(Eo *obj, Elm_Hoversel_Data *sd)
 
    if (!sd->hover) return;
 
-   dismissstr = edje_object_data_get(elm_layout_edje_get(sd->hover), "dismiss");
+   dismissstr = elm_layout_data_get(sd->hover, "dismiss");
 
    if (dismissstr && !strcmp(dismissstr, "on"))
      {

diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c
index 2ca235a..e7659a9 100644 (file)
--- a/legacy/elementary/src/lib/elm_hover.c
+++ b/legacy/elementary/src/lib/elm_hover.c
@@ -538,7 +538,7 @@ _hov_hide_cb(void *data,
 {
    const char *dismissstr;
 
-   dismissstr = edje_object_data_get(elm_layout_edje_get(data), "dismiss");
+   dismissstr = elm_layout_data_get(data, "dismiss");
 
    if (dismissstr && !strcmp(dismissstr, "on"))
      {
@@ -555,7 +555,7 @@ _hov_dismiss_cb(void *data,
 {
    const char *dismissstr;
 
-   dismissstr = edje_object_data_get(elm_layout_edje_get(data), "dismiss");
+   dismissstr = elm_layout_data_get(data, "dismiss");
 
    if (dismissstr && !strcmp(dismissstr, "on"))
      {
@@ -658,7 +658,7 @@ _elm_hover_evas_object_smart_hide(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
    eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
 
    // for backward compatibility
-   dismissstr = edje_object_data_get(elm_layout_edje_get(obj), "dismiss");
+   dismissstr = elm_layout_data_get(obj, "dismiss");
 
    if (!dismissstr || strcmp(dismissstr, "on"))
      _hide_signals_emit(obj);
@@ -810,7 +810,7 @@ _elm_hover_dismiss(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
 {
    const char *dismissstr;
 
-   dismissstr = edje_object_data_get(elm_layout_edje_get(obj), "dismiss");
+   dismissstr = elm_layout_data_get(obj, "dismiss");
 
    if (!dismissstr || strcmp(dismissstr, "on"))
      elm_layout_signal_emit(obj, "elm,action,dismiss", ""); // XXX: for compat