e_comp_object: define E_COMP_OBJECT_INTERCEPT_HOOK_APPEND macro at e.h

Remove other definitions at files except for e.h file.

Change-Id: If7ccbdc2a39ba1138add4682e425c9e88630effe

diff --git a/src/bin/e.h b/src/bin/e.h
index 1c16803..f49e04c 100644 (file)
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -276,6 +276,16 @@ typedef struct _E_Rect         E_Rect;
     } \
   while (0)
 
+#define E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(list, type, callback, data) \
+  do \
+    { \
+       E_Comp_Object_Intercept_Hook *_coih; \
+       _coih = e_comp_object_intercept_hook_add(type, callback, data); \
+       assert(_coih); \
+       list = eina_list_append(list, _coih); \
+    } \
+  while (0)
+
 # define E_CLAMP(x, min, max) (x < min ? min : (x > max ? max : x))
 # define E_RECTS_CLIP_TO_RECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch) \
   {                                                               \

diff --git a/src/bin/e_policy_conformant.c b/src/bin/e_policy_conformant.c
index c9a580a..599a0d3 100644 (file)
--- a/src/bin/e_policy_conformant.c
+++ b/src/bin/e_policy_conformant.c
@@ -3,17 +3,6 @@
 #include <wayland-server.h>
 #include <tizen-extension-server-protocol.h>
 
-#undef E_COMP_OBJECT_INTERCEPT_HOOK_APPEND
-#define E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(l, t, cb, d) \
-  do                                                     \
-    {                                                    \
-       E_Comp_Object_Intercept_Hook *_h;                 \
-       _h = e_comp_object_intercept_hook_add(t, cb, d);  \
-       assert(_h);                                       \
-       l = eina_list_append(l, _h);                      \
-    }                                                    \
-  while (0)
-
 typedef enum
 {
    CONFORMANT_TYPE_INDICATOR = 0,

diff --git a/src/bin/e_policy_visibility_internal.h b/src/bin/e_policy_visibility_internal.h
index e822035..b041727 100644 (file)
--- a/src/bin/e_policy_visibility_internal.h
+++ b/src/bin/e_policy_visibility_internal.h
@@ -18,16 +18,6 @@
 #define VS_ERR(ec, f, x...) \
       ERR("VISIBILITY | "f" | '%s'(win:0x%08zx, ec:%p) RscID %d", ##x, ec ? NAME(ec) : "", e_client_util_win_get(ec), ec, ec ? e_pixmap_res_id_get(ec->pixmap) : 0)
 
-#undef E_COMP_OBJECT_INTERCEPT_HOOK_APPEND
-#define E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(l, t, cb, d)       \
-   do                                                          \
-   {                                                           \
-      E_Comp_Object_Intercept_Hook *_h;                        \
-      _h = e_comp_object_intercept_hook_add(t, cb, d);         \
-      assert(_h);                                              \
-      l = eina_list_append(l, _h);                             \
-   } while (0)
-
 #define E_VIS_ALLOC_RET(ptr, type, size)                       \
    type *ptr;                                                  \
    ptr = E_NEW(type, size);                                    \

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index 3910489..c1ce3f4 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -8487,17 +8487,6 @@ err:
     }                                     \
   while (0)
 
-#undef E_COMP_OBJECT_INTERCEPT_HOOK_APPEND
-#define E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(l, t, cb, d) \
-  do                                                     \
-    {                                                    \
-       E_Comp_Object_Intercept_Hook *_h;                 \
-       _h = e_comp_object_intercept_hook_add(t, cb, d);  \
-       assert(_h);                                       \
-       l = eina_list_append(l, _h);                      \
-    }                                                    \
-  while (0)
-
 Eina_Bool
 e_policy_wl_init(void)
 {

diff --git a/src/bin/services/e_service_cbhm.c b/src/bin/services/e_service_cbhm.c
index 0a65065..742e2d4 100644 (file)
--- a/src/bin/services/e_service_cbhm.c
+++ b/src/bin/services/e_service_cbhm.c
@@ -157,17 +157,6 @@ _e_cbhm_vis_change(E_Policy_Cbhm *cbhm, Eina_Bool vis)
     }                                     \
   while (0)
 
-#undef E_COMP_OBJECT_INTERCEPT_HOOK_APPEND
-#define E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(l, t, cb, d) \
-  do                                                     \
-    {                                                    \
-       E_Comp_Object_Intercept_Hook *_h;                 \
-       _h = e_comp_object_intercept_hook_add(t, cb, d);  \
-       assert(_h);                                       \
-       l = eina_list_append(l, _h);                      \
-    }                                                    \
-  while (0)
-
 /* NOTE: supported single client for cbhm for now. */
 EINTERN void
 e_service_cbhm_client_set(E_Client *ec)

diff --git a/src/bin/services/e_service_quickpanel.c b/src/bin/services/e_service_quickpanel.c
index dd6bd99..4d85505 100644 (file)
--- a/src/bin/services/e_service_quickpanel.c
+++ b/src/bin/services/e_service_quickpanel.c
@@ -2203,17 +2203,6 @@ e_service_quickpanel_type_get(E_Client *ec)
     }                                     \
   while (0)
 
-#undef E_COMP_OBJECT_INTERCEPT_HOOK_APPEND
-#define E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(l, t, cb, d) \
-  do                                                     \
-    {                                                    \
-       E_Comp_Object_Intercept_Hook *_h;                 \
-       _h = e_comp_object_intercept_hook_add(t, cb, d);  \
-       assert(_h);                                       \
-       l = eina_list_append(l, _h);                      \
-    }                                                    \
-  while (0)
-
 /* window for quickpanel service */
 EINTERN void
 e_service_quickpanel_client_add(E_Client *ec, E_Service_Quickpanel_Type type)

diff --git a/src/bin/services/e_service_softkey.c b/src/bin/services/e_service_softkey.c
index cfdd77f..49f8902 100644 (file)
--- a/src/bin/services/e_service_softkey.c
+++ b/src/bin/services/e_service_softkey.c
@@ -278,17 +278,6 @@ _e_service_handler_object_new(E_Service_Softkey *softkey_service)
    return handler_obj;
 }
 
-#undef E_COMP_OBJECT_INTERCEPT_HOOK_APPEND
-#define E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(l, t, cb, d) \
-  do                                                     \
-    {                                                    \
-       E_Comp_Object_Intercept_Hook *_h;                 \
-       _h = e_comp_object_intercept_hook_add(t, cb, d);  \
-       assert(_h);                                       \
-       l = eina_list_append(l, _h);                      \
-    }                                                    \
-  while (0)
-
 EINTERN void
 e_service_softkey_client_set(E_Client *ec)
 {