summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_callbacks.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-01 18:06:28 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 09:58:08 +0000
commitf21ade6123b9053fca8d1632644c48525a99d6e0 (patch)
treec5eb0445f471d21365a7a5a7b0ec7d279c11b398 /src/lib/evas/canvas/evas_callbacks.c
parent3faf3f3fc68a839f06b311c35ba020cb25e7c9c4 (diff)
Automatic migration to Eo4.
I just ran my script (email to follow) to migrate all of the EFL automatically. This commit is *only* the automatic conversion, so it can be easily reverted and re-run.
Diffstat (limited to 'src/lib/evas/canvas/evas_callbacks.c')
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c26
1 files changed, 10 insertions, 16 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index d4d5789..db08309 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -128,8 +128,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj)
128 if (!obj->callbacks) return; 128 if (!obj->callbacks) return;
129 EINA_INLIST_FOREACH_SAFE(obj->callbacks, itr, info) 129 EINA_INLIST_FOREACH_SAFE(obj->callbacks, itr, info)
130 { 130 {
131 eo_do(eo_obj, eo_event_callback_del( 131 eo_event_callback_del(eo_obj, _legacy_evas_callback_table[info->type], _eo_evas_object_cb, info);
132 _legacy_evas_callback_table[info->type], _eo_evas_object_cb, info));
133 132
134 obj->callbacks = 133 obj->callbacks =
135 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); 134 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
@@ -155,8 +154,7 @@ evas_event_callback_all_del(Evas *eo_e)
155 154
156 EINA_INLIST_FOREACH_SAFE(e->callbacks, itr, info) 155 EINA_INLIST_FOREACH_SAFE(e->callbacks, itr, info)
157 { 156 {
158 eo_do(eo_e, eo_event_callback_del( 157 eo_event_callback_del(eo_e, _legacy_evas_callback_table[info->type], _eo_evas_cb, info);
159 _legacy_evas_callback_table[info->type], _eo_evas_cb, info));
160 158
161 e->callbacks = 159 e->callbacks =
162 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); 160 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
@@ -173,7 +171,7 @@ evas_event_callback_cleanup(Evas *eo_e)
173void 171void
174evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info) 172evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
175{ 173{
176 eo_do(eo_e, eo_event_callback_call(_legacy_evas_callback_table[type], event_info)); 174 eo_event_callback_call(eo_e, _legacy_evas_callback_table[type], event_info);
177} 175}
178 176
179void 177void
@@ -239,7 +237,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
239 break; 237 break;
240 } 238 }
241 239
242 eo_do(eo_obj, eo_event_callback_call(_legacy_evas_callback_table[type], event_info)); 240 eo_event_callback_call(eo_obj, _legacy_evas_callback_table[type], event_info);
243 241
244 if (type == EVAS_CALLBACK_MOUSE_DOWN) 242 if (type == EVAS_CALLBACK_MOUSE_DOWN)
245 { 243 {
@@ -291,7 +289,7 @@ evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type
291 cb_info->type = type; 289 cb_info->type = type;
292 290
293 const Eo_Event_Description *desc = _legacy_evas_callback_table[type]; 291 const Eo_Event_Description *desc = _legacy_evas_callback_table[type];
294 eo_do(eo_obj, eo_event_callback_priority_add(desc, priority, _eo_evas_object_cb, cb_info)); 292 eo_event_callback_priority_add(eo_obj, desc, priority, _eo_evas_object_cb, cb_info);
295 293
296 obj->callbacks = 294 obj->callbacks =
297 eina_inlist_append(obj->callbacks, EINA_INLIST_GET(cb_info)); 295 eina_inlist_append(obj->callbacks, EINA_INLIST_GET(cb_info));
@@ -317,8 +315,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
317 if ((info->func == func) && (info->type == type)) 315 if ((info->func == func) && (info->type == type))
318 { 316 {
319 void *tmp = info->data; 317 void *tmp = info->data;
320 eo_do(eo_obj, eo_event_callback_del( 318 eo_event_callback_del(eo_obj, _legacy_evas_callback_table[type], _eo_evas_object_cb, info);
321 _legacy_evas_callback_table[type], _eo_evas_object_cb, info));
322 319
323 obj->callbacks = 320 obj->callbacks =
324 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); 321 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
@@ -349,8 +346,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
349 if ((info->func == func) && (info->type == type) && info->data == data) 346 if ((info->func == func) && (info->type == type) && info->data == data)
350 { 347 {
351 void *tmp = info->data; 348 void *tmp = info->data;
352 eo_do(eo_obj, eo_event_callback_del( 349 eo_event_callback_del(eo_obj, _legacy_evas_callback_table[type], _eo_evas_object_cb, info);
353 _legacy_evas_callback_table[type], _eo_evas_object_cb, info));
354 350
355 obj->callbacks = 351 obj->callbacks =
356 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); 352 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
@@ -385,7 +381,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb
385 cb_info->type = type; 381 cb_info->type = type;
386 382
387 const Eo_Event_Description *desc = _legacy_evas_callback_table[type]; 383 const Eo_Event_Description *desc = _legacy_evas_callback_table[type];
388 eo_do(eo_e, eo_event_callback_priority_add(desc, priority, _eo_evas_cb, cb_info)); 384 eo_event_callback_priority_add(eo_e, desc, priority, _eo_evas_cb, cb_info);
389 385
390 e->callbacks = eina_inlist_append(e->callbacks, EINA_INLIST_GET(cb_info)); 386 e->callbacks = eina_inlist_append(e->callbacks, EINA_INLIST_GET(cb_info));
391} 387}
@@ -410,8 +406,7 @@ evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func)
410 if ((info->func == func) && (info->type == type)) 406 if ((info->func == func) && (info->type == type))
411 { 407 {
412 void *tmp = info->data; 408 void *tmp = info->data;
413 eo_do(eo_e, eo_event_callback_del( 409 eo_event_callback_del(eo_e, _legacy_evas_callback_table[type], _eo_evas_cb, info);
414 _legacy_evas_callback_table[type], _eo_evas_cb, info));
415 410
416 e->callbacks = 411 e->callbacks =
417 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); 412 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
@@ -442,8 +437,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb
442 if ((info->func == func) && (info->type == type) && (info->data == data)) 437 if ((info->func == func) && (info->type == type) && (info->data == data))
443 { 438 {
444 void *tmp = info->data; 439 void *tmp = info->data;
445 eo_do(eo_e, eo_event_callback_del( 440 eo_event_callback_del(eo_e, _legacy_evas_callback_table[type], _eo_evas_cb, info);
446 _legacy_evas_callback_table[type], _eo_evas_cb, info));
447 441
448 e->callbacks = 442 e->callbacks =
449 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); 443 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));