e_zone: change E_API to EINTERN

Change-Id: I53f02253401a90f1d760d6beba986cd0df8a207e

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index ff9ef8f..de8cf32 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -23,15 +23,15 @@ static void        _e_zone_edge_move_resize(E_Zone *zone);
 static void        _e_zone_hooks_clean(void);
 static Eina_Bool   _e_zone_hook_call(E_Zone_Hook_Point hookpoint, E_Zone *zone);
 
-E_API int E_EVENT_ZONE_DESK_COUNT_SET = 0;
+EINTERN int E_EVENT_ZONE_DESK_COUNT_SET = 0;
 E_API int E_EVENT_ZONE_MOVE_RESIZE = 0;
-E_API int E_EVENT_ZONE_ADD = 0;
-E_API int E_EVENT_ZONE_DEL = 0;
-E_API int E_EVENT_ZONE_EDGE_IN = 0;
-E_API int E_EVENT_ZONE_EDGE_OUT = 0;
-E_API int E_EVENT_ZONE_EDGE_MOVE = 0;
-E_API int E_EVENT_ZONE_STOW = 0;
-E_API int E_EVENT_ZONE_UNSTOW = 0;
+EINTERN int E_EVENT_ZONE_ADD = 0;
+EINTERN int E_EVENT_ZONE_DEL = 0;
+EINTERN int E_EVENT_ZONE_EDGE_IN = 0;
+EINTERN int E_EVENT_ZONE_EDGE_OUT = 0;
+EINTERN int E_EVENT_ZONE_EDGE_MOVE = 0;
+EINTERN int E_EVENT_ZONE_STOW = 0;
+EINTERN int E_EVENT_ZONE_UNSTOW = 0;
 #ifdef _F_ZONE_WINDOW_ROTATION_
 E_API int E_EVENT_ZONE_ROTATION_CHANGE_BEGIN = 0;
 E_API int E_EVENT_ZONE_ROTATION_CHANGE_CANCEL = 0;
@@ -40,8 +40,8 @@ E_API int E_EVENT_ZONE_ROTATION_EFFECT_READY = 0;
 E_API int E_EVENT_ZONE_ROTATION_EFFECT_CANCEL = 0;
 E_API int E_EVENT_ZONE_ROTATION_EFFECT_DONE = 0;
 #endif
-E_API int E_EVENT_ZONE_DISPLAY_STATE_CHANGE = 0;
-E_API int E_EVENT_ZONE_USEFUL_GEOMETRY_CHANGE = 0;
+EINTERN int E_EVENT_ZONE_DISPLAY_STATE_CHANGE = 0;
+EINTERN int E_EVENT_ZONE_USEFUL_GEOMETRY_CHANGE = 0;
 
 #define E_ZONE_FLIP_LEFT(zone)  (((((zone)->desk_x_count > 1)) || ((zone)->desk_x_current > 0)) && (zone)->edge.left)
 #define E_ZONE_FLIP_RIGHT(zone) (((((zone)->desk_x_count > 1)) || (((zone)->desk_x_current + 1) < (zone)->desk_x_count)) && (zone)->edge.right)
@@ -218,7 +218,7 @@ _e_zone_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *e
    ecore_event_add(E_EVENT_ZONE_EDGE_MOVE, zev, NULL, NULL);
 }
 
-E_API E_Zone *
+EINTERN E_Zone *
 e_zone_new(int num, int id, int x, int y, int w, int h)
 {
    E_Zone *zone;
@@ -295,7 +295,7 @@ e_zone_new(int num, int id, int x, int y, int w, int h)
    return zone;
 }
 
-E_API void
+EINTERN void
 e_zone_name_set(E_Zone *zone,
                 const char *name)
 {
@@ -326,7 +326,7 @@ e_zone_reconfigure_clients(E_Zone *zone, int dx, int dy, int dw, int dh)
      }
 }
 
-E_API void
+EINTERN void
 e_zone_move(E_Zone *zone,
             int x,
             int y)
@@ -359,7 +359,7 @@ e_zone_move(E_Zone *zone,
    e_zone_reconfigure_clients(zone, dx, dy, 0, 0);
 }
 
-E_API void
+EINTERN void
 e_zone_resize(E_Zone *zone,
               int w,
               int h)
@@ -394,7 +394,7 @@ e_zone_resize(E_Zone *zone,
    e_zone_reconfigure_clients(zone, 0, 0, dw, dh);
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_zone_move_resize(E_Zone *zone,
                    int x,
                    int y,
@@ -499,7 +499,7 @@ e_zone_get_by_position(int x, int y)
    return NULL;
 }
 
-E_API void
+EINTERN void
 e_zone_bg_reconfigure(E_Zone *zone)
 {
    E_OBJECT_CHECK(zone);
@@ -508,7 +508,7 @@ e_zone_bg_reconfigure(E_Zone *zone)
    e_bg_zone_update(zone, E_BG_TRANSITION_CHANGE);
 }
 
-E_API void
+EINTERN void
 e_zone_flip_coords_handle(E_Zone *zone,
                           int x,
                           int y)
@@ -585,7 +585,7 @@ e_zone_flip_coords_handle(E_Zone *zone,
      }
 }
 
-E_API void
+EINTERN void
 e_zone_desk_count_set(E_Zone *zone,
                       int x_count,
                       int y_count)
@@ -702,7 +702,7 @@ e_zone_desk_count_set(E_Zone *zone,
                    _e_zone_event_generic_free, NULL);
 }
 
-E_API void
+EINTERN void
 e_zone_desk_count_get(E_Zone *zone,
                       int *x_count,
                       int *y_count)
@@ -714,7 +714,7 @@ e_zone_desk_count_get(E_Zone *zone,
    if (y_count) *y_count = zone->desk_y_count;
 }
 
-E_API void
+EINTERN void
 e_zone_desk_flip_by(E_Zone *zone,
                     int dx,
                     int dy)
@@ -728,7 +728,7 @@ e_zone_desk_flip_by(E_Zone *zone,
    e_zone_edge_flip_eval(zone);
 }
 
-E_API void
+EINTERN void
 e_zone_desk_flip_to(E_Zone *zone,
                     int x,
                     int y)
@@ -751,7 +751,7 @@ e_zone_desk_flip_to(E_Zone *zone,
    e_zone_edge_flip_eval(zone);
 }
 
-E_API void
+EINTERN void
 e_zone_desk_linear_flip_by(E_Zone *zone,
                            int dx)
 {
@@ -765,7 +765,7 @@ e_zone_desk_linear_flip_by(E_Zone *zone,
    e_zone_desk_linear_flip_to(zone, dx);
 }
 
-E_API void
+EINTERN void
 e_zone_desk_linear_flip_to(E_Zone *zone,
                            int x)
 {
@@ -779,7 +779,7 @@ e_zone_desk_linear_flip_to(E_Zone *zone,
    e_zone_desk_flip_to(zone, x, y);
 }
 
-E_API void
+EINTERN void
 e_zone_edge_enable(void)
 {
    const Eina_List *l;
@@ -803,7 +803,7 @@ e_zone_edge_enable(void)
      }
 }
 
-E_API void
+EINTERN void
 e_zone_edge_disable(void)
 {
    const Eina_List *l;
@@ -827,7 +827,7 @@ e_zone_edge_disable(void)
      }
 }
 
-E_API void
+EINTERN void
 e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool t, Eina_Bool b)
 {
 #define NEED_FLIP_EDGE(x) \
@@ -881,7 +881,7 @@ e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool
    CHECK_CORNER(r, b, E_ZONE_EDGE_BOTTOM_RIGHT, right_bottom, bottom_right);
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge)
 {
    Eina_List *l;
@@ -957,7 +957,7 @@ e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge)
    return EINA_FALSE;
 }
 
-E_API void
+EINTERN void
 e_zone_edge_flip_eval(E_Zone *zone)
 {
    Eina_Bool lf, rf, tf, bf;
@@ -978,7 +978,7 @@ e_zone_edge_flip_eval(E_Zone *zone)
    e_zone_edges_desk_flip_capable(zone, lf, rf, tf, bf);
 }
 
-E_API void
+EINTERN void
 e_zone_edge_new(E_Zone_Edge edge)
 {
    const Eina_List *l;
@@ -1047,7 +1047,7 @@ e_zone_edge_new(E_Zone_Edge edge)
      }
 }
 
-E_API void
+EINTERN void
 e_zone_edge_free(E_Zone_Edge edge)
 {
    const Eina_List *l;
@@ -1102,7 +1102,7 @@ e_zone_edge_free(E_Zone_Edge edge)
      }
 }
 
-E_API void
+EINTERN void
 e_zone_edge_win_layer_set(E_Zone *zone, E_Layer layer)
 {
 #define EDGE_STACK(EDGE) do { \
@@ -1128,7 +1128,7 @@ e_zone_edge_win_layer_set(E_Zone *zone, E_Layer layer)
    EDGE_STACK(edge.bottom);
 }
 
-E_API void
+EINTERN void
 e_zone_fade_handle(E_Zone *zone, int out, double tim)
 {
    EINA_SAFETY_ON_NULL_RETURN(zone);
@@ -1344,7 +1344,7 @@ e_zone_desk_useful_geometry_get(E_Zone *zone, E_Desk *desk, int *x, int *y, int
  *
  * Call this function when shelves are added or important properties changed.
  */
-E_API void
+EINTERN void
 e_zone_useful_geometry_dirty(E_Zone *zone)
 {
    E_Event_Zone_Useful_Geometry_Change *ev;
@@ -1359,7 +1359,7 @@ e_zone_useful_geometry_dirty(E_Zone *zone)
    ecore_event_add(E_EVENT_ZONE_USEFUL_GEOMETRY_CHANGE, ev, _e_zone_event_generic_free, NULL);
 }
 
-E_API void
+EINTERN void
 e_zone_stow(E_Zone *zone)
 {
    E_Event_Zone_Stow *ev;
@@ -1376,7 +1376,7 @@ e_zone_stow(E_Zone *zone)
    zone->stowed = EINA_TRUE;
 }
 
-E_API void
+EINTERN void
 e_zone_unstow(E_Zone *zone)
 {
    E_Event_Zone_Unstow *ev;
@@ -1412,7 +1412,7 @@ e_zone_display_state_set(E_Zone *zone, E_Zone_Display_State state)
    ecore_event_add(E_EVENT_ZONE_DISPLAY_STATE_CHANGE, ev, _e_zone_event_generic_free, NULL);
 }
 
-E_API E_Zone_Display_State
+EINTERN E_Zone_Display_State
 e_zone_display_state_get(E_Zone *zone)
 {
    E_OBJECT_CHECK_RETURN(zone, E_ZONE_DISPLAY_STATE_OFF);
@@ -1719,7 +1719,7 @@ _e_zone_hook_call(E_Zone_Hook_Point hookpoint, E_Zone *zone)
    return !!e_object_unref(E_OBJECT(zone));
 }
 
-E_API E_Zone_Hook *
+EINTERN E_Zone_Hook *
 e_zone_hook_add(E_Zone_Hook_Point hookpoint, E_Zone_Hook_Cb func, const void *data)
 {
    E_Zone_Hook *zh;
@@ -1734,7 +1734,7 @@ e_zone_hook_add(E_Zone_Hook_Point hookpoint, E_Zone_Hook_Cb func, const void *da
    return zh;
 }
 
-E_API void
+EINTERN void
 e_zone_hook_del(E_Zone_Hook *zh)
 {
    zh->delete_me = 1;

diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index 0b1b714..34410e3 100644 (file)
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -221,68 +221,68 @@ struct _E_Event_Zone_Display_State_Change
 
 EINTERN int    e_zone_init(void);
 EINTERN int    e_zone_shutdown(void);
-E_API E_Zone   *e_zone_new(int num, int id, int x, int y, int w, int h);
-E_API void      e_zone_name_set(E_Zone *zone, const char *name);
-E_API void      e_zone_move(E_Zone *zone, int x, int y);
-E_API void      e_zone_resize(E_Zone *zone, int w, int h);
-E_API Eina_Bool  e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h);
+EINTERN E_Zone   *e_zone_new(int num, int id, int x, int y, int w, int h);
+EINTERN void      e_zone_name_set(E_Zone *zone, const char *name);
+EINTERN void      e_zone_move(E_Zone *zone, int x, int y);
+EINTERN void      e_zone_resize(E_Zone *zone, int w, int h);
+EINTERN Eina_Bool  e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h);
 E_API E_Zone   *e_zone_current_get(void);
 EINTERN E_Zone *e_zone_get_by_id(int id);
 EINTERN E_Zone *e_zone_get_by_position(int x, int y);
-E_API void      e_zone_bg_reconfigure(E_Zone *zone);
-E_API void      e_zone_flip_coords_handle(E_Zone *zone, int x, int y);
-E_API void      e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count);
-E_API void      e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count);
-E_API void      e_zone_desk_flip_by(E_Zone *zone, int dx, int dy);
-E_API void      e_zone_desk_flip_to(E_Zone *zone, int x, int y);
-E_API void      e_zone_desk_linear_flip_by(E_Zone *zone, int dx);
-E_API void      e_zone_desk_linear_flip_to(E_Zone *zone, int x);
-E_API void      e_zone_edge_flip_eval(E_Zone *zone);
-E_API void      e_zone_edge_new(E_Zone_Edge edge);
-E_API void      e_zone_edge_free(E_Zone_Edge edge);
-E_API void      e_zone_edge_enable(void);
-E_API void      e_zone_edge_disable(void);
-E_API void      e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool t, Eina_Bool b);
-E_API Eina_Bool e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge);
-E_API void      e_zone_edge_win_layer_set(E_Zone *zone, E_Layer layer);
+EINTERN void      e_zone_bg_reconfigure(E_Zone *zone);
+EINTERN void      e_zone_flip_coords_handle(E_Zone *zone, int x, int y);
+EINTERN void      e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count);
+EINTERN void      e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count);
+EINTERN void      e_zone_desk_flip_by(E_Zone *zone, int dx, int dy);
+EINTERN void      e_zone_desk_flip_to(E_Zone *zone, int x, int y);
+EINTERN void      e_zone_desk_linear_flip_by(E_Zone *zone, int dx);
+EINTERN void      e_zone_desk_linear_flip_to(E_Zone *zone, int x);
+EINTERN void      e_zone_edge_flip_eval(E_Zone *zone);
+EINTERN void      e_zone_edge_new(E_Zone_Edge edge);
+EINTERN void      e_zone_edge_free(E_Zone_Edge edge);
+EINTERN void      e_zone_edge_enable(void);
+EINTERN void      e_zone_edge_disable(void);
+EINTERN void      e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool t, Eina_Bool b);
+EINTERN Eina_Bool e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge);
+EINTERN void      e_zone_edge_win_layer_set(E_Zone *zone, E_Layer layer);
 
 EINTERN Eina_Bool e_zone_obstacle_add(E_Zone *zone, E_Client *ec, Eina_Rectangle *geom, Eina_Bool vertical);
 EINTERN Eina_Bool e_zone_obstacle_update(E_Zone *zone, E_Client *ec, Eina_Rectangle *geom, Eina_Bool vertical);
 EINTERN void      e_zone_obstacle_remove(E_Zone *zone, E_Client *ec);
 
-E_API void      e_zone_useful_geometry_dirty(E_Zone *zone);
+EINTERN void      e_zone_useful_geometry_dirty(E_Zone *zone);
 E_API void      e_zone_useful_geometry_get(E_Zone *zone, int *x, int *y, int *w, int *h);
 EINTERN void    e_zone_desk_useful_geometry_get(E_Zone *zone, E_Desk *desk, int *x, int *y, int *w, int *h);
 
-E_API void      e_zone_stow(E_Zone *zone);
-E_API void      e_zone_unstow(E_Zone *zone);
+EINTERN void      e_zone_stow(E_Zone *zone);
+EINTERN void      e_zone_unstow(E_Zone *zone);
 
-E_API void      e_zone_fade_handle(E_Zone *zone, int out, double tim);
+EINTERN void      e_zone_fade_handle(E_Zone *zone, int out, double tim);
 
 E_API void                 e_zone_display_state_set(E_Zone *zone, E_Zone_Display_State state);
-E_API E_Zone_Display_State e_zone_display_state_get(E_Zone *zone);
+EINTERN E_Zone_Display_State e_zone_display_state_get(E_Zone *zone);
 
 E_API void      e_zone_orientation_callback_set(E_Zone *zone, E_Zone_Cb_Orientation_Block_Set block_set, E_Zone_Cb_Orientation_Force_Update_Add force_update_add, E_Zone_Cb_Orientation_Force_Update_Del force_update_del);
 E_API Eina_Bool e_zone_orientation_block_set(E_Zone *zone, const char *name_hint, Eina_Bool set);
 E_API void      e_zone_orientation_force_update_add(E_Zone *zone, E_Client *client);
 E_API void      e_zone_orientation_force_update_del(E_Zone *zone, E_Client *client);
 
-E_API E_Zone_Hook *e_zone_hook_add(E_Zone_Hook_Point hookpoint, E_Zone_Hook_Cb func, const void *data);
-E_API void e_zone_hook_del(E_Zone_Hook *zh);
+EINTERN E_Zone_Hook *e_zone_hook_add(E_Zone_Hook_Point hookpoint, E_Zone_Hook_Cb func, const void *data);
+EINTERN void e_zone_hook_del(E_Zone_Hook *zh);
 
 // e_zone_screen api for supporting wtz_screen protocol
 EINTERN E_Zone     *e_zone_screen_new(int num, int w, int h);
 E_API   Eina_Bool   e_zone_screen_splitscreen_enable(E_Zone *zone);
 
-extern E_API int E_EVENT_ZONE_DESK_COUNT_SET;
+extern EINTERN int E_EVENT_ZONE_DESK_COUNT_SET;
 extern E_API int E_EVENT_ZONE_MOVE_RESIZE;
-extern E_API int E_EVENT_ZONE_ADD;
-extern E_API int E_EVENT_ZONE_DEL;
-extern E_API int E_EVENT_ZONE_EDGE_IN;
-extern E_API int E_EVENT_ZONE_EDGE_OUT;
-extern E_API int E_EVENT_ZONE_EDGE_MOVE;
-extern E_API int E_EVENT_ZONE_STOW;
-extern E_API int E_EVENT_ZONE_UNSTOW;
+extern EINTERN int E_EVENT_ZONE_ADD;
+extern EINTERN int E_EVENT_ZONE_DEL;
+extern EINTERN int E_EVENT_ZONE_EDGE_IN;
+extern EINTERN int E_EVENT_ZONE_EDGE_OUT;
+extern EINTERN int E_EVENT_ZONE_EDGE_MOVE;
+extern EINTERN int E_EVENT_ZONE_STOW;
+extern EINTERN int E_EVENT_ZONE_UNSTOW;
 
 #ifdef _F_ZONE_WINDOW_ROTATION_
 extern E_API int E_EVENT_ZONE_ROTATION_CHANGE_BEGIN;
@@ -293,8 +293,8 @@ extern E_API int E_EVENT_ZONE_ROTATION_EFFECT_CANCEL;
 extern E_API int E_EVENT_ZONE_ROTATION_EFFECT_DONE;
 #endif
 
-extern E_API int E_EVENT_ZONE_DISPLAY_STATE_CHANGE;
-extern E_API int E_EVENT_ZONE_USEFUL_GEOMETRY_CHANGE;
+extern EINTERN int E_EVENT_ZONE_DISPLAY_STATE_CHANGE;
+extern EINTERN int E_EVENT_ZONE_USEFUL_GEOMETRY_CHANGE;
 
 #endif
 #endif