elm: Changed __UNUSED__ to EINA_UNUSED.

18 files changed, 59 insertions, 59 deletions

diff --git a/src/modules/access_output/mod.c b/src/modules/access_output/mod.c
index 4a9816e22..3f15f3292 100644
--- a/src/modules/access_output/mod.c
+++ b/src/modules/access_output/mod.c
@@ -17,7 +17,7 @@ static char *tmpf = NULL;
 static int tmpfd = -1;
 
 static Eina_Bool
-_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event)
+_exe_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
 {
    Ecore_Exe_Event_Del *ev = event;
 
@@ -38,7 +38,7 @@ _exe_del(void *data __UNUSED__, int type __UNUSED__, void *event)
 
 // module api funcs needed
 EAPI int
-elm_modapi_init(void *m __UNUSED__)
+elm_modapi_init(void *m EINA_UNUSED)
 {
    exe_exit_handler =
       ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
@@ -47,7 +47,7 @@ elm_modapi_init(void *m __UNUSED__)
 }
 
 EAPI int
-elm_modapi_shutdown(void *m __UNUSED__)
+elm_modapi_shutdown(void *m EINA_UNUSED)
 {
    if (exe_exit_handler)
      {
diff --git a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index 838440a94..ac744ae0e 100644
--- a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -27,13 +27,13 @@ struct _DiskItem_Data
 };
 
 static void
-_diskselector_item_free_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_diskselector_item_free_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    if (data) free(data);
 }
 
 static void
-_ctxpopup_dismissed_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__ )
+_ctxpopup_dismissed_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED )
 {
    Evas_Object *diskselector;
 
@@ -42,8 +42,8 @@ _ctxpopup_dismissed_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info
 }
 
 static void
-_datetime_resize_cb(void *data, Evas *e __UNUSED__,Evas_Object *obj __UNUSED__,
-                    void *event_info __UNUSED__)
+_datetime_resize_cb(void *data, Evas *e EINA_UNUSED,Evas_Object *obj EINA_UNUSED,
+                    void *event_info EINA_UNUSED)
 {
    Ctxpopup_Module_Data *ctx_mod;
 
@@ -54,8 +54,8 @@ _datetime_resize_cb(void *data, Evas *e __UNUSED__,Evas_Object *obj __UNUSED__,
 }
 
 static void
-_datetime_move_cb(void *data, Evas *e __UNUSED__,Evas_Object *obj __UNUSED__,
-                  void *event_info __UNUSED__)
+_datetime_move_cb(void *data, Evas *e EINA_UNUSED,Evas_Object *obj EINA_UNUSED,
+                  void *event_info EINA_UNUSED)
 {
    Ctxpopup_Module_Data *ctx_mod;
 
@@ -84,7 +84,7 @@ _field_value_get(struct tm *tim, Elm_Datetime_Field_Type  field_type)
 }
 
 static void
-_diskselector_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_diskselector_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    DiskItem_Data *disk_data;
    struct tm curr_time;
@@ -104,7 +104,7 @@ _diskselector_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
 }
 
 static void
-_ampm_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_ampm_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ctxpopup_Module_Data *ctx_mod;
    struct tm curr_time;
@@ -119,7 +119,7 @@ _ampm_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
 }
 
 static void
-_field_clicked_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+_field_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Ctxpopup_Module_Data *ctx_mod;
    Evas_Object *diskselector;
@@ -369,13 +369,13 @@ obj_hide(Elm_Datetime_Module_Data *module_data)
 
 // module api funcs needed
 EAPI int
-elm_modapi_init(void *m __UNUSED__)
+elm_modapi_init(void *m EINA_UNUSED)
 {
    return 1; // succeed always
 }
 
 EAPI int
-elm_modapi_shutdown(void *m __UNUSED__)
+elm_modapi_shutdown(void *m EINA_UNUSED)
 {
    return 1; // succeed always
 }
diff --git a/src/modules/prefs/elm_button.c b/src/modules/prefs/elm_button.c
index 6e05ab644..53c03f3f9 100644
--- a/src/modules/prefs/elm_button.c
+++ b/src/modules/prefs/elm_button.c
@@ -11,7 +11,7 @@ static Elm_Prefs_Item_Type supported_types[] =
 static void
 _item_changed_cb(void *data,
                  Evas_Object *obj,
-                 void *event_info __UNUSED__)
+                 void *event_info EINA_UNUSED)
 {
    Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
@@ -19,10 +19,10 @@ _item_changed_cb(void *data,
 }
 
 static Evas_Object *
-elm_prefs_button_add(const Elm_Prefs_Item_Iface *iface __UNUSED__,
+elm_prefs_button_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
                      Evas_Object *prefs,
-                     const Elm_Prefs_Item_Type type __UNUSED__,
-                     const Elm_Prefs_Item_Spec spec __UNUSED__,
+                     const Elm_Prefs_Item_Type type EINA_UNUSED,
+                     const Elm_Prefs_Item_Spec spec EINA_UNUSED,
                      Elm_Prefs_Item_Changed_Cb cb)
 {
    Evas_Object *obj = elm_button_add(prefs);
diff --git a/src/modules/prefs/elm_check.c b/src/modules/prefs/elm_check.c
index a7f040f31..8940c3bbb 100644
--- a/src/modules/prefs/elm_check.c
+++ b/src/modules/prefs/elm_check.c
@@ -9,7 +9,7 @@ static Elm_Prefs_Item_Type supported_types[] =
 static void
 _item_changed_cb(void *data,
                  Evas_Object *obj,
-                 void *event_info __UNUSED__)
+                 void *event_info EINA_UNUSED)
 {
     Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
@@ -17,9 +17,9 @@ _item_changed_cb(void *data,
 }
 
 static Evas_Object *
-elm_prefs_check_add(const Elm_Prefs_Item_Iface *iface __UNUSED__,
+elm_prefs_check_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
                     Evas_Object *prefs,
-                    const Elm_Prefs_Item_Type type __UNUSED__,
+                    const Elm_Prefs_Item_Type type EINA_UNUSED,
                     const Elm_Prefs_Item_Spec spec,
                     Elm_Prefs_Item_Changed_Cb cb)
 {
diff --git a/src/modules/prefs/elm_datetime.c b/src/modules/prefs/elm_datetime.c
index 75f06091a..10cd219d5 100644
--- a/src/modules/prefs/elm_datetime.c
+++ b/src/modules/prefs/elm_datetime.c
@@ -9,7 +9,7 @@ static Elm_Prefs_Item_Type supported_types[] =
 static void
 _item_changed_cb(void *data,
                  Evas_Object *obj,
-                 void *event_info __UNUSED__)
+                 void *event_info EINA_UNUSED)
 {
    Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
@@ -17,9 +17,9 @@ _item_changed_cb(void *data,
 }
 
 static Evas_Object *
-elm_prefs_datetime_add(const Elm_Prefs_Item_Iface *iface __UNUSED__,
+elm_prefs_datetime_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
                        Evas_Object *prefs,
-                       const Elm_Prefs_Item_Type type __UNUSED__,
+                       const Elm_Prefs_Item_Type type EINA_UNUSED,
                        const Elm_Prefs_Item_Spec spec,
                        Elm_Prefs_Item_Changed_Cb cb)
 {
diff --git a/src/modules/prefs/elm_entry.c b/src/modules/prefs/elm_entry.c
index 8138bf826..6bbf9f8ca 100644
--- a/src/modules/prefs/elm_entry.c
+++ b/src/modules/prefs/elm_entry.c
@@ -96,7 +96,7 @@ mismatch:
 static void
 _item_changed_cb(void *data,
                  Evas_Object *obj,
-                 void *event_info __UNUSED__)
+                 void *event_info EINA_UNUSED)
 {
    Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
@@ -104,10 +104,10 @@ _item_changed_cb(void *data,
 }
 
 static void
-_entry_del_cb(void *data __UNUSED__,
-              Evas *evas __UNUSED__,
+_entry_del_cb(void *data EINA_UNUSED,
+              Evas *evas EINA_UNUSED,
               Evas_Object *obj,
-              void *event_info __UNUSED__)
+              void *event_info EINA_UNUSED)
 {
    regex_t *regex;
    Ecore_Timer *timer;
@@ -125,7 +125,7 @@ _entry_del_cb(void *data __UNUSED__,
 }
 
 static Evas_Object *
-elm_prefs_entry_add(const Elm_Prefs_Item_Iface *iface __UNUSED__,
+elm_prefs_entry_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
                     Evas_Object *prefs,
                     const Elm_Prefs_Item_Type type,
                     const Elm_Prefs_Item_Spec spec,
@@ -263,7 +263,7 @@ elm_prefs_entry_editable_get(Evas_Object *obj)
 }
 
 static Eina_Bool
-elm_prefs_entry_expand_want(Evas_Object *obj __UNUSED__)
+elm_prefs_entry_expand_want(Evas_Object *obj EINA_UNUSED)
 {
    return EINA_TRUE;
 }
diff --git a/src/modules/prefs/elm_horizontal_box.c b/src/modules/prefs/elm_horizontal_box.c
index 368490ded..5bf58b4f2 100644
--- a/src/modules/prefs/elm_horizontal_box.c
+++ b/src/modules/prefs/elm_horizontal_box.c
@@ -1,7 +1,7 @@
 #include "private.h"
 
 static Evas_Object *
-elm_prefs_horizontal_box_add(const Elm_Prefs_Page_Iface *iface __UNUSED__,
+elm_prefs_horizontal_box_add(const Elm_Prefs_Page_Iface *iface EINA_UNUSED,
                              Evas_Object *prefs)
 {
    Evas_Object *obj = elm_box_add(prefs);
diff --git a/src/modules/prefs/elm_horizontal_frame.c b/src/modules/prefs/elm_horizontal_frame.c
index 9fe153ca4..b848e3dea 100644
--- a/src/modules/prefs/elm_horizontal_frame.c
+++ b/src/modules/prefs/elm_horizontal_frame.c
@@ -1,7 +1,7 @@
 #include "private.h"
 
 static Evas_Object *
-elm_prefs_horizontal_frame_add(const Elm_Prefs_Page_Iface *iface __UNUSED__,
+elm_prefs_horizontal_frame_add(const Elm_Prefs_Page_Iface *iface EINA_UNUSED,
                                Evas_Object *prefs)
 {
    Evas_Object *bx, *obj = elm_frame_add(prefs);
diff --git a/src/modules/prefs/elm_label.c b/src/modules/prefs/elm_label.c
index 1e321a342..8ea7e66a9 100644
--- a/src/modules/prefs/elm_label.c
+++ b/src/modules/prefs/elm_label.c
@@ -7,11 +7,11 @@ static Elm_Prefs_Item_Type supported_types[] =
 };
 
 static Evas_Object *
-elm_prefs_label_add(const Elm_Prefs_Item_Iface *iface __UNUSED__,
+elm_prefs_label_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
                     Evas_Object *prefs,
-                    const Elm_Prefs_Item_Type type __UNUSED__,
-                    const Elm_Prefs_Item_Spec spec __UNUSED__,
-                    Elm_Prefs_Item_Changed_Cb it_changed_cb __UNUSED__)
+                    const Elm_Prefs_Item_Type type EINA_UNUSED,
+                    const Elm_Prefs_Item_Spec spec EINA_UNUSED,
+                    Elm_Prefs_Item_Changed_Cb it_changed_cb EINA_UNUSED)
 {
    Evas_Object *obj = elm_label_add(prefs);
 
diff --git a/src/modules/prefs/elm_separator.c b/src/modules/prefs/elm_separator.c
index ed5aa5bad..1d72a4b6a 100644
--- a/src/modules/prefs/elm_separator.c
+++ b/src/modules/prefs/elm_separator.c
@@ -7,11 +7,11 @@ static Elm_Prefs_Item_Type supported_types[] =
 };
 
 static Evas_Object *
-elm_prefs_separator_add(const Elm_Prefs_Item_Iface *iface __UNUSED__,
+elm_prefs_separator_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
                         Evas_Object *prefs,
-                        const Elm_Prefs_Item_Type type __UNUSED__,
-                        const Elm_Prefs_Item_Spec spec __UNUSED__,
-                        Elm_Prefs_Item_Changed_Cb cb __UNUSED__)
+                        const Elm_Prefs_Item_Type type EINA_UNUSED,
+                        const Elm_Prefs_Item_Spec spec EINA_UNUSED,
+                        Elm_Prefs_Item_Changed_Cb cb EINA_UNUSED)
 {
    Evas_Object *obj = elm_separator_add(prefs);
 
diff --git a/src/modules/prefs/elm_slider.c b/src/modules/prefs/elm_slider.c
index 06157f492..09515df89 100644
--- a/src/modules/prefs/elm_slider.c
+++ b/src/modules/prefs/elm_slider.c
@@ -10,7 +10,7 @@ static Elm_Prefs_Item_Type supported_types[] =
 static void
 _item_changed_cb(void *data,
                  Evas_Object *obj,
-                 void *event_info __UNUSED__)
+                 void *event_info EINA_UNUSED)
 {
    Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
@@ -18,7 +18,7 @@ _item_changed_cb(void *data,
 }
 
 static Evas_Object *
-elm_prefs_slider_add(const Elm_Prefs_Item_Iface *iface __UNUSED__,
+elm_prefs_slider_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
                      Evas_Object *prefs,
                      const Elm_Prefs_Item_Type type,
                      const Elm_Prefs_Item_Spec spec,
diff --git a/src/modules/prefs/elm_spinner.c b/src/modules/prefs/elm_spinner.c
index 2317f9e0d..486dc9812 100644
--- a/src/modules/prefs/elm_spinner.c
+++ b/src/modules/prefs/elm_spinner.c
@@ -10,7 +10,7 @@ static Elm_Prefs_Item_Type supported_types[] =
 static void
 _item_changed_cb(void *data,
                  Evas_Object *obj,
-                 void *event_info __UNUSED__)
+                 void *event_info EINA_UNUSED)
 {
     Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
 
@@ -18,7 +18,7 @@ _item_changed_cb(void *data,
 }
 
 static Evas_Object *
-elm_prefs_spinner_add(const Elm_Prefs_Item_Iface *iface __UNUSED__,
+elm_prefs_spinner_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
                       Evas_Object *prefs,
                       const Elm_Prefs_Item_Type type,
                       const Elm_Prefs_Item_Spec spec,
diff --git a/src/modules/prefs/elm_swallow.c b/src/modules/prefs/elm_swallow.c
index b8bc8b59a..0fd738cf8 100644
--- a/src/modules/prefs/elm_swallow.c
+++ b/src/modules/prefs/elm_swallow.c
@@ -12,11 +12,11 @@ static Elm_Prefs_Item_Type supported_types[] =
 };
 
 static Evas_Object *
-elm_prefs_swallow_add(const Elm_Prefs_Item_Iface *iface __UNUSED__,
+elm_prefs_swallow_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
                       Evas_Object *prefs,
-                      const Elm_Prefs_Item_Type type __UNUSED__,
-                      const Elm_Prefs_Item_Spec spec __UNUSED__,
-                      Elm_Prefs_Item_Changed_Cb cb __UNUSED__)
+                      const Elm_Prefs_Item_Type type EINA_UNUSED,
+                      const Elm_Prefs_Item_Spec spec EINA_UNUSED,
+                      Elm_Prefs_Item_Changed_Cb cb EINA_UNUSED)
 {
    Evas_Object *obj = elm_layout_add(prefs);
 
diff --git a/src/modules/prefs/elm_vertical_box.c b/src/modules/prefs/elm_vertical_box.c
index 2b23a45c9..c7ffa0854 100644
--- a/src/modules/prefs/elm_vertical_box.c
+++ b/src/modules/prefs/elm_vertical_box.c
@@ -1,7 +1,7 @@
 #include "private.h"
 
 static Evas_Object *
-elm_prefs_vertical_box_add(const Elm_Prefs_Page_Iface *iface __UNUSED__,
+elm_prefs_vertical_box_add(const Elm_Prefs_Page_Iface *iface EINA_UNUSED,
                            Evas_Object *prefs)
 {
    Evas_Object *obj = elm_box_add(prefs);
diff --git a/src/modules/prefs/elm_vertical_frame.c b/src/modules/prefs/elm_vertical_frame.c
index 06bb5c5fe..0df2a4a68 100644
--- a/src/modules/prefs/elm_vertical_frame.c
+++ b/src/modules/prefs/elm_vertical_frame.c
@@ -1,7 +1,7 @@
 #include "private.h"
 
 static Evas_Object *
-elm_prefs_vertical_frame_add(const Elm_Prefs_Page_Iface *iface __UNUSED__,
+elm_prefs_vertical_frame_add(const Elm_Prefs_Page_Iface *iface EINA_UNUSED,
                              Evas_Object *prefs)
 {
    Evas_Object *bx, *obj = elm_frame_add(prefs);
diff --git a/src/modules/prefs/prefs_iface.c b/src/modules/prefs/prefs_iface.c
index 5d1b12bcc..1150fcbd2 100644
--- a/src/modules/prefs/prefs_iface.c
+++ b/src/modules/prefs/prefs_iface.c
@@ -263,7 +263,7 @@ elm_prefs_page_common_unpack(Evas_Object *it,
 }
 
 EAPI int
-elm_modapi_init(void *m __UNUSED__)
+elm_modapi_init(void *m EINA_UNUSED)
 {
    _elm_prefs_log_dom = eina_log_domain_register
        ("elm-prefs", EINA_COLOR_YELLOW);
@@ -275,7 +275,7 @@ elm_modapi_init(void *m __UNUSED__)
 }
 
 EAPI int
-elm_modapi_shutdown(void *m __UNUSED__)
+elm_modapi_shutdown(void *m EINA_UNUSED)
 {
    elm_prefs_item_iface_unregister(_elm_prefs_item_widgets);
    elm_prefs_page_iface_unregister(_elm_prefs_page_widgets);
diff --git a/src/modules/test_entry/mod.c b/src/modules/test_entry/mod.c
index c3620b2e7..025d9b435 100644
--- a/src/modules/test_entry/mod.c
+++ b/src/modules/test_entry/mod.c
@@ -6,13 +6,13 @@
 
 // module api funcs needed
 EAPI int
-elm_modapi_init(void *m __UNUSED__)
+elm_modapi_init(void *m EINA_UNUSED)
 {
    return 1; // succeed always
 }
 
 EAPI int
-elm_modapi_shutdown(void *m __UNUSED__)
+elm_modapi_shutdown(void *m EINA_UNUSED)
 {
    return 1; // succeed always
 }
diff --git a/src/modules/test_map/mod.c b/src/modules/test_map/mod.c
index 4bbdcea29..452fd0598 100644
--- a/src/modules/test_map/mod.c
+++ b/src/modules/test_map/mod.c
@@ -24,7 +24,7 @@ map_module_tile_zoom_max_get(void)
 }
 
 EAPI char *
-map_module_tile_url_get(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+map_module_tile_url_get(Evas_Object *obj EINA_UNUSED, int x, int y, int zoom)
 {
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "http://tile.openstreetmap.org/%d/%d/%d.png",
@@ -39,25 +39,25 @@ map_module_route_source_get(void)
 }
 
 EAPI char *
-map_module_route_url_get(Evas_Object *obj __UNUSED__, const char *type_name __UNUSED__, int method __UNUSED__, double flon __UNUSED__, double flat __UNUSED__, double tlon __UNUSED__, double tlat __UNUSED__)
+map_module_route_url_get(Evas_Object *obj EINA_UNUSED, const char *type_name EINA_UNUSED, int method EINA_UNUSED, double flon EINA_UNUSED, double flat EINA_UNUSED, double tlon EINA_UNUSED, double tlat EINA_UNUSED)
 {
    return strdup("");
 }
 
 EAPI char *
-map_module_name_url_get(Evas_Object *obj __UNUSED__, int method __UNUSED__, const char *name __UNUSED__, double lon __UNUSED__, double lat __UNUSED__)
+map_module_name_url_get(Evas_Object *obj EINA_UNUSED, int method EINA_UNUSED, const char *name EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED)
 {
    return strdup("");
 }
 
 EAPI Eina_Bool
-map_module_tile_geo_to_coord(const Evas_Object *obj __UNUSED__, int zoom __UNUSED__, double lon __UNUSED__, double lat __UNUSED__, int size __UNUSED__, int *x __UNUSED__, int *y __UNUSED__)
+map_module_tile_geo_to_coord(const Evas_Object *obj EINA_UNUSED, int zoom EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED, int size EINA_UNUSED, int *x EINA_UNUSED, int *y EINA_UNUSED)
 {
    return EINA_FALSE;
 }
 
 EAPI Eina_Bool
-map_module_tile_coord_to_geo(const Evas_Object *obj __UNUSED__, int zoom __UNUSED__, int x __UNUSED__, int y __UNUSED__, int size __UNUSED__, double *lon __UNUSED__, double *lat __UNUSED__)
+map_module_tile_coord_to_geo(const Evas_Object *obj EINA_UNUSED, int zoom EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int size EINA_UNUSED, double *lon EINA_UNUSED, double *lat EINA_UNUSED)
 {
    return EINA_FALSE;
 }