elm examples: Fixed most of shadow variable warnings and unused warnings.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69682 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/examples/efl_thread_1.c b/src/examples/efl_thread_1.c
index 5edf777..28fa6e4 100644 (file)
--- a/src/examples/efl_thread_1.c
+++ b/src/examples/efl_thread_1.c
@@ -16,7 +16,7 @@ static pthread_t thread_id;
 // BEGIN - code running in my custom pthread instance
 //
 static void *
-my_thread_run(void *arg)
+my_thread_run(void *arg __UNUSED__)
 {
    double t = 0.0;
 
@@ -51,7 +51,7 @@ my_thread_new(void)
 }
 
 int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *o, *bg;
 

diff --git a/src/examples/efl_thread_2.c b/src/examples/efl_thread_2.c
index 4b736d7..bb89ac4 100644 (file)
--- a/src/examples/efl_thread_2.c
+++ b/src/examples/efl_thread_2.c
@@ -23,7 +23,7 @@ static pthread_t thread_id;
 // BEGIN - code running in my custom pthread instance
 //
 static void *
-my_thread_run(void *arg)
+my_thread_run(void *arg __UNUSED__)
 {
    double t = 0.0;
 
@@ -67,7 +67,7 @@ my_thread_mainloop_code(void *data)
 }
 
 int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *o, *bg;
 

diff --git a/src/examples/efl_thread_3.c b/src/examples/efl_thread_3.c
index ae807a6..1cfbacb 100644 (file)
--- a/src/examples/efl_thread_3.c
+++ b/src/examples/efl_thread_3.c
@@ -23,7 +23,7 @@ static pthread_t thread_id;
 // BEGIN - code running in my custom pthread instance
 //
 static void *
-my_thread_run(void *arg)
+my_thread_run(void *arg __UNUSED__)
 {
    double t = 0.0;
 
@@ -69,7 +69,7 @@ my_thread_mainloop_code(void *data)
 }
 
 int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *o, *bg;
 

diff --git a/src/examples/efl_thread_4.c b/src/examples/efl_thread_4.c
index 0c67f72..30841a8 100644 (file)
--- a/src/examples/efl_thread_4.c
+++ b/src/examples/efl_thread_4.c
@@ -25,7 +25,7 @@ static int th_exit = 0;
 // BEGIN - code running in my custom pthread instance
 //
 static void *
-my_thread_run(void *arg)
+my_thread_run(void *arg __UNUSED__)
 {
    double t = 0.0;
 
@@ -81,7 +81,7 @@ my_thread_mainloop_code(void *data)
 
 // just test cancelling the thread
 static void
-down(void *data, Evas *e, Evas_Object *obj, void *event_info)
+down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    pthread_mutex_lock(&th_lock);
    th_exit = 1;
@@ -89,7 +89,7 @@ down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 }
 
 int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *o, *bg;
 

diff --git a/src/examples/efl_thread_5.c b/src/examples/efl_thread_5.c
index 4af200f..53bee89 100644 (file)
--- a/src/examples/efl_thread_5.c
+++ b/src/examples/efl_thread_5.c
@@ -7,7 +7,7 @@
 # define __UNUSED__
 #endif
 
-static Ecore_Thread *th = NULL;
+static Ecore_Thread *thr = NULL;
 
 static Evas_Object *win = NULL;
 static Evas_Object *rect = NULL;
@@ -20,7 +20,7 @@ struct info
 // BEGIN - code running in my custom thread instance
 //
 static void
-th_do(void *data, Ecore_Thread *th)
+th_do(void *data __UNUSED__, Ecore_Thread *th)
 {
    double t = 0.0;
 
@@ -49,7 +49,7 @@ th_do(void *data, Ecore_Thread *th)
 // END - code running in my custom thread instance
 
 static void // when mainloop gets feedback from worker
-th_feedback(void *data, Ecore_Thread *th, void *msg)
+th_feedback(void *data __UNUSED__, Ecore_Thread *th __UNUSED__, void *msg)
 {
    struct info *inf = msg;
    evas_object_move(rect, inf->x - 50, inf->y - 50);
@@ -57,19 +57,19 @@ th_feedback(void *data, Ecore_Thread *th, void *msg)
 }
 
 // BONUS (optional): called after th_do returns and has NOT been cancelled
-static void th_end(void *data, Ecore_Thread *th) { printf("thread ended\n"); }
+static void th_end(void *data __UNUSED__, Ecore_Thread *th __UNUSED__) { printf("thread ended\n"); }
 // BONUS (optional): called in mainloop AFTER thread has finished cancelling
-static void th_cancel(void *data, Ecore_Thread *th) { printf("thread cancelled\n"); }
+static void th_cancel(void *data __UNUSED__, Ecore_Thread *th __UNUSED__) { printf("thread cancelled\n"); }
 
 // just test cancelling the thread worker
 static void
-down(void *data, Evas *e, Evas_Object *obj, void *event_info)
+down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   ecore_thread_cancel(th);
+   ecore_thread_cancel(thr);
 }
 
 int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *o, *bg;
 
@@ -99,8 +99,8 @@ elm_main(int argc, char **argv)
    // overload the cpu's with more work than you actually have processing
    // units *IF* your threads do actually spend their time doing actual
    // heavy computation)
-   th = ecore_thread_feedback_run(th_do, th_feedback, th_end, th_cancel,
-                                  NULL, EINA_TRUE);
+   thr = ecore_thread_feedback_run(th_do, th_feedback, th_end, th_cancel,
+                                   NULL, EINA_TRUE);
    elm_run();
    return 0;
 }

diff --git a/src/examples/efl_thread_6.c b/src/examples/efl_thread_6.c
index c995739..8517665 100644 (file)
--- a/src/examples/efl_thread_6.c
+++ b/src/examples/efl_thread_6.c
@@ -8,7 +8,6 @@
 #endif
 
 static Evas_Object *win = NULL;
-static Evas_Object *rect = NULL;
 
 struct info
 {
@@ -68,7 +67,7 @@ mandel(int *pix, int w, int h)
 }
 
 static void
-th_do(void *data, Ecore_Thread *th)
+th_do(void *data, Ecore_Thread *th __UNUSED__)
 {
    struct info *inf = data;
    // CANNOT TOUCH inf->obj here! just inf->pix which is 256x256 @ 32bpp
@@ -79,7 +78,7 @@ th_do(void *data, Ecore_Thread *th)
 // END - code running in my custom thread instance
 
 static void // thread job finished - collect results and put in img obj
-th_end(void *data, Ecore_Thread *th)
+th_end(void *data, Ecore_Thread *th __UNUSED__)
 {
    struct info *inf = data;
 
@@ -91,7 +90,7 @@ th_end(void *data, Ecore_Thread *th)
 }
 
 static void // if the thread is cancelled - free pix, keep obj tho
-th_cancel(void *data, Ecore_Thread *th)
+th_cancel(void *data, Ecore_Thread *th __UNUSED__)
 {
    struct info *inf = data;
 
@@ -124,7 +123,7 @@ anim(void *data)
 }
 
 int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *o, *bg;
    int i;
@@ -150,8 +149,6 @@ elm_main(int argc, char **argv)
         inf = malloc(sizeof(struct info));
         if (inf)
           {
-             Evas_Object *o;
-
              o = evas_object_image_filled_add(evas_object_evas_get(win));
              evas_object_image_size_set(o, 256, 256);
              evas_object_image_alpha_set(o, EINA_TRUE);

diff --git a/src/examples/hover_example_01.c b/src/examples/hover_example_01.c
index 7e04718..25dbc10 100644 (file)
--- a/src/examples/hover_example_01.c
+++ b/src/examples/hover_example_01.c
@@ -15,13 +15,13 @@ _show_hover(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__
 }
 
 static void
-_hide_hover(void *data, Evas_Object *obj, void *event_info)
+_hide_hover(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    evas_object_hide(data);
 }
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *bt, *bt2, *rect, *rect2, *rect3, *hover;
 

diff --git a/src/examples/hoversel_example_01.c b/src/examples/hoversel_example_01.c
index d290329..de053cd 100644 (file)
--- a/src/examples/hoversel_example_01.c
+++ b/src/examples/hoversel_example_01.c
@@ -15,7 +15,7 @@ static void _free(void *data, Evas_Object *obj, void *event_info);
 static void _add_item(void *data, Evas_Object *obj, void *event_info);
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *rect, *hoversel;
    Elm_Object_Item *hoversel_it;
@@ -62,7 +62,7 @@ elm_main(int argc, char **argv)
 ELM_MAIN()
 
 static void
-_print_items(void *data, Evas_Object *obj, void *event_info)
+_print_items(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    const Eina_List *items = elm_hoversel_items_get(obj);
    const Eina_List *l;
@@ -73,7 +73,7 @@ _print_items(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_rm_items(void *data, Evas_Object *obj, void *event_info)
+_rm_items(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    if(!elm_hoversel_expanded_get(obj))
      elm_hoversel_clear(obj);
@@ -87,7 +87,7 @@ _sel(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_add_item(void *data, Evas_Object *obj, void *event_info)
+_add_item(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    static int num = 0;
    char *str = malloc(sizeof(char) * 10);
@@ -101,7 +101,7 @@ _add_item(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_free(void *data, Evas_Object *obj, void *event_info)
+_free(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    free(data);
 }

diff --git a/src/examples/index_example_02.c b/src/examples/index_example_02.c
index efca941..253ec30 100644 (file)
--- a/src/examples/index_example_02.c
+++ b/src/examples/index_example_02.c
@@ -96,7 +96,7 @@ int
 elm_main(int    argc __UNUSED__,
          char **argv __UNUSED__)
 {
-   Evas_Object *win, *bg, *grid, *index;
+   Evas_Object *win, *bg, *grid, *idx;
    Elm_Object_Item *gg_it;
    unsigned int i;
 
@@ -124,11 +124,11 @@ elm_main(int    argc __UNUSED__,
    elm_win_resize_object_add(win, grid);
    evas_object_show(grid);
 
-   index = elm_index_add(win);
-   evas_object_size_hint_weight_set(index, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, index);
+   idx = elm_index_add(win);
+   evas_object_size_hint_weight_set(idx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, idx);
 
-   evas_object_show(index);
+   evas_object_show(idx);
 
    for (i = 0; i < (sizeof(items) / sizeof(items[0])); i++)
      {
@@ -138,15 +138,15 @@ elm_main(int    argc __UNUSED__,
 
         /* indexing by first letters */
         snprintf(buf, sizeof(buf), "%c", items[i][0]);
-        elm_index_item_sorted_insert(index, buf, NULL, gg_it, _index_icmp, NULL);
+        elm_index_item_sorted_insert(idx, buf, NULL, gg_it, _index_icmp, NULL);
      }
 
-   evas_object_smart_callback_add(index, "delay,changed", _index_changed, NULL);
+   evas_object_smart_callback_add(idx, "delay,changed", _index_changed, NULL);
 
    evas_object_resize(win, 320, 300);
    evas_object_show(win);
 
-   elm_index_autohide_disabled_set(index, EINA_FALSE);
+   elm_index_autohide_disabled_set(idx, EINA_FALSE);
 
    elm_run();
    return 0;

diff --git a/src/examples/label_example_01.c b/src/examples/label_example_01.c
index 30f76eb..89ed296 100644 (file)
--- a/src/examples/label_example_01.c
+++ b/src/examples/label_example_01.c
@@ -9,7 +9,7 @@
 #endif
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *label, *label2, *label3, *label4, *label5, *label6;
 

diff --git a/src/examples/layout_example_01.c b/src/examples/layout_example_01.c
index 7cf5eb6..b550972 100644 (file)
--- a/src/examples/layout_example_01.c
+++ b/src/examples/layout_example_01.c
@@ -60,7 +60,7 @@ int
 elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *icon, *icon2, *bt, *bt2, *layout;
-   Evas_Object *clock;
+   Evas_Object *clk;
    Evas_Object *item;
 
    win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
@@ -105,11 +105,11 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
    elm_layout_table_pack(layout, TABLE, icon2, 1, 0, 1, 1);
    evas_object_show(icon2);
 
-   clock = elm_clock_add(win);
-   evas_object_size_hint_weight_set(clock, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(clock, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_layout_table_pack(layout, TABLE, clock, 2, 0, 1, 1);
-   evas_object_show(clock);
+   clk = elm_clock_add(win);
+   evas_object_size_hint_weight_set(clk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(clk, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_layout_table_pack(layout, TABLE, clk, 2, 0, 1, 1);
+   evas_object_show(clk);
 
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Click me!");

diff --git a/src/examples/map_example_03.c b/src/examples/map_example_03.c
index 2fd1614..e9e540f 100644 (file)
--- a/src/examples/map_example_03.c
+++ b/src/examples/map_example_03.c
@@ -30,42 +30,42 @@ static Example_Data example_data;
 static void
 _route_loaded(void *data, Evas_Object *obj, void *ev __UNUSED__)
 {
-   Example_Data *example_data = data;
+   Example_Data *exam_data = data;
 
-   example_data->route_ovl = elm_map_overlay_route_add(obj, example_data->route);
-   elm_map_overlay_color_set(example_data->route_ovl, 0, 255, 0, 255);
+   exam_data->route_ovl = elm_map_overlay_route_add(obj, exam_data->route);
+   elm_map_overlay_color_set(exam_data->route_ovl, 0, 255, 0, 255);
 }
 
 static void
 _name_loaded(void *data, Evas_Object *obj, void *ev __UNUSED__)
 {
-   Example_Data *example_data = data;
+   Example_Data *exam_data = data;
    Evas_Object *map = obj;
 
-   if (example_data->route)
-     elm_map_route_del(example_data->route);
+   if (exam_data->route)
+     elm_map_route_del(exam_data->route);
 
-   elm_map_name_region_get(example_data->name, &(example_data->dest_lon),
-                           &(example_data->dest_lat));
+   elm_map_name_region_get(exam_data->name, &(exam_data->dest_lon),
+                           &(exam_data->dest_lat));
 
-   example_data->route = elm_map_route_add(map, ELM_MAP_ROUTE_TYPE_FOOT,
+   exam_data->route = elm_map_route_add(map, ELM_MAP_ROUTE_TYPE_FOOT,
                      ELM_MAP_ROUTE_METHOD_SHORTEST,
-                     example_data->start_lon, example_data->start_lat,
-                     example_data->dest_lon, example_data->dest_lat,
+                     exam_data->start_lon, exam_data->start_lat,
+                     exam_data->dest_lon, exam_data->dest_lat,
                      NULL, NULL);
 }
 
 static void
 _bt_route(void *data, Evas_Object *obj __UNUSED__, void *ev __UNUSED__)
 {
-   Example_Data *example_data = data;
+   Example_Data *exam_data = data;
    Evas_Object *map;
    char *address;
 
-   map = example_data->map;
-   address = (char *)elm_object_text_get(example_data->entry);
+   map = exam_data->map;
+   address = (char *)elm_object_text_get(exam_data->entry);
 
-   example_data->name = elm_map_name_add(map, address, 0, 0, NULL, NULL);
+   exam_data->name = elm_map_name_add(map, address, 0, 0, NULL, NULL);
 
    evas_object_smart_callback_add(map, "name,loaded", _name_loaded, data);
    evas_object_smart_callback_add(map, "route,loaded", _route_loaded, data);

diff --git a/src/examples/menu_example_01.c b/src/examples/menu_example_01.c
index c07bfd5..c3d9ec5 100644 (file)
--- a/src/examples/menu_example_01.c
+++ b/src/examples/menu_example_01.c
@@ -9,7 +9,7 @@
 #endif
 
 static void
-_del_it(void *data, Evas_Object *obj, void *event_info)
+_del_it(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    const Eina_List *l;
    Elm_Object_Item *menu_it = elm_menu_first_item_get(data);
@@ -19,7 +19,7 @@ _del_it(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_show(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
    elm_menu_move(data, ev->canvas.x, ev->canvas.y);
@@ -27,7 +27,7 @@ _show(void *data, Evas *e, Evas_Object *obj, void *event_info)
 }
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *menu, *button, *rect;
    Elm_Object_Item *menu_it, *menu_it1;

diff --git a/src/examples/notify_example_01.c b/src/examples/notify_example_01.c
index 855298e..2386960 100644 (file)
--- a/src/examples/notify_example_01.c
+++ b/src/examples/notify_example_01.c
@@ -11,7 +11,7 @@
 static void _hide(void *data, Evas_Object *obj, void *event_info);
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *bx, *notify, *content;
 
@@ -77,7 +77,7 @@ elm_main(int argc, char **argv)
 ELM_MAIN()
 
 static void
-_hide(void *data, Evas_Object *obj, void *event_info)
+_hide(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    evas_object_hide(obj);
 }

diff --git a/src/examples/panel_example_01.c b/src/examples/panel_example_01.c
index 13649d7..edd3d32 100644 (file)
--- a/src/examples/panel_example_01.c
+++ b/src/examples/panel_example_01.c
@@ -9,7 +9,7 @@
 #endif
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *bx, *panel, *content;
 

diff --git a/src/examples/photocam_example_01.c b/src/examples/photocam_example_01.c
index b4270b1..518b0a1 100644 (file)
--- a/src/examples/photocam_example_01.c
+++ b/src/examples/photocam_example_01.c
@@ -15,9 +15,9 @@ static void _zoom(void *data, Evas_Object *obj, void *event_info);
 static void _bring_in(void *data, Evas_Object *obj, void *event_info);
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *obj, *photocam;
+   Evas_Object *win, *bg, *obj, *photocam;
 
    win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
    elm_win_title_set(win, "Photocam");
@@ -67,7 +67,7 @@ elm_main(int argc, char **argv)
 ELM_MAIN()
 
 static void
-_bring_in(void *data, Evas_Object *obj, void *event_info)
+_bring_in(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    int w, h;
    elm_photocam_image_size_get(obj, &w, &h);
@@ -75,7 +75,7 @@ _bring_in(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_fit(void *data, Evas_Object *obj, void *event_info)
+_fit(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    int x, y, w, h;
    elm_photocam_image_region_get(data, &x, &y, &w, &h);
@@ -84,13 +84,13 @@ _fit(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_unfit(void *data, Evas_Object *obj, void *event_info)
+_unfit(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
 }
 
 static void
-_zoom(void *data, Evas_Object *obj, void *event_info)
+_zoom(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    double z = elm_slider_value_get(obj) * 8;
    elm_photocam_zoom_set(data, z);

diff --git a/src/examples/radio_example_01.c b/src/examples/radio_example_01.c
index 61e9f29..55dec3a 100644 (file)
--- a/src/examples/radio_example_01.c
+++ b/src/examples/radio_example_01.c
@@ -13,7 +13,7 @@ static int val = 1;
 static void _cb(void *data, Evas_Object *obj, void *event_info);
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *bx, *radio, *group, *ic;
 
@@ -88,7 +88,7 @@ elm_main(int argc, char **argv)
 ELM_MAIN()
 
 static void
-_cb(void *data, Evas_Object *obj, void *event_info)
+_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    printf("val is now: %d\n", val);
 }

diff --git a/src/examples/scroller_example_01.c b/src/examples/scroller_example_01.c
index 482e42e..5d1758d 100644 (file)
--- a/src/examples/scroller_example_01.c
+++ b/src/examples/scroller_example_01.c
@@ -109,7 +109,7 @@ Aliquam diam leo, ultrices a sodales sed, laoreet id purus. Nullam eleifend leo
 Nam scelerisque nulla ut neque tempor blandit volutpat nisl vehicula. Nam orci enim, luctus ut venenatis et, egestas id nunc. Phasellus risus sem, scelerisque sed vestibulum a, aliquam at sem. Sed venenatis tristique nisi id eleifend. Morbi urna tellus, cursus ac porttitor rhoncus, commodo at mi. Mauris ac magna nisi. Maecenas rutrum lobortis sapien, sed dapibus neque hendrerit a. Aliquam fringilla lectus nec arcu tempor et molestie dui suscipit. Proin et felis velit, vel pellentesque ligula. Donec tempus, mi at mollis porttitor, mauris urna congue elit, at varius nisi elit et est. Quisque eu libero lorem, eget tincidunt velit. Nullam hendrerit metus quis urna adipiscing quis tristique tortor condimentum. Integer iaculis scelerisque sem, vitae consectetur lorem facilisis eu. Phasellus consectetur blandit auctor. Morbi eleifend mollis ipsum, id facilisis leo euismod ut. Nunc id est tellus.";
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *label, *scroller;
 

diff --git a/src/examples/segment_control_example.c b/src/examples/segment_control_example.c
index bf29367..c527c2e 100644 (file)
--- a/src/examples/segment_control_example.c
+++ b/src/examples/segment_control_example.c
@@ -29,7 +29,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *sc, *ic;
    Elm_Object_Item *seg_it;
-   int count, index;
+   int count, idx;
 
    win = elm_win_add(NULL, "segment_control", ELM_WIN_BASIC);
    elm_win_title_set(win, "Segment Control Example");
@@ -75,8 +75,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
    seg_it = elm_segment_control_item_get(sc, count / 2);
    elm_segment_control_item_selected_set(seg_it, EINA_TRUE);
    seg_it = elm_segment_control_item_selected_get(sc);
-   index = elm_segment_control_item_index_get(seg_it);
-   printf("Item selected: %i\n", index);
+   idx = elm_segment_control_item_index_get(seg_it);
+   printf("Item selected: %i\n", idx);
 
    evas_object_show(win);
 

diff --git a/src/examples/separator_example_01.c b/src/examples/separator_example_01.c
index ab0afa8..68638e6 100644 (file)
--- a/src/examples/separator_example_01.c
+++ b/src/examples/separator_example_01.c
@@ -9,10 +9,9 @@
 #endif
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *bx, *rect, *separator;
-   char buf[256];
 
    win = elm_win_add(NULL, "separator", ELM_WIN_BASIC);
    elm_win_title_set(win, "Separator");

diff --git a/src/examples/table_example_01.c b/src/examples/table_example_01.c
index 35d8eca..6b4e8e0 100644 (file)
--- a/src/examples/table_example_01.c
+++ b/src/examples/table_example_01.c
@@ -9,7 +9,7 @@
 #endif
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *label, *table;
 

diff --git a/src/examples/table_example_02.c b/src/examples/table_example_02.c
index 0d42c34..a6b20c8 100644 (file)
--- a/src/examples/table_example_02.c
+++ b/src/examples/table_example_02.c
@@ -9,7 +9,7 @@
 #endif
 
 EAPI_MAIN int
-elm_main(int argc, char **argv)
+elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *rect, *table;
 

diff --git a/src/examples/toolbar_example_03.c b/src/examples/toolbar_example_03.c
index 53f6d81..a5fef05 100644 (file)
--- a/src/examples/toolbar_example_03.c
+++ b/src/examples/toolbar_example_03.c
@@ -24,14 +24,6 @@ _on_done(void *data __UNUSED__,
    elm_exit();
 }
 
-static void
-_item_pressed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   Elm_Object_Item *tb_it = event_info;
-   elm_toolbar_item_state_set(tb_it, elm_toolbar_item_state_next(tb_it));
-   elm_toolbar_item_selected_set(tb_it, EINA_FALSE);
-}
-
 EAPI_MAIN int
 elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {

diff --git a/src/examples/transit_example_02.c b/src/examples/transit_example_02.c
index 86b124e..96aa12b 100644 (file)
--- a/src/examples/transit_example_02.c
+++ b/src/examples/transit_example_02.c
@@ -8,13 +8,6 @@
 # define __UNUSED__
 #endif
 
-static void
-on_done(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   /* quit the mainloop (elm_run) */
-   elm_exit();
-}
-
 int
 elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {

diff --git a/src/examples/transit_example_03.c b/src/examples/transit_example_03.c
index a14078d..331d76d 100644 (file)
--- a/src/examples/transit_example_03.c
+++ b/src/examples/transit_example_03.c
@@ -104,7 +104,7 @@ _checkbox_transition_add(Evas_Object *box, const char *label, Eina_Bool *checked
 }
 
 static void
-_transit_start(void *data, Evas_Object *o, void *event_info __UNUSED__)
+_transit_start(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
 {
    Elm_Transit *trans = NULL;
    int i;
@@ -177,9 +177,8 @@ _cb_tween_changed(void *data, Evas_Object *obj, void *event __UNUSED__)
 int
 elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
-   Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *vbox2, *hbox, *btn, *fr;
+   Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *vbox2, *hbox, *btn;
    Evas_Object *cbox, *dummy, *spinner;
-   Elm_Transit *trans;
    char buf[PATH_MAX];
    int i;
    struct Context context;

diff --git a/src/examples/transit_example_04.c b/src/examples/transit_example_04.c
index 5b73fd5..576101a 100644 (file)
--- a/src/examples/transit_example_04.c
+++ b/src/examples/transit_example_04.c
@@ -66,7 +66,7 @@ _checkbox_transition_add(Evas_Object *box, const char *label, Eina_Bool *checked
 }
 
 static void
-_transit_start(void *data, Evas_Object *o, void *event_info)
+_transit_start(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
 {
    Elm_Transit *trans = NULL;
    Eina_List *objs = data, *l;
@@ -93,8 +93,7 @@ _transit_start(void *data, Evas_Object *o, void *event_info)
 int
 elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
-   Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *btn, *fr, *dummy;
-   Elm_Transit *trans;
+   Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *btn, *dummy;
    Eina_List *objs = NULL;
    char buf[PATH_MAX];
    int i;

diff --git a/src/examples/web_example.c b/src/examples/web_example.c
index 4a5f1da..41d4a77 100644 (file)
--- a/src/examples/web_example.c
+++ b/src/examples/web_example.c
@@ -440,6 +440,7 @@ _win_search_trigger_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
 static void
 default_content_set(Evas_Object *web)
 {
+#ifdef HAVE_ELEMENTARY_WEB
    Evas_Object *view, *frame;
    const char contents[] = ""
       "<html>\n"
@@ -454,11 +455,12 @@ default_content_set(Evas_Object *web)
       "  </body>\n"
       "</html>\n";
 
-#ifdef HAVE_ELEMENTARY_WEB
    view = elm_web_webkit_view_get(web);
    frame = ewk_view_frame_main_get(view);
    ewk_frame_contents_set(frame, contents, sizeof(contents) - 1, "text/html",
                           "UTF-8", NULL);
+#else
+       (void) web;
 #endif
 }