e_comp_object: remove E_Comp_Object_Type

It is deprecated

Change-Id: Ie868ee99868dacf29ee61e5db56307e5e04bf7fe

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index a85b279..1288fb1 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -3737,14 +3737,12 @@ e_comp_object_intercept_hook_del(E_Comp_Object_Intercept_Hook *ch)
 #endif
 
 EINTERN Evas_Object *
-e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type)
+e_comp_object_util_add(Evas_Object *obj)
 {
    Evas_Object *o, *z = NULL;
    const char *name;
-   Eina_List *l, *list = NULL;
    E_Comp_Config *conf = e_comp_config_get();
-   Eina_Bool skip = EINA_FALSE, fast = EINA_FALSE, shadow = EINA_FALSE;
-   E_Comp_Match *m;
+   Eina_Bool skip = EINA_FALSE;
    char buf[1024];
    int ok = 0;
    int x, y, w, h;
@@ -3752,60 +3750,20 @@ e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type)
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
 
-   switch (type)
-     {
-      default:
-        list = conf->match.objects;
-        skip = conf->match.disable_objects;
-        fast = conf->fast_objects;
-     }
    name = evas_object_name_get(obj);
    vis = evas_object_visible_get(obj);
    o = edje_object_add(e_comp->evas);
    evas_object_data_set(o, "comp_object", (void*)1);
-   if (name && (!skip))
+   if (name)
      skip = (!strncmp(name, "noshadow", 8));
    if (skip)
      evas_object_data_set(o, "comp_object_skip", (void*)1);
-   else if (list)
-     {
-        EINA_LIST_FOREACH(list, l, m)
-          {
-             if (((m->name) && (!name)) ||
-                 ((name) && (m->name) && (!e_util_glob_match(name, m->name))))
-               continue;
-             if (!m->shadow_style) continue;
-             if (fast)
-               {
-                  snprintf(buf, sizeof(buf), "e/comp/frame/%s/fast", m->shadow_style);
-                  ok = e_theme_edje_object_set(o, "base/theme/comp", buf);
-               }
-             if (!ok)
-               {
-                  snprintf(buf, sizeof(buf), "e/comp/frame/%s", m->shadow_style);
-                  ok = e_theme_edje_object_set(o, "base/theme/comp", buf);
-               }
-             if (ok)
-               {
-                  shadow = !m->no_shadow;
-                  break;
-               }
-          }
-     }
-   else
-     skip = EINA_TRUE;
+
    while (!ok)
      {
-        if (skip)
-          ok = e_theme_edje_object_set(o, "base/theme/comp", "e/comp/frame/none");
         if (ok) break;
         if (conf->shadow_style)
           {
-             if (fast)
-               {
-                  snprintf(buf, sizeof(buf), "e/comp/frame/%s/fast", conf->shadow_style);
-                  ok = e_theme_edje_object_set(o, "base/theme/comp", buf);
-               }
              if (!ok)
                {
                   snprintf(buf, sizeof(buf), "e/comp/frame/%s", conf->shadow_style);
@@ -3813,13 +3771,11 @@ e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type)
                }
              if (ok) break;
           }
-        if (fast)
-          ok = e_theme_edje_object_set(o, "base/theme/comp", "e/comp/frame/default/fast");
         if (!ok)
           ok = e_theme_edje_object_set(o, "base/theme/comp", "e/comp/frame/default");
         break;
      }
-   if (shadow && (e_util_strcmp(evas_object_type_get(obj), "edje") || (!edje_object_data_get(obj, "noshadow"))))
+   if (e_util_strcmp(evas_object_type_get(obj), "edje") || (!edje_object_data_get(obj, "noshadow")))
      edje_object_signal_emit(o, "e,state,shadow,on", "e");
    else
      edje_object_signal_emit(o, "e,state,shadow,off", "e");

diff --git a/src/bin/e_comp_object.h b/src/bin/e_comp_object.h
index d6bd89c..58ac260 100644 (file)
--- a/src/bin/e_comp_object.h
+++ b/src/bin/e_comp_object.h
@@ -9,12 +9,6 @@ typedef struct E_Comp_Object_Mover E_Comp_Object_Mover;
 
 typedef enum
 {
-   E_COMP_OBJECT_TYPE_NONE,
-   E_COMP_OBJECT_TYPE_LAST,
-} E_Comp_Object_Type;
-
-typedef enum
-{
    E_COMP_OBJECT_CONTENT_TYPE_NONE,
    E_COMP_OBJECT_CONTENT_TYPE_INT_IMAGE,
    E_COMP_OBJECT_CONTENT_TYPE_EXT_IMAGE,
@@ -98,7 +92,7 @@ EINTERN void e_comp_object_shutdown(void);
 EINTERN Eina_Bool e_comp_object_mirror_visibility_check(Evas_Object *obj);
 EINTERN Evas_Object *e_comp_object_client_add(E_Client *ec);
 EINTERN Evas_Object *e_comp_object_util_mirror_add(Evas_Object *obj);
-EINTERN Evas_Object *e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type);
+EINTERN Evas_Object *e_comp_object_util_add(Evas_Object *obj);
 EINTERN void e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay);
 E_API void e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay);
 EINTERN void e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah);

diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index d299fc7..c6a4317 100644 (file)
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -216,7 +216,7 @@ e_drag_object_set(E_Drag *drag, Evas_Object *object)
    else
      evas_object_hide(object);
    drag->object = object;
-   drag->comp_object = e_comp_object_util_add(object, E_COMP_OBJECT_TYPE_NONE);
+   drag->comp_object = e_comp_object_util_add(object);
    evas_object_layer_set(drag->comp_object, drag->layer);
    evas_object_name_set(drag->comp_object, "E Drag");
    evas_object_pass_events_set(drag->comp_object, 1);

diff --git a/src/bin/e_policy_softkey.c b/src/bin/e_policy_softkey.c
index c5be161..d195d97 100644 (file)
--- a/src/bin/e_policy_softkey.c
+++ b/src/bin/e_policy_softkey.c
@@ -75,7 +75,7 @@ _e_policy_softkey_icon_add(E_Zone *zone, const char *name)
                                    _e_policy_cb_softkey, zone);
 
    /* use TYPE_NONE to disable shadow for softkey object */
-   comp_obj = e_comp_object_util_add(obj, E_COMP_OBJECT_TYPE_NONE);
+   comp_obj = e_comp_object_util_add(obj);
    evas_object_layer_set(comp_obj, E_LAYER_DESK_OBJECT_ABOVE);
 
    evas_object_data_set(comp_obj, "policy_mobile_obj", obj);