summaryrefslogtreecommitdiff
path: root/legacy/elementary
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2012-03-28 00:52:09 +0000
committerDaniel Juyung Seo <seojuyung2@gmail.com>2012-03-28 00:52:09 +0000
commit24637aff41b76cf214390bc3ddfbe26592d4f2c3 (patch)
treeaafb807d552c75fea67509346c1f7b3ea297fd2d /legacy/elementary
parent75536522302857152f746243016f76b7e6f98d68 (diff)
elm examples: Fixed most of shadow variable warnings and unused warnings.
SVN revision: 69682
Diffstat (limited to 'legacy/elementary')
-rw-r--r--legacy/elementary/src/examples/efl_thread_1.c4
-rw-r--r--legacy/elementary/src/examples/efl_thread_2.c4
-rw-r--r--legacy/elementary/src/examples/efl_thread_3.c4
-rw-r--r--legacy/elementary/src/examples/efl_thread_4.c6
-rw-r--r--legacy/elementary/src/examples/efl_thread_5.c20
-rw-r--r--legacy/elementary/src/examples/efl_thread_6.c11
-rw-r--r--legacy/elementary/src/examples/hover_example_01.c4
-rw-r--r--legacy/elementary/src/examples/hoversel_example_01.c10
-rw-r--r--legacy/elementary/src/examples/index_example_02.c16
-rw-r--r--legacy/elementary/src/examples/label_example_01.c2
-rw-r--r--legacy/elementary/src/examples/layout_example_01.c12
-rw-r--r--legacy/elementary/src/examples/map_example_03.c30
-rw-r--r--legacy/elementary/src/examples/menu_example_01.c6
-rw-r--r--legacy/elementary/src/examples/notify_example_01.c4
-rw-r--r--legacy/elementary/src/examples/panel_example_01.c2
-rw-r--r--legacy/elementary/src/examples/photocam_example_01.c12
-rw-r--r--legacy/elementary/src/examples/radio_example_01.c4
-rw-r--r--legacy/elementary/src/examples/scroller_example_01.c2
-rw-r--r--legacy/elementary/src/examples/segment_control_example.c6
-rw-r--r--legacy/elementary/src/examples/separator_example_01.c3
-rw-r--r--legacy/elementary/src/examples/table_example_01.c2
-rw-r--r--legacy/elementary/src/examples/table_example_02.c2
-rw-r--r--legacy/elementary/src/examples/toolbar_example_03.c8
-rw-r--r--legacy/elementary/src/examples/transit_example_02.c7
-rw-r--r--legacy/elementary/src/examples/transit_example_03.c5
-rw-r--r--legacy/elementary/src/examples/transit_example_04.c5
-rw-r--r--legacy/elementary/src/examples/web_example.c4
27 files changed, 88 insertions, 107 deletions
diff --git a/legacy/elementary/src/examples/efl_thread_1.c b/legacy/elementary/src/examples/efl_thread_1.c
index 5edf777cba..28fa6e4200 100644
--- a/legacy/elementary/src/examples/efl_thread_1.c
+++ b/legacy/elementary/src/examples/efl_thread_1.c
@@ -16,7 +16,7 @@ static pthread_t thread_id;
16// BEGIN - code running in my custom pthread instance 16// BEGIN - code running in my custom pthread instance
17// 17//
18static void * 18static void *
19my_thread_run(void *arg) 19my_thread_run(void *arg __UNUSED__)
20{ 20{
21 double t = 0.0; 21 double t = 0.0;
22 22
@@ -51,7 +51,7 @@ my_thread_new(void)
51} 51}
52 52
53int 53int
54elm_main(int argc, char **argv) 54elm_main(int argc __UNUSED__, char **argv __UNUSED__)
55{ 55{
56 Evas_Object *o, *bg; 56 Evas_Object *o, *bg;
57 57
diff --git a/legacy/elementary/src/examples/efl_thread_2.c b/legacy/elementary/src/examples/efl_thread_2.c
index 4b736d7467..bb89ac40e1 100644
--- a/legacy/elementary/src/examples/efl_thread_2.c
+++ b/legacy/elementary/src/examples/efl_thread_2.c
@@ -23,7 +23,7 @@ static pthread_t thread_id;
23// BEGIN - code running in my custom pthread instance 23// BEGIN - code running in my custom pthread instance
24// 24//
25static void * 25static void *
26my_thread_run(void *arg) 26my_thread_run(void *arg __UNUSED__)
27{ 27{
28 double t = 0.0; 28 double t = 0.0;
29 29
@@ -67,7 +67,7 @@ my_thread_mainloop_code(void *data)
67} 67}
68 68
69int 69int
70elm_main(int argc, char **argv) 70elm_main(int argc __UNUSED__, char **argv __UNUSED__)
71{ 71{
72 Evas_Object *o, *bg; 72 Evas_Object *o, *bg;
73 73
diff --git a/legacy/elementary/src/examples/efl_thread_3.c b/legacy/elementary/src/examples/efl_thread_3.c
index ae807a64fa..1cfbacb102 100644
--- a/legacy/elementary/src/examples/efl_thread_3.c
+++ b/legacy/elementary/src/examples/efl_thread_3.c
@@ -23,7 +23,7 @@ static pthread_t thread_id;
23// BEGIN - code running in my custom pthread instance 23// BEGIN - code running in my custom pthread instance
24// 24//
25static void * 25static void *
26my_thread_run(void *arg) 26my_thread_run(void *arg __UNUSED__)
27{ 27{
28 double t = 0.0; 28 double t = 0.0;
29 29
@@ -69,7 +69,7 @@ my_thread_mainloop_code(void *data)
69} 69}
70 70
71int 71int
72elm_main(int argc, char **argv) 72elm_main(int argc __UNUSED__, char **argv __UNUSED__)
73{ 73{
74 Evas_Object *o, *bg; 74 Evas_Object *o, *bg;
75 75
diff --git a/legacy/elementary/src/examples/efl_thread_4.c b/legacy/elementary/src/examples/efl_thread_4.c
index 0c67f7237d..30841a89d2 100644
--- a/legacy/elementary/src/examples/efl_thread_4.c
+++ b/legacy/elementary/src/examples/efl_thread_4.c
@@ -25,7 +25,7 @@ static int th_exit = 0;
25// BEGIN - code running in my custom pthread instance 25// BEGIN - code running in my custom pthread instance
26// 26//
27static void * 27static void *
28my_thread_run(void *arg) 28my_thread_run(void *arg __UNUSED__)
29{ 29{
30 double t = 0.0; 30 double t = 0.0;
31 31
@@ -81,7 +81,7 @@ my_thread_mainloop_code(void *data)
81 81
82// just test cancelling the thread 82// just test cancelling the thread
83static void 83static void
84down(void *data, Evas *e, Evas_Object *obj, void *event_info) 84down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
85{ 85{
86 pthread_mutex_lock(&th_lock); 86 pthread_mutex_lock(&th_lock);
87 th_exit = 1; 87 th_exit = 1;
@@ -89,7 +89,7 @@ down(void *data, Evas *e, Evas_Object *obj, void *event_info)
89} 89}
90 90
91int 91int
92elm_main(int argc, char **argv) 92elm_main(int argc __UNUSED__, char **argv __UNUSED__)
93{ 93{
94 Evas_Object *o, *bg; 94 Evas_Object *o, *bg;
95 95
diff --git a/legacy/elementary/src/examples/efl_thread_5.c b/legacy/elementary/src/examples/efl_thread_5.c
index 4af200fcab..53bee89a5a 100644
--- a/legacy/elementary/src/examples/efl_thread_5.c
+++ b/legacy/elementary/src/examples/efl_thread_5.c
@@ -7,7 +7,7 @@
7# define __UNUSED__ 7# define __UNUSED__
8#endif 8#endif
9 9
10static Ecore_Thread *th = NULL; 10static Ecore_Thread *thr = NULL;
11 11
12static Evas_Object *win = NULL; 12static Evas_Object *win = NULL;
13static Evas_Object *rect = NULL; 13static Evas_Object *rect = NULL;
@@ -20,7 +20,7 @@ struct info
20// BEGIN - code running in my custom thread instance 20// BEGIN - code running in my custom thread instance
21// 21//
22static void 22static void
23th_do(void *data, Ecore_Thread *th) 23th_do(void *data __UNUSED__, Ecore_Thread *th)
24{ 24{
25 double t = 0.0; 25 double t = 0.0;
26 26
@@ -49,7 +49,7 @@ th_do(void *data, Ecore_Thread *th)
49// END - code running in my custom thread instance 49// END - code running in my custom thread instance
50 50
51static void // when mainloop gets feedback from worker 51static void // when mainloop gets feedback from worker
52th_feedback(void *data, Ecore_Thread *th, void *msg) 52th_feedback(void *data __UNUSED__, Ecore_Thread *th __UNUSED__, void *msg)
53{ 53{
54 struct info *inf = msg; 54 struct info *inf = msg;
55 evas_object_move(rect, inf->x - 50, inf->y - 50); 55 evas_object_move(rect, inf->x - 50, inf->y - 50);
@@ -57,19 +57,19 @@ th_feedback(void *data, Ecore_Thread *th, void *msg)
57} 57}
58 58
59// BONUS (optional): called after th_do returns and has NOT been cancelled 59// BONUS (optional): called after th_do returns and has NOT been cancelled
60static void th_end(void *data, Ecore_Thread *th) { printf("thread ended\n"); } 60static void th_end(void *data __UNUSED__, Ecore_Thread *th __UNUSED__) { printf("thread ended\n"); }
61// BONUS (optional): called in mainloop AFTER thread has finished cancelling 61// BONUS (optional): called in mainloop AFTER thread has finished cancelling
62static void th_cancel(void *data, Ecore_Thread *th) { printf("thread cancelled\n"); } 62static void th_cancel(void *data __UNUSED__, Ecore_Thread *th __UNUSED__) { printf("thread cancelled\n"); }
63 63
64// just test cancelling the thread worker 64// just test cancelling the thread worker
65static void 65static void
66down(void *data, Evas *e, Evas_Object *obj, void *event_info) 66down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
67{ 67{
68 ecore_thread_cancel(th); 68 ecore_thread_cancel(thr);
69} 69}
70 70
71int 71int
72elm_main(int argc, char **argv) 72elm_main(int argc __UNUSED__, char **argv __UNUSED__)
73{ 73{
74 Evas_Object *o, *bg; 74 Evas_Object *o, *bg;
75 75
@@ -99,8 +99,8 @@ elm_main(int argc, char **argv)
99 // overload the cpu's with more work than you actually have processing 99 // overload the cpu's with more work than you actually have processing
100 // units *IF* your threads do actually spend their time doing actual 100 // units *IF* your threads do actually spend their time doing actual
101 // heavy computation) 101 // heavy computation)
102 th = ecore_thread_feedback_run(th_do, th_feedback, th_end, th_cancel, 102 thr = ecore_thread_feedback_run(th_do, th_feedback, th_end, th_cancel,
103 NULL, EINA_TRUE); 103 NULL, EINA_TRUE);
104 elm_run(); 104 elm_run();
105 return 0; 105 return 0;
106} 106}
diff --git a/legacy/elementary/src/examples/efl_thread_6.c b/legacy/elementary/src/examples/efl_thread_6.c
index c995739da8..8517665d2b 100644
--- a/legacy/elementary/src/examples/efl_thread_6.c
+++ b/legacy/elementary/src/examples/efl_thread_6.c
@@ -8,7 +8,6 @@
8#endif 8#endif
9 9
10static Evas_Object *win = NULL; 10static Evas_Object *win = NULL;
11static Evas_Object *rect = NULL;
12 11
13struct info 12struct info
14{ 13{
@@ -68,7 +67,7 @@ mandel(int *pix, int w, int h)
68} 67}
69 68
70static void 69static void
71th_do(void *data, Ecore_Thread *th) 70th_do(void *data, Ecore_Thread *th __UNUSED__)
72{ 71{
73 struct info *inf = data; 72 struct info *inf = data;
74 // CANNOT TOUCH inf->obj here! just inf->pix which is 256x256 @ 32bpp 73 // CANNOT TOUCH inf->obj here! just inf->pix which is 256x256 @ 32bpp
@@ -79,7 +78,7 @@ th_do(void *data, Ecore_Thread *th)
79// END - code running in my custom thread instance 78// END - code running in my custom thread instance
80 79
81static void // thread job finished - collect results and put in img obj 80static void // thread job finished - collect results and put in img obj
82th_end(void *data, Ecore_Thread *th) 81th_end(void *data, Ecore_Thread *th __UNUSED__)
83{ 82{
84 struct info *inf = data; 83 struct info *inf = data;
85 84
@@ -91,7 +90,7 @@ th_end(void *data, Ecore_Thread *th)
91} 90}
92 91
93static void // if the thread is cancelled - free pix, keep obj tho 92static void // if the thread is cancelled - free pix, keep obj tho
94th_cancel(void *data, Ecore_Thread *th) 93th_cancel(void *data, Ecore_Thread *th __UNUSED__)
95{ 94{
96 struct info *inf = data; 95 struct info *inf = data;
97 96
@@ -124,7 +123,7 @@ anim(void *data)
124} 123}
125 124
126int 125int
127elm_main(int argc, char **argv) 126elm_main(int argc __UNUSED__, char **argv __UNUSED__)
128{ 127{
129 Evas_Object *o, *bg; 128 Evas_Object *o, *bg;
130 int i; 129 int i;
@@ -150,8 +149,6 @@ elm_main(int argc, char **argv)
150 inf = malloc(sizeof(struct info)); 149 inf = malloc(sizeof(struct info));
151 if (inf) 150 if (inf)
152 { 151 {
153 Evas_Object *o;
154
155 o = evas_object_image_filled_add(evas_object_evas_get(win)); 152 o = evas_object_image_filled_add(evas_object_evas_get(win));
156 evas_object_image_size_set(o, 256, 256); 153 evas_object_image_size_set(o, 256, 256);
157 evas_object_image_alpha_set(o, EINA_TRUE); 154 evas_object_image_alpha_set(o, EINA_TRUE);
diff --git a/legacy/elementary/src/examples/hover_example_01.c b/legacy/elementary/src/examples/hover_example_01.c
index 7e0471892a..25dbc107ed 100644
--- a/legacy/elementary/src/examples/hover_example_01.c
+++ b/legacy/elementary/src/examples/hover_example_01.c
@@ -15,13 +15,13 @@ _show_hover(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__
15} 15}
16 16
17static void 17static void
18_hide_hover(void *data, Evas_Object *obj, void *event_info) 18_hide_hover(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
19{ 19{
20 evas_object_hide(data); 20 evas_object_hide(data);
21} 21}
22 22
23EAPI_MAIN int 23EAPI_MAIN int
24elm_main(int argc, char **argv) 24elm_main(int argc __UNUSED__, char **argv __UNUSED__)
25{ 25{
26 Evas_Object *win, *bg, *bt, *bt2, *rect, *rect2, *rect3, *hover; 26 Evas_Object *win, *bg, *bt, *bt2, *rect, *rect2, *rect3, *hover;
27 27
diff --git a/legacy/elementary/src/examples/hoversel_example_01.c b/legacy/elementary/src/examples/hoversel_example_01.c
index d2903293e9..de053cd677 100644
--- a/legacy/elementary/src/examples/hoversel_example_01.c
+++ b/legacy/elementary/src/examples/hoversel_example_01.c
@@ -15,7 +15,7 @@ static void _free(void *data, Evas_Object *obj, void *event_info);
15static void _add_item(void *data, Evas_Object *obj, void *event_info); 15static void _add_item(void *data, Evas_Object *obj, void *event_info);
16 16
17EAPI_MAIN int 17EAPI_MAIN int
18elm_main(int argc, char **argv) 18elm_main(int argc __UNUSED__, char **argv __UNUSED__)
19{ 19{
20 Evas_Object *win, *bg, *rect, *hoversel; 20 Evas_Object *win, *bg, *rect, *hoversel;
21 Elm_Object_Item *hoversel_it; 21 Elm_Object_Item *hoversel_it;
@@ -62,7 +62,7 @@ elm_main(int argc, char **argv)
62ELM_MAIN() 62ELM_MAIN()
63 63
64static void 64static void
65_print_items(void *data, Evas_Object *obj, void *event_info) 65_print_items(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
66{ 66{
67 const Eina_List *items = elm_hoversel_items_get(obj); 67 const Eina_List *items = elm_hoversel_items_get(obj);
68 const Eina_List *l; 68 const Eina_List *l;
@@ -73,7 +73,7 @@ _print_items(void *data, Evas_Object *obj, void *event_info)
73} 73}
74 74
75static void 75static void
76_rm_items(void *data, Evas_Object *obj, void *event_info) 76_rm_items(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
77{ 77{
78 if(!elm_hoversel_expanded_get(obj)) 78 if(!elm_hoversel_expanded_get(obj))
79 elm_hoversel_clear(obj); 79 elm_hoversel_clear(obj);
@@ -87,7 +87,7 @@ _sel(void *data, Evas_Object *obj, void *event_info)
87} 87}
88 88
89static void 89static void
90_add_item(void *data, Evas_Object *obj, void *event_info) 90_add_item(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
91{ 91{
92 static int num = 0; 92 static int num = 0;
93 char *str = malloc(sizeof(char) * 10); 93 char *str = malloc(sizeof(char) * 10);
@@ -101,7 +101,7 @@ _add_item(void *data, Evas_Object *obj, void *event_info)
101} 101}
102 102
103static void 103static void
104_free(void *data, Evas_Object *obj, void *event_info) 104_free(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
105{ 105{
106 free(data); 106 free(data);
107} 107}
diff --git a/legacy/elementary/src/examples/index_example_02.c b/legacy/elementary/src/examples/index_example_02.c
index efca94180d..253ec30be1 100644
--- a/legacy/elementary/src/examples/index_example_02.c
+++ b/legacy/elementary/src/examples/index_example_02.c
@@ -96,7 +96,7 @@ int
96elm_main(int argc __UNUSED__, 96elm_main(int argc __UNUSED__,
97 char **argv __UNUSED__) 97 char **argv __UNUSED__)
98{ 98{
99 Evas_Object *win, *bg, *grid, *index; 99 Evas_Object *win, *bg, *grid, *idx;
100 Elm_Object_Item *gg_it; 100 Elm_Object_Item *gg_it;
101 unsigned int i; 101 unsigned int i;
102 102
@@ -124,11 +124,11 @@ elm_main(int argc __UNUSED__,
124 elm_win_resize_object_add(win, grid); 124 elm_win_resize_object_add(win, grid);
125 evas_object_show(grid); 125 evas_object_show(grid);
126 126
127 index = elm_index_add(win); 127 idx = elm_index_add(win);
128 evas_object_size_hint_weight_set(index, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 128 evas_object_size_hint_weight_set(idx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
129 elm_win_resize_object_add(win, index); 129 elm_win_resize_object_add(win, idx);
130 130
131 evas_object_show(index); 131 evas_object_show(idx);
132 132
133 for (i = 0; i < (sizeof(items) / sizeof(items[0])); i++) 133 for (i = 0; i < (sizeof(items) / sizeof(items[0])); i++)
134 { 134 {
@@ -138,15 +138,15 @@ elm_main(int argc __UNUSED__,
138 138
139 /* indexing by first letters */ 139 /* indexing by first letters */
140 snprintf(buf, sizeof(buf), "%c", items[i][0]); 140 snprintf(buf, sizeof(buf), "%c", items[i][0]);
141 elm_index_item_sorted_insert(index, buf, NULL, gg_it, _index_icmp, NULL); 141 elm_index_item_sorted_insert(idx, buf, NULL, gg_it, _index_icmp, NULL);
142 } 142 }
143 143
144 evas_object_smart_callback_add(index, "delay,changed", _index_changed, NULL); 144 evas_object_smart_callback_add(idx, "delay,changed", _index_changed, NULL);
145 145
146 evas_object_resize(win, 320, 300); 146 evas_object_resize(win, 320, 300);
147 evas_object_show(win); 147 evas_object_show(win);
148 148
149 elm_index_autohide_disabled_set(index, EINA_FALSE); 149 elm_index_autohide_disabled_set(idx, EINA_FALSE);
150 150
151 elm_run(); 151 elm_run();
152 return 0; 152 return 0;
diff --git a/legacy/elementary/src/examples/label_example_01.c b/legacy/elementary/src/examples/label_example_01.c
index 30f76ebd5e..89ed2961dd 100644
--- a/legacy/elementary/src/examples/label_example_01.c
+++ b/legacy/elementary/src/examples/label_example_01.c
@@ -9,7 +9,7 @@
9#endif 9#endif
10 10
11EAPI_MAIN int 11EAPI_MAIN int
12elm_main(int argc, char **argv) 12elm_main(int argc __UNUSED__, char **argv __UNUSED__)
13{ 13{
14 Evas_Object *win, *bg, *label, *label2, *label3, *label4, *label5, *label6; 14 Evas_Object *win, *bg, *label, *label2, *label3, *label4, *label5, *label6;
15 15
diff --git a/legacy/elementary/src/examples/layout_example_01.c b/legacy/elementary/src/examples/layout_example_01.c
index 7cf5eb6082..b55097285d 100644
--- a/legacy/elementary/src/examples/layout_example_01.c
+++ b/legacy/elementary/src/examples/layout_example_01.c
@@ -60,7 +60,7 @@ int
60elm_main(int argc __UNUSED__, char **argv __UNUSED__) 60elm_main(int argc __UNUSED__, char **argv __UNUSED__)
61{ 61{
62 Evas_Object *win, *bg, *icon, *icon2, *bt, *bt2, *layout; 62 Evas_Object *win, *bg, *icon, *icon2, *bt, *bt2, *layout;
63 Evas_Object *clock; 63 Evas_Object *clk;
64 Evas_Object *item; 64 Evas_Object *item;
65 65
66 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 66 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
@@ -105,11 +105,11 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
105 elm_layout_table_pack(layout, TABLE, icon2, 1, 0, 1, 1); 105 elm_layout_table_pack(layout, TABLE, icon2, 1, 0, 1, 1);
106 evas_object_show(icon2); 106 evas_object_show(icon2);
107 107
108 clock = elm_clock_add(win); 108 clk = elm_clock_add(win);
109 evas_object_size_hint_weight_set(clock, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 109 evas_object_size_hint_weight_set(clk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
110 evas_object_size_hint_align_set(clock, EVAS_HINT_FILL, EVAS_HINT_FILL); 110 evas_object_size_hint_align_set(clk, EVAS_HINT_FILL, EVAS_HINT_FILL);
111 elm_layout_table_pack(layout, TABLE, clock, 2, 0, 1, 1); 111 elm_layout_table_pack(layout, TABLE, clk, 2, 0, 1, 1);
112 evas_object_show(clock); 112 evas_object_show(clk);
113 113
114 bt = elm_button_add(win); 114 bt = elm_button_add(win);
115 elm_object_text_set(bt, "Click me!"); 115 elm_object_text_set(bt, "Click me!");
diff --git a/legacy/elementary/src/examples/map_example_03.c b/legacy/elementary/src/examples/map_example_03.c
index 2fd161462f..e9e540fb81 100644
--- a/legacy/elementary/src/examples/map_example_03.c
+++ b/legacy/elementary/src/examples/map_example_03.c
@@ -30,42 +30,42 @@ static Example_Data example_data;
30static void 30static void
31_route_loaded(void *data, Evas_Object *obj, void *ev __UNUSED__) 31_route_loaded(void *data, Evas_Object *obj, void *ev __UNUSED__)
32{ 32{
33 Example_Data *example_data = data; 33 Example_Data *exam_data = data;
34 34
35 example_data->route_ovl = elm_map_overlay_route_add(obj, example_data->route); 35 exam_data->route_ovl = elm_map_overlay_route_add(obj, exam_data->route);
36 elm_map_overlay_color_set(example_data->route_ovl, 0, 255, 0, 255); 36 elm_map_overlay_color_set(exam_data->route_ovl, 0, 255, 0, 255);
37} 37}
38 38
39static void 39static void
40_name_loaded(void *data, Evas_Object *obj, void *ev __UNUSED__) 40_name_loaded(void *data, Evas_Object *obj, void *ev __UNUSED__)
41{ 41{
42 Example_Data *example_data = data; 42 Example_Data *exam_data = data;
43 Evas_Object *map = obj; 43 Evas_Object *map = obj;
44 44
45 if (example_data->route) 45 if (exam_data->route)
46 elm_map_route_del(example_data->route); 46 elm_map_route_del(exam_data->route);
47 47
48 elm_map_name_region_get(example_data->name, &(example_data->dest_lon), 48 elm_map_name_region_get(exam_data->name, &(exam_data->dest_lon),
49 &(example_data->dest_lat)); 49 &(exam_data->dest_lat));
50 50
51 example_data->route = elm_map_route_add(map, ELM_MAP_ROUTE_TYPE_FOOT, 51 exam_data->route = elm_map_route_add(map, ELM_MAP_ROUTE_TYPE_FOOT,
52 ELM_MAP_ROUTE_METHOD_SHORTEST, 52 ELM_MAP_ROUTE_METHOD_SHORTEST,
53 example_data->start_lon, example_data->start_lat, 53 exam_data->start_lon, exam_data->start_lat,
54 example_data->dest_lon, example_data->dest_lat, 54 exam_data->dest_lon, exam_data->dest_lat,
55 NULL, NULL); 55 NULL, NULL);
56} 56}
57 57
58static void 58static void
59_bt_route(void *data, Evas_Object *obj __UNUSED__, void *ev __UNUSED__) 59_bt_route(void *data, Evas_Object *obj __UNUSED__, void *ev __UNUSED__)
60{ 60{
61 Example_Data *example_data = data; 61 Example_Data *exam_data = data;
62 Evas_Object *map; 62 Evas_Object *map;
63 char *address; 63 char *address;
64 64
65 map = example_data->map; 65 map = exam_data->map;
66 address = (char *)elm_object_text_get(example_data->entry); 66 address = (char *)elm_object_text_get(exam_data->entry);
67 67
68 example_data->name = elm_map_name_add(map, address, 0, 0, NULL, NULL); 68 exam_data->name = elm_map_name_add(map, address, 0, 0, NULL, NULL);
69 69
70 evas_object_smart_callback_add(map, "name,loaded", _name_loaded, data); 70 evas_object_smart_callback_add(map, "name,loaded", _name_loaded, data);
71 evas_object_smart_callback_add(map, "route,loaded", _route_loaded, data); 71 evas_object_smart_callback_add(map, "route,loaded", _route_loaded, data);
diff --git a/legacy/elementary/src/examples/menu_example_01.c b/legacy/elementary/src/examples/menu_example_01.c
index c07bfd5bf9..c3d9ec5ad5 100644
--- a/legacy/elementary/src/examples/menu_example_01.c
+++ b/legacy/elementary/src/examples/menu_example_01.c
@@ -9,7 +9,7 @@
9#endif 9#endif
10 10
11static void 11static void
12_del_it(void *data, Evas_Object *obj, void *event_info) 12_del_it(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
13{ 13{
14 const Eina_List *l; 14 const Eina_List *l;
15 Elm_Object_Item *menu_it = elm_menu_first_item_get(data); 15 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)
19} 19}
20 20
21static void 21static void
22_show(void *data, Evas *e, Evas_Object *obj, void *event_info) 22_show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
23{ 23{
24 Evas_Event_Mouse_Down *ev = event_info; 24 Evas_Event_Mouse_Down *ev = event_info;
25 elm_menu_move(data, ev->canvas.x, ev->canvas.y); 25 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)
27} 27}
28 28
29EAPI_MAIN int 29EAPI_MAIN int
30elm_main(int argc, char **argv) 30elm_main(int argc __UNUSED__, char **argv __UNUSED__)
31{ 31{
32 Evas_Object *win, *bg, *menu, *button, *rect; 32 Evas_Object *win, *bg, *menu, *button, *rect;
33 Elm_Object_Item *menu_it, *menu_it1; 33 Elm_Object_Item *menu_it, *menu_it1;
diff --git a/legacy/elementary/src/examples/notify_example_01.c b/legacy/elementary/src/examples/notify_example_01.c
index 855298e99b..2386960db2 100644
--- a/legacy/elementary/src/examples/notify_example_01.c
+++ b/legacy/elementary/src/examples/notify_example_01.c
@@ -11,7 +11,7 @@
11static void _hide(void *data, Evas_Object *obj, void *event_info); 11static void _hide(void *data, Evas_Object *obj, void *event_info);
12 12
13EAPI_MAIN int 13EAPI_MAIN int
14elm_main(int argc, char **argv) 14elm_main(int argc __UNUSED__, char **argv __UNUSED__)
15{ 15{
16 Evas_Object *win, *bg, *bx, *notify, *content; 16 Evas_Object *win, *bg, *bx, *notify, *content;
17 17
@@ -77,7 +77,7 @@ elm_main(int argc, char **argv)
77ELM_MAIN() 77ELM_MAIN()
78 78
79static void 79static void
80_hide(void *data, Evas_Object *obj, void *event_info) 80_hide(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
81{ 81{
82 evas_object_hide(obj); 82 evas_object_hide(obj);
83} 83}
diff --git a/legacy/elementary/src/examples/panel_example_01.c b/legacy/elementary/src/examples/panel_example_01.c
index 13649d7d8a..edd3d32dd1 100644
--- a/legacy/elementary/src/examples/panel_example_01.c
+++ b/legacy/elementary/src/examples/panel_example_01.c
@@ -9,7 +9,7 @@
9#endif 9#endif
10 10
11EAPI_MAIN int 11EAPI_MAIN int
12elm_main(int argc, char **argv) 12elm_main(int argc __UNUSED__, char **argv __UNUSED__)
13{ 13{
14 Evas_Object *win, *bg, *bx, *panel, *content; 14 Evas_Object *win, *bg, *bx, *panel, *content;
15 15
diff --git a/legacy/elementary/src/examples/photocam_example_01.c b/legacy/elementary/src/examples/photocam_example_01.c
index b4270b1eed..518b0a1a4e 100644
--- a/legacy/elementary/src/examples/photocam_example_01.c
+++ b/legacy/elementary/src/examples/photocam_example_01.c
@@ -15,9 +15,9 @@ static void _zoom(void *data, Evas_Object *obj, void *event_info);
15static void _bring_in(void *data, Evas_Object *obj, void *event_info); 15static void _bring_in(void *data, Evas_Object *obj, void *event_info);
16 16
17EAPI_MAIN int 17EAPI_MAIN int
18elm_main(int argc, char **argv) 18elm_main(int argc __UNUSED__, char **argv __UNUSED__)
19{ 19{
20 Evas_Object *win, *bg, *bx, *obj, *photocam; 20 Evas_Object *win, *bg, *obj, *photocam;
21 21
22 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); 22 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
23 elm_win_title_set(win, "Photocam"); 23 elm_win_title_set(win, "Photocam");
@@ -67,7 +67,7 @@ elm_main(int argc, char **argv)
67ELM_MAIN() 67ELM_MAIN()
68 68
69static void 69static void
70_bring_in(void *data, Evas_Object *obj, void *event_info) 70_bring_in(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
71{ 71{
72 int w, h; 72 int w, h;
73 elm_photocam_image_size_get(obj, &w, &h); 73 elm_photocam_image_size_get(obj, &w, &h);
@@ -75,7 +75,7 @@ _bring_in(void *data, Evas_Object *obj, void *event_info)
75} 75}
76 76
77static void 77static void
78_fit(void *data, Evas_Object *obj, void *event_info) 78_fit(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
79{ 79{
80 int x, y, w, h; 80 int x, y, w, h;
81 elm_photocam_image_region_get(data, &x, &y, &w, &h); 81 elm_photocam_image_region_get(data, &x, &y, &w, &h);
@@ -84,13 +84,13 @@ _fit(void *data, Evas_Object *obj, void *event_info)
84} 84}
85 85
86static void 86static void
87_unfit(void *data, Evas_Object *obj, void *event_info) 87_unfit(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
88{ 88{
89 elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL); 89 elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
90} 90}
91 91
92static void 92static void
93_zoom(void *data, Evas_Object *obj, void *event_info) 93_zoom(void *data, Evas_Object *obj, void *event_info __UNUSED__)
94{ 94{
95 double z = elm_slider_value_get(obj) * 8; 95 double z = elm_slider_value_get(obj) * 8;
96 elm_photocam_zoom_set(data, z); 96 elm_photocam_zoom_set(data, z);
diff --git a/legacy/elementary/src/examples/radio_example_01.c b/legacy/elementary/src/examples/radio_example_01.c
index 61e9f29dee..55dec3a04a 100644
--- a/legacy/elementary/src/examples/radio_example_01.c
+++ b/legacy/elementary/src/examples/radio_example_01.c
@@ -13,7 +13,7 @@ static int val = 1;
13static void _cb(void *data, Evas_Object *obj, void *event_info); 13static void _cb(void *data, Evas_Object *obj, void *event_info);
14 14
15EAPI_MAIN int 15EAPI_MAIN int
16elm_main(int argc, char **argv) 16elm_main(int argc __UNUSED__, char **argv __UNUSED__)
17{ 17{
18 Evas_Object *win, *bg, *bx, *radio, *group, *ic; 18 Evas_Object *win, *bg, *bx, *radio, *group, *ic;
19 19
@@ -88,7 +88,7 @@ elm_main(int argc, char **argv)
88ELM_MAIN() 88ELM_MAIN()
89 89
90static void 90static void
91_cb(void *data, Evas_Object *obj, void *event_info) 91_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
92{ 92{
93 printf("val is now: %d\n", val); 93 printf("val is now: %d\n", val);
94} 94}
diff --git a/legacy/elementary/src/examples/scroller_example_01.c b/legacy/elementary/src/examples/scroller_example_01.c
index 482e42ee6c..5d1758d0eb 100644
--- a/legacy/elementary/src/examples/scroller_example_01.c
+++ b/legacy/elementary/src/examples/scroller_example_01.c
@@ -109,7 +109,7 @@ Aliquam diam leo, ultrices a sodales sed, laoreet id purus. Nullam eleifend leo
109Nam 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."; 109Nam 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.";
110 110
111EAPI_MAIN int 111EAPI_MAIN int
112elm_main(int argc, char **argv) 112elm_main(int argc __UNUSED__, char **argv __UNUSED__)
113{ 113{
114 Evas_Object *win, *bg, *label, *scroller; 114 Evas_Object *win, *bg, *label, *scroller;
115 115
diff --git a/legacy/elementary/src/examples/segment_control_example.c b/legacy/elementary/src/examples/segment_control_example.c
index bf29367d1a..c527c2ef43 100644
--- a/legacy/elementary/src/examples/segment_control_example.c
+++ b/legacy/elementary/src/examples/segment_control_example.c
@@ -29,7 +29,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
29{ 29{
30 Evas_Object *win, *bg, *sc, *ic; 30 Evas_Object *win, *bg, *sc, *ic;
31 Elm_Object_Item *seg_it; 31 Elm_Object_Item *seg_it;
32 int count, index; 32 int count, idx;
33 33
34 win = elm_win_add(NULL, "segment_control", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "segment_control", ELM_WIN_BASIC);
35 elm_win_title_set(win, "Segment Control Example"); 35 elm_win_title_set(win, "Segment Control Example");
@@ -75,8 +75,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
75 seg_it = elm_segment_control_item_get(sc, count / 2); 75 seg_it = elm_segment_control_item_get(sc, count / 2);
76 elm_segment_control_item_selected_set(seg_it, EINA_TRUE); 76 elm_segment_control_item_selected_set(seg_it, EINA_TRUE);
77 seg_it = elm_segment_control_item_selected_get(sc); 77 seg_it = elm_segment_control_item_selected_get(sc);
78 index = elm_segment_control_item_index_get(seg_it); 78 idx = elm_segment_control_item_index_get(seg_it);
79 printf("Item selected: %i\n", index); 79 printf("Item selected: %i\n", idx);
80 80
81 evas_object_show(win); 81 evas_object_show(win);
82 82
diff --git a/legacy/elementary/src/examples/separator_example_01.c b/legacy/elementary/src/examples/separator_example_01.c
index ab0afa8bd0..68638e631e 100644
--- a/legacy/elementary/src/examples/separator_example_01.c
+++ b/legacy/elementary/src/examples/separator_example_01.c
@@ -9,10 +9,9 @@
9#endif 9#endif
10 10
11EAPI_MAIN int 11EAPI_MAIN int
12elm_main(int argc, char **argv) 12elm_main(int argc __UNUSED__, char **argv __UNUSED__)
13{ 13{
14 Evas_Object *win, *bg, *bx, *rect, *separator; 14 Evas_Object *win, *bg, *bx, *rect, *separator;
15 char buf[256];
16 15
17 win = elm_win_add(NULL, "separator", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "separator", ELM_WIN_BASIC);
18 elm_win_title_set(win, "Separator"); 17 elm_win_title_set(win, "Separator");
diff --git a/legacy/elementary/src/examples/table_example_01.c b/legacy/elementary/src/examples/table_example_01.c
index 35d8eca9b4..6b4e8e015a 100644
--- a/legacy/elementary/src/examples/table_example_01.c
+++ b/legacy/elementary/src/examples/table_example_01.c
@@ -9,7 +9,7 @@
9#endif 9#endif
10 10
11EAPI_MAIN int 11EAPI_MAIN int
12elm_main(int argc, char **argv) 12elm_main(int argc __UNUSED__, char **argv __UNUSED__)
13{ 13{
14 Evas_Object *win, *bg, *label, *table; 14 Evas_Object *win, *bg, *label, *table;
15 15
diff --git a/legacy/elementary/src/examples/table_example_02.c b/legacy/elementary/src/examples/table_example_02.c
index 0d42c340fe..a6b20c8468 100644
--- a/legacy/elementary/src/examples/table_example_02.c
+++ b/legacy/elementary/src/examples/table_example_02.c
@@ -9,7 +9,7 @@
9#endif 9#endif
10 10
11EAPI_MAIN int 11EAPI_MAIN int
12elm_main(int argc, char **argv) 12elm_main(int argc __UNUSED__, char **argv __UNUSED__)
13{ 13{
14 Evas_Object *win, *bg, *rect, *table; 14 Evas_Object *win, *bg, *rect, *table;
15 15
diff --git a/legacy/elementary/src/examples/toolbar_example_03.c b/legacy/elementary/src/examples/toolbar_example_03.c
index 53f6d81b86..a5fef0527b 100644
--- a/legacy/elementary/src/examples/toolbar_example_03.c
+++ b/legacy/elementary/src/examples/toolbar_example_03.c
@@ -24,14 +24,6 @@ _on_done(void *data __UNUSED__,
24 elm_exit(); 24 elm_exit();
25} 25}
26 26
27static void
28_item_pressed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
29{
30 Elm_Object_Item *tb_it = event_info;
31 elm_toolbar_item_state_set(tb_it, elm_toolbar_item_state_next(tb_it));
32 elm_toolbar_item_selected_set(tb_it, EINA_FALSE);
33}
34
35EAPI_MAIN int 27EAPI_MAIN int
36elm_main(int argc __UNUSED__, char **argv __UNUSED__) 28elm_main(int argc __UNUSED__, char **argv __UNUSED__)
37{ 29{
diff --git a/legacy/elementary/src/examples/transit_example_02.c b/legacy/elementary/src/examples/transit_example_02.c
index 86b124e812..96aa12b2c7 100644
--- a/legacy/elementary/src/examples/transit_example_02.c
+++ b/legacy/elementary/src/examples/transit_example_02.c
@@ -8,13 +8,6 @@
8# define __UNUSED__ 8# define __UNUSED__
9#endif 9#endif
10 10
11static void
12on_done(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
13{
14 /* quit the mainloop (elm_run) */
15 elm_exit();
16}
17
18int 11int
19elm_main(int argc __UNUSED__, char **argv __UNUSED__) 12elm_main(int argc __UNUSED__, char **argv __UNUSED__)
20{ 13{
diff --git a/legacy/elementary/src/examples/transit_example_03.c b/legacy/elementary/src/examples/transit_example_03.c
index a14078dc09..331d76de2c 100644
--- a/legacy/elementary/src/examples/transit_example_03.c
+++ b/legacy/elementary/src/examples/transit_example_03.c
@@ -104,7 +104,7 @@ _checkbox_transition_add(Evas_Object *box, const char *label, Eina_Bool *checked
104} 104}
105 105
106static void 106static void
107_transit_start(void *data, Evas_Object *o, void *event_info __UNUSED__) 107_transit_start(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
108{ 108{
109 Elm_Transit *trans = NULL; 109 Elm_Transit *trans = NULL;
110 int i; 110 int i;
@@ -177,9 +177,8 @@ _cb_tween_changed(void *data, Evas_Object *obj, void *event __UNUSED__)
177int 177int
178elm_main(int argc __UNUSED__, char **argv __UNUSED__) 178elm_main(int argc __UNUSED__, char **argv __UNUSED__)
179{ 179{
180 Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *vbox2, *hbox, *btn, *fr; 180 Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *vbox2, *hbox, *btn;
181 Evas_Object *cbox, *dummy, *spinner; 181 Evas_Object *cbox, *dummy, *spinner;
182 Elm_Transit *trans;
183 char buf[PATH_MAX]; 182 char buf[PATH_MAX];
184 int i; 183 int i;
185 struct Context context; 184 struct Context context;
diff --git a/legacy/elementary/src/examples/transit_example_04.c b/legacy/elementary/src/examples/transit_example_04.c
index 5b73fd51e3..576101a9ea 100644
--- a/legacy/elementary/src/examples/transit_example_04.c
+++ b/legacy/elementary/src/examples/transit_example_04.c
@@ -66,7 +66,7 @@ _checkbox_transition_add(Evas_Object *box, const char *label, Eina_Bool *checked
66} 66}
67 67
68static void 68static void
69_transit_start(void *data, Evas_Object *o, void *event_info) 69_transit_start(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
70{ 70{
71 Elm_Transit *trans = NULL; 71 Elm_Transit *trans = NULL;
72 Eina_List *objs = data, *l; 72 Eina_List *objs = data, *l;
@@ -93,8 +93,7 @@ _transit_start(void *data, Evas_Object *o, void *event_info)
93int 93int
94elm_main(int argc __UNUSED__, char **argv __UNUSED__) 94elm_main(int argc __UNUSED__, char **argv __UNUSED__)
95{ 95{
96 Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *btn, *fr, *dummy; 96 Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *btn, *dummy;
97 Elm_Transit *trans;
98 Eina_List *objs = NULL; 97 Eina_List *objs = NULL;
99 char buf[PATH_MAX]; 98 char buf[PATH_MAX];
100 int i; 99 int i;
diff --git a/legacy/elementary/src/examples/web_example.c b/legacy/elementary/src/examples/web_example.c
index 4a5f1da2fb..41d4a774ca 100644
--- a/legacy/elementary/src/examples/web_example.c
+++ b/legacy/elementary/src/examples/web_example.c
@@ -440,6 +440,7 @@ _win_search_trigger_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
440static void 440static void
441default_content_set(Evas_Object *web) 441default_content_set(Evas_Object *web)
442{ 442{
443#ifdef HAVE_ELEMENTARY_WEB
443 Evas_Object *view, *frame; 444 Evas_Object *view, *frame;
444 const char contents[] = "" 445 const char contents[] = ""
445 "<html>\n" 446 "<html>\n"
@@ -454,11 +455,12 @@ default_content_set(Evas_Object *web)
454 " </body>\n" 455 " </body>\n"
455 "</html>\n"; 456 "</html>\n";
456 457
457#ifdef HAVE_ELEMENTARY_WEB
458 view = elm_web_webkit_view_get(web); 458 view = elm_web_webkit_view_get(web);
459 frame = ewk_view_frame_main_get(view); 459 frame = ewk_view_frame_main_get(view);
460 ewk_frame_contents_set(frame, contents, sizeof(contents) - 1, "text/html", 460 ewk_frame_contents_set(frame, contents, sizeof(contents) - 1, "text/html",
461 "UTF-8", NULL); 461 "UTF-8", NULL);
462#else
463 (void) web;
462#endif 464#endif
463} 465}
464 466