summaryrefslogtreecommitdiff
path: root/src/lib/eio
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-10 15:23:04 +0100
committerTom Hacohen <tom@stosb.com>2016-08-11 17:04:43 +0100
commitc662934be8bcbaba60d1688e77533acbea5d09b9 (patch)
tree8e12b5ffd083024f09b7ec7fa9f979113056fb9d /src/lib/eio
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/lib/eio')
-rw-r--r--src/lib/eio/efl_io_manager.c16
-rw-r--r--src/lib/eio/efl_io_manager.eo6
-rw-r--r--src/lib/eio/eio_main.c2
-rw-r--r--src/lib/eio/eio_model.c18
-rw-r--r--src/lib/eio/eio_model.eo8
-rw-r--r--src/lib/eio/eio_sentry.c14
-rw-r--r--src/lib/eio/eio_sentry.eo6
7 files changed, 35 insertions, 35 deletions
diff --git a/src/lib/eio/efl_io_manager.c b/src/lib/eio/efl_io_manager.c
index 436f652085..a1f94d485e 100644
--- a/src/lib/eio/efl_io_manager.c
+++ b/src/lib/eio/efl_io_manager.c
@@ -110,7 +110,7 @@ _file_error_cb(void *data, Eio_File *handler EINA_UNUSED, int error)
110/* Basic listing callbacks */ 110/* Basic listing callbacks */
111 111
112static Eina_Bool 112static Eina_Bool
113_file_ls_filter_cb_helper(const Eo_Event_Description *event, void *data, const char *file) 113_file_ls_filter_cb_helper(const Efl_Event_Description *event, void *data, const char *file)
114{ 114{
115 Job_Closure *operation = data; 115 Job_Closure *operation = data;
116 116
@@ -124,7 +124,7 @@ _file_ls_filter_cb_helper(const Eo_Event_Description *event, void *data, const c
124 event_info->file = file; 124 event_info->file = file;
125 event_info->filter = EINA_FALSE; 125 event_info->filter = EINA_FALSE;
126 126
127 eo_event_callback_call(operation->pdata->object, event, event_info); 127 efl_event_callback_call(operation->pdata->object, event, event_info);
128 128
129 Eina_Bool filter = event_info->filter; 129 Eina_Bool filter = event_info->filter;
130 130
@@ -213,7 +213,7 @@ _file_direct_ls_filter_cb(void *data, Eio_File *handle EINA_UNUSED, const Eina_F
213 event_info.info = info; 213 event_info.info = info;
214 event_info.filter = EINA_FALSE; 214 event_info.filter = EINA_FALSE;
215 215
216 eo_event_callback_call(operation->pdata->object, EFL_IO_MANAGER_EVENT_FILTER_DIRECT, &event_info); 216 efl_event_callback_call(operation->pdata->object, EFL_IO_MANAGER_EVENT_FILTER_DIRECT, &event_info);
217 217
218 Eina_Bool filter = event_info.filter; 218 Eina_Bool filter = event_info.filter;
219 219
@@ -579,10 +579,10 @@ _efl_io_manager_file_close(Eo *obj,
579 operation_data->file = handle; 579 operation_data->file = handle;
580} 580}
581 581
582static Eo_Base* 582static Efl_Object*
583_efl_io_manager_eo_base_constructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED) 583_efl_io_manager_efl_object_constructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED)
584{ 584{
585 obj = eo_constructor(eo_super(obj, EFL_IO_MANAGER_CLASS)); 585 obj = efl_constructor(eo_super(obj, EFL_IO_MANAGER_CLASS));
586 586
587 pd->object = obj; 587 pd->object = obj;
588 pd->operations = NULL; 588 pd->operations = NULL;
@@ -591,9 +591,9 @@ _efl_io_manager_eo_base_constructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED
591} 591}
592 592
593static void 593static void
594_efl_io_manager_eo_base_destructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED) 594_efl_io_manager_efl_object_destructor(Eo *obj, Efl_Io_Manager_Data *pd EINA_UNUSED)
595{ 595{
596 eo_destructor(eo_super(obj, EFL_IO_MANAGER_CLASS)); 596 efl_destructor(eo_super(obj, EFL_IO_MANAGER_CLASS));
597 597
598 // FIXME: cancel all pending promise 598 // FIXME: cancel all pending promise
599} 599}
diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index a89f59dd9b..f41a176757 100644
--- a/src/lib/eio/efl_io_manager.eo
+++ b/src/lib/eio/efl_io_manager.eo
@@ -29,7 +29,7 @@ struct Eio.Xattr.Data
29 29
30// FIXME: We should send list of stuff in progress not single item, callback cost is to high 30// FIXME: We should send list of stuff in progress not single item, callback cost is to high
31 31
32class Efl.Io.Manager (Eo.Base) 32class Efl.Io.Manager (Efl.Object)
33{ 33{
34 [[Class representing an asynchronous file operation.]] 34 [[Class representing an asynchronous file operation.]]
35 35
@@ -144,7 +144,7 @@ class Efl.Io.Manager (Eo.Base)
144 } 144 }
145 145
146 implements { 146 implements {
147 Eo.Base.constructor; 147 Efl.Object.constructor;
148 Eo.Base.destructor; 148 Efl.Object.destructor;
149 } 149 }
150} 150}
diff --git a/src/lib/eio/eio_main.c b/src/lib/eio/eio_main.c
index 7f11a08d85..4f5ca4667a 100644
--- a/src/lib/eio/eio_main.c
+++ b/src/lib/eio/eio_main.c
@@ -358,7 +358,7 @@ eio_shutdown(void)
358 EINA_LOG_STATE_START, 358 EINA_LOG_STATE_START,
359 EINA_LOG_STATE_SHUTDOWN); 359 EINA_LOG_STATE_SHUTDOWN);
360 360
361 eo_del(io_manager); 361 efl_del(io_manager);
362 io_manager = NULL; 362 io_manager = NULL;
363 363
364 EINA_LIST_FOREACH(tracked_thread, l, f) 364 EINA_LIST_FOREACH(tracked_thread, l, f)
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index d460199111..00b83c72eb 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -95,7 +95,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED)
95 eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]); 95 eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]);
96 evt.changed_properties = properties; 96 evt.changed_properties = properties;
97 97
98 eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 98 efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
99 eina_array_free(properties); 99 eina_array_free(properties);
100} 100}
101 101
@@ -180,7 +180,7 @@ _efl_model_evt_added_ecore_cb(void *data, int type, void *event)
180 eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata); 180 eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata);
181 eina_value_flush(&path); 181 eina_value_flush(&path);
182 182
183 eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt); 183 efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt);
184 184
185 return EINA_TRUE; 185 return EINA_TRUE;
186} 186}
@@ -213,7 +213,7 @@ _efl_model_evt_deleted_ecore_cb(void *data, int type, void *event)
213 cevt.index = i; 213 cevt.index = i;
214 cevt.child = cur->data; 214 cevt.child = cur->data;
215 215
216 eo_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt); 216 efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt);
217 217
218 priv->children_list = eina_list_remove_list(priv->children_list, cur); 218 priv->children_list = eina_list_remove_list(priv->children_list, cur);
219 eo_unref(cevt.child); 219 eo_unref(cevt.child);
@@ -649,9 +649,9 @@ _eio_model_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data *pri
649 * Class definitions 649 * Class definitions
650 */ 650 */
651static Eo * 651static Eo *
652_eio_model_eo_base_constructor(Eo *obj, Eio_Model_Data *priv) 652_eio_model_efl_object_constructor(Eo *obj, Eio_Model_Data *priv)
653{ 653{
654 obj = eo_constructor(eo_super(obj, MY_CLASS)); 654 obj = efl_constructor(eo_super(obj, MY_CLASS));
655 unsigned int i; 655 unsigned int i;
656 priv->obj = obj; 656 priv->obj = obj;
657 priv->is_listed = priv->is_listing = EINA_FALSE; 657 priv->is_listed = priv->is_listing = EINA_FALSE;
@@ -675,7 +675,7 @@ _eio_model_path_set(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, const char *path)
675} 675}
676 676
677static void 677static void
678_eio_model_eo_base_destructor(Eo *obj , Eio_Model_Data *priv) 678_eio_model_efl_object_destructor(Eo *obj , Eio_Model_Data *priv)
679{ 679{
680 Eo *child; 680 Eo *child;
681 681
@@ -690,14 +690,14 @@ _eio_model_eo_base_destructor(Eo *obj , Eio_Model_Data *priv)
690 eo_unref(child); 690 eo_unref(child);
691 691
692 eina_stringshare_del(priv->path); 692 eina_stringshare_del(priv->path);
693 eo_destructor(eo_super(obj, MY_CLASS)); 693 efl_destructor(eo_super(obj, MY_CLASS));
694} 694}
695 695
696 696
697static Eo * 697static Eo *
698_eio_model_eo_base_parent_get(Eo *obj , Eio_Model_Data *priv) 698_eio_model_efl_object_parent_get(Eo *obj , Eio_Model_Data *priv)
699{ 699{
700 Eo *model = eo_parent_get(eo_super(obj, MY_CLASS)); 700 Eo *model = efl_parent_get(eo_super(obj, MY_CLASS));
701 701
702 if (model == NULL || !eo_isa(model, EFL_MODEL_INTERFACE)) 702 if (model == NULL || !eo_isa(model, EFL_MODEL_INTERFACE))
703 { 703 {
diff --git a/src/lib/eio/eio_model.eo b/src/lib/eio/eio_model.eo
index b730665fbe..5cbde595a4 100644
--- a/src/lib/eio/eio_model.eo
+++ b/src/lib/eio/eio_model.eo
@@ -1,6 +1,6 @@
1type @extern Eio_Filter_Direct_Cb: __undefined_type; 1type @extern Eio_Filter_Direct_Cb: __undefined_type;
2 2
3class Eio.Model (Eo.Base, Efl.Model) 3class Eio.Model (Efl.Object, Efl.Model)
4{ 4{
5 [[Eio model class]] 5 [[Eio model class]]
6 6
@@ -34,9 +34,9 @@ class Eio.Model (Eo.Base, Efl.Model)
34 } 34 }
35 } 35 }
36 implements { 36 implements {
37 Eo.Base.constructor; 37 Efl.Object.constructor;
38 Eo.Base.destructor; 38 Efl.Object.destructor;
39 Eo.Base.parent.get; 39 Efl.Object.parent.get;
40 Efl.Model.properties.get; 40 Efl.Model.properties.get;
41 Efl.Model.property_set; 41 Efl.Model.property_set;
42 Efl.Model.property_get; 42 Efl.Model.property_get;
diff --git a/src/lib/eio/eio_sentry.c b/src/lib/eio/eio_sentry.c
index c0bf7b1d49..cc3f9429fe 100644
--- a/src/lib/eio/eio_sentry.c
+++ b/src/lib/eio/eio_sentry.c
@@ -28,7 +28,7 @@
28#include "eio_sentry_private.h" 28#include "eio_sentry_private.h"
29 29
30 30
31static const Eo_Event_Description* 31static const Efl_Event_Description*
32_translate_event(int input_event) 32_translate_event(int input_event)
33{ 33{
34 if (input_event == EIO_MONITOR_FILE_CREATED) 34 if (input_event == EIO_MONITOR_FILE_CREATED)
@@ -63,7 +63,7 @@ _handle_event(void *data, int type, void *event)
63 EINA_SAFETY_ON_NULL_RETURN_VAL(data, ECORE_CALLBACK_PASS_ON); 63 EINA_SAFETY_ON_NULL_RETURN_VAL(data, ECORE_CALLBACK_PASS_ON);
64 EINA_SAFETY_ON_NULL_RETURN_VAL(event, ECORE_CALLBACK_PASS_ON); 64 EINA_SAFETY_ON_NULL_RETURN_VAL(event, ECORE_CALLBACK_PASS_ON);
65 65
66 const Eo_Event_Description* translated_event = _translate_event(type); 66 const Efl_Event_Description* translated_event = _translate_event(type);
67 Eio_Sentry_Data *pd = (Eio_Sentry_Data *)data; 67 Eio_Sentry_Data *pd = (Eio_Sentry_Data *)data;
68 Eio_Monitor_Event *monitor_event = (Eio_Monitor_Event *)event; 68 Eio_Monitor_Event *monitor_event = (Eio_Monitor_Event *)event;
69 69
@@ -73,7 +73,7 @@ _handle_event(void *data, int type, void *event)
73 event_info->source = eio_monitor_path_get(monitor_event->monitor); 73 event_info->source = eio_monitor_path_get(monitor_event->monitor);
74 event_info->trigger = monitor_event->filename; 74 event_info->trigger = monitor_event->filename;
75 75
76 eo_event_callback_call(pd->object, translated_event, event_info); 76 efl_event_callback_call(pd->object, translated_event, event_info);
77 77
78 // If event was error, we must delete the monitor. 78 // If event was error, we must delete the monitor.
79 if (type == EIO_MONITOR_ERROR) 79 if (type == EIO_MONITOR_ERROR)
@@ -145,9 +145,9 @@ _eio_sentry_del(Eo *obj EINA_UNUSED, Eio_Sentry_Data *pd, const char *path)
145 eina_hash_del(pd->targets, path, NULL); 145 eina_hash_del(pd->targets, path, NULL);
146} 146}
147 147
148Eo_Base * _eio_sentry_eo_base_constructor(Eo *obj, Eio_Sentry_Data *pd) 148Efl_Object * _eio_sentry_efl_object_constructor(Eo *obj, Eio_Sentry_Data *pd)
149{ 149{
150 obj = eo_constructor(eo_super(obj, EIO_SENTRY_CLASS)); 150 obj = efl_constructor(eo_super(obj, EIO_SENTRY_CLASS));
151 151
152 pd->object = obj; 152 pd->object = obj;
153 pd->targets = eina_hash_string_small_new((Eina_Free_Cb)&eio_monitor_del); 153 pd->targets = eina_hash_string_small_new((Eina_Free_Cb)&eio_monitor_del);
@@ -156,11 +156,11 @@ Eo_Base * _eio_sentry_eo_base_constructor(Eo *obj, Eio_Sentry_Data *pd)
156 return obj; 156 return obj;
157} 157}
158 158
159void _eio_sentry_eo_base_destructor(Eo *obj, Eio_Sentry_Data *pd) 159void _eio_sentry_efl_object_destructor(Eo *obj, Eio_Sentry_Data *pd)
160{ 160{
161 eina_hash_free(pd->targets); 161 eina_hash_free(pd->targets);
162 162
163 eo_destructor(eo_super(obj, EIO_SENTRY_CLASS)); 163 efl_destructor(eo_super(obj, EIO_SENTRY_CLASS));
164} 164}
165 165
166#include "eio_sentry.eo.c" 166#include "eio_sentry.eo.c"
diff --git a/src/lib/eio/eio_sentry.eo b/src/lib/eio/eio_sentry.eo
index 4737e08015..8948358c7c 100644
--- a/src/lib/eio/eio_sentry.eo
+++ b/src/lib/eio/eio_sentry.eo
@@ -7,7 +7,7 @@ struct Eio.Sentry.Event
7 source: string; [[The original monitored path.]] 7 source: string; [[The original monitored path.]]
8} 8}
9 9
10class Eio.Sentry (Eo.Base) 10class Eio.Sentry (Efl.Object)
11{ 11{
12 [[Monitors files and directories for changes.]] 12 [[Monitors files and directories for changes.]]
13 13
@@ -41,7 +41,7 @@ class Eio.Sentry (Eo.Base)
41 } 41 }
42 42
43 implements { 43 implements {
44 Eo.Base.constructor; 44 Efl.Object.constructor;
45 Eo.Base.destructor; 45 Efl.Object.destructor;
46 } 46 }
47} 47}