kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eo: Rename SIG_* to EV_*. 

Patch by Yakov Goldberg.

SVN revision: 70581
This commit is contained in:
Tom Hacohen 2012-05-01 13:23:30 +00:00
parent 62bafee059
commit e1efeae7a4
13 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/eobj/examples/access/simple.c
View File

@ -10,7 +10,7 @@ typedef struct
int a;
} Private_Data;
EAPI const Eo_Event_Description _SIG_A_CHANGED =
EAPI const Eo_Event_Description _EV_A_CHANGED =
EO_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
#define MY_CLASS SIMPLE_CLASS
@ -27,7 +27,7 @@ _a_set(Eo *obj, void *class_data, va_list *list)
pd->protected.protected_x1 = a + 1;
pd->protected.public.public_x2 = a + 2;
eo_event_callback_call(obj, SIG_A_CHANGED, &pd->a);
eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
}
static void
@ -47,7 +47,7 @@ static const Eo_Op_Description op_desc[] = {
};
static const Eo_Event_Description *event_desc[] = {
SIG_A_CHANGED,
EV_A_CHANGED,
NULL
};

4
legacy/eobj/examples/access/simple.h
View File

@ -19,8 +19,8 @@ typedef struct
#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
extern const Eo_Event_Description _SIG_A_CHANGED;
#define SIG_A_CHANGED (&(_SIG_A_CHANGED))
extern const Eo_Event_Description _EV_A_CHANGED;
#define EV_A_CHANGED (&(_EV_A_CHANGED))
#define SIMPLE_CLASS simple_class_get()
const Eo_Class *simple_class_get(void) EINA_CONST;

2
legacy/eobj/examples/composite_objects/comp.c
View File

@ -25,7 +25,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
Eo *simple = eo_add(SIMPLE_CLASS, obj);
eo_composite_object_attach(obj, simple);
eo_event_callback_forwarder_add(simple, SIG_A_CHANGED, obj);
eo_event_callback_forwarder_add(simple, EV_A_CHANGED, obj);
fail_if(eo_composite_is(obj));
fail_if(!eo_composite_is(simple));

4
legacy/eobj/examples/composite_objects/main.c
View File

@ -27,7 +27,7 @@ main(int argc, char *argv[])
eo_init();
Eo *obj = eo_add(COMP_CLASS, NULL);
eo_event_callback_add(obj, SIG_A_CHANGED, _a_changed_cb, NULL);
eo_event_callback_add(obj, EV_A_CHANGED, _a_changed_cb, NULL);
int a;
eo_do(obj, simple_a_set(1));
@ -40,7 +40,7 @@ main(int argc, char *argv[])
Eo *simple;
eo_do(obj, eo_base_data_get("simple-obj", (void **) &simple));
eo_ref(simple);
eo_event_callback_forwarder_del(simple, SIG_A_CHANGED, obj);
eo_event_callback_forwarder_del(simple, EV_A_CHANGED, obj);
cb_called = EINA_FALSE;
eo_do(obj, simple_a_set(2));

6
legacy/eobj/examples/composite_objects/simple.c
View File

@ -5,7 +5,7 @@
EAPI Eo_Op SIMPLE_BASE_ID = 0;
EAPI const Eo_Event_Description _SIG_A_CHANGED =
EAPI const Eo_Event_Description _EV_A_CHANGED =
EO_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
#define MY_CLASS SIMPLE_CLASS
@ -19,7 +19,7 @@ _a_set(Eo *obj, void *class_data, va_list *list)
printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
pd->a = a;
eo_event_callback_call(obj, SIG_A_CHANGED, &pd->a);
eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
}
static void
@ -50,7 +50,7 @@ static const Eo_Op_Description op_desc[] = {
};
static const Eo_Event_Description *event_desc[] = {
SIG_A_CHANGED,
EV_A_CHANGED,
NULL
};

4
legacy/eobj/examples/composite_objects/simple.h
View File

@ -21,8 +21,8 @@ typedef struct
#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
#define simple_a_get(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EO_TYPECHECK(int *, a)
extern const Eo_Event_Description _SIG_A_CHANGED;
#define SIG_A_CHANGED (&(_SIG_A_CHANGED))
extern const Eo_Event_Description _EV_A_CHANGED;
#define EV_A_CHANGED (&(_EV_A_CHANGED))
#define SIMPLE_CLASS simple_class_get()
const Eo_Class *simple_class_get(void) EINA_CONST;

2
legacy/eobj/examples/evas/elw_boxedbutton.c
View File

@ -22,7 +22,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
Eo *bt = eo_add(ELW_BUTTON_CLASS, obj);
eo_composite_object_attach(obj, bt);
eo_event_callback_forwarder_add(bt, SIG_CLICKED, obj);
eo_event_callback_forwarder_add(bt, EV_CLICKED, obj);
eo_do(bt, evas_obj_visibility_set(EINA_TRUE));
eo_do(obj, elw_box_pack_end(bt));

6
legacy/eobj/examples/evas/elw_button.c
View File

@ -8,7 +8,7 @@
EAPI Eo_Op ELW_BUTTON_BASE_ID = 0;
EAPI const Eo_Event_Description _SIG_CLICKED =
EAPI const Eo_Event_Description _EV_CLICKED =
EO_EVENT_DESCRIPTION("clicked", "", "Called when there was a click.");
typedef struct
@ -44,7 +44,7 @@ _btn_clicked(void *data, Evas_Object *evas_obj, void *event_info)
(void) evas_obj;
(void) event_info;
Eo *obj = data;
eo_event_callback_call(obj, SIG_CLICKED, NULL);
eo_event_callback_call(obj, EV_CLICKED, NULL);
}
static void
@ -92,7 +92,7 @@ static const Eo_Op_Description op_desc[] = {
};
static const Eo_Event_Description *event_desc[] = {
SIG_CLICKED,
EV_CLICKED,
NULL
};

4
legacy/eobj/examples/evas/elw_button.h
View File

@ -20,8 +20,8 @@ enum {
*/
#define elw_button_text_set(text) ELW_BUTTON_ID(ELW_BUTTON_SUB_ID_TEXT_SET), EO_TYPECHECK(const char *, text)
extern const Eo_Event_Description _SIG_CLICKED;
#define SIG_CLICKED (&(_SIG_CLICKED))
extern const Eo_Event_Description _EV_CLICKED;
#define EV_CLICKED (&(_EV_CLICKED))
#define ELW_BUTTON_CLASS elw_button_class_get()
const Eo_Class *elw_button_class_get(void) EINA_CONST;

4
legacy/eobj/examples/evas/test.c
View File

@ -38,7 +38,7 @@ main(int argc, char *argv[])
evas_obj_color_set(255, 0, 0, 255),
elw_button_text_set("Click"),
evas_obj_visibility_set(EINA_TRUE));
eo_event_callback_add(bt, SIG_CLICKED, _btn_clicked_cb, "btn");
eo_event_callback_add(bt, EV_CLICKED, _btn_clicked_cb, "btn");
int r, g, b, a;
eo_do(bt, evas_obj_color_get(&r, &g, &b, &a));
@ -50,7 +50,7 @@ main(int argc, char *argv[])
evas_obj_color_set(0, 0, 255, 255),
elw_button_text_set("Click2"),
evas_obj_visibility_set(EINA_TRUE));
eo_event_callback_add(bx, SIG_CLICKED, _btn_clicked_cb, "bxedbtn");
eo_event_callback_add(bx, EV_CLICKED, _btn_clicked_cb, "bxedbtn");
elm_run();

24
legacy/eobj/examples/signals/main.c
View File

@ -30,37 +30,37 @@ main(int argc, char *argv[])
Simple_Public_Data *pd = eo_data_get(obj, SIMPLE_CLASS);
/* The order of these two is undetermined. */
eo_event_callback_priority_add(obj, SIG_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
eo_event_callback_priority_add(obj, SIG_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
/* This will be called afterwards. */
eo_event_callback_priority_add(obj, SIG_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3);
eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3);
/* This will never be called because the previous callback returns NULL. */
eo_event_callback_priority_add(obj, SIG_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4);
eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4);
eo_do(obj, simple_a_set(1));
fail_if(cb_count != 3);
eo_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 3);
eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 3);
fail_if(pd->cb_count != 3);
fail_if(eo_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 12));
fail_if(eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 12));
fail_if(pd->cb_count != 3);
fail_if(4 != (int) eo_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 4));
fail_if(4 != (int) eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 4));
fail_if(pd->cb_count != 2);
eo_event_callback_del_lazy(obj, SIG_A_CHANGED, _a_changed_cb);
eo_event_callback_del_lazy(obj, EV_A_CHANGED, _a_changed_cb);
fail_if(pd->cb_count != 1);
fail_if(eo_event_callback_del_lazy(obj, SIG_A_CHANGED, NULL));
fail_if(eo_event_callback_del_lazy(obj, EV_A_CHANGED, NULL));
fail_if(pd->cb_count != 1);
fail_if(eo_event_callback_del(obj, SIG_A_CHANGED, NULL, 0));
fail_if(eo_event_callback_del(obj, EV_A_CHANGED, NULL, 0));
fail_if(pd->cb_count != 1);
eo_event_callback_del_lazy(obj, SIG_A_CHANGED, _a_changed_cb);
eo_event_callback_del_lazy(obj, EV_A_CHANGED, _a_changed_cb);
fail_if(pd->cb_count != 0);
fail_if(eo_event_callback_del_lazy(obj, SIG_A_CHANGED, _a_changed_cb));
fail_if(eo_event_callback_del_lazy(obj, EV_A_CHANGED, _a_changed_cb));
fail_if(pd->cb_count != 0);
eo_unref(obj);

14
legacy/eobj/examples/signals/simple.c
View File

@ -11,7 +11,7 @@ typedef struct
int a;
} Private_Data;
EAPI const Eo_Event_Description _SIG_A_CHANGED =
EAPI const Eo_Event_Description _EV_A_CHANGED =
EO_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
#define MY_CLASS SIMPLE_CLASS
@ -25,7 +25,7 @@ _a_set(Eo *obj, void *class_data, va_list *list)
pd->a = a;
printf("%s %d\n", __func__, pd->a);
eo_event_callback_call(obj, SIG_A_CHANGED, &pd->a);
eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
}
Eina_Bool
@ -36,12 +36,12 @@ _cb_added(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_inf
(void) data;
(void) desc;
if (cb_desc != SIG_A_CHANGED)
if (cb_desc != EV_A_CHANGED)
return EINA_TRUE;
pd->cb_count++;
printf("Added SIG_A_CHANGED callback to %p. Count: %d\n", obj, pd->cb_count);
printf("Added EV_A_CHANGED callback to %p. Count: %d\n", obj, pd->cb_count);
return EO_CALLBACK_CONTINUE;
}
@ -53,12 +53,12 @@ _cb_deled(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_inf
(void) data;
(void) desc;
if (cb_desc != SIG_A_CHANGED)
if (cb_desc != EV_A_CHANGED)
return EINA_TRUE;
pd->cb_count--;
printf("Removed SIG_A_CHANGED callback from %p. Count: %d\n", obj, pd->cb_count);
printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", obj, pd->cb_count);
return EO_CALLBACK_CONTINUE;
}
@ -90,7 +90,7 @@ static const Eo_Op_Description op_desc[] = {
};
static const Eo_Event_Description *event_desc[] = {
SIG_A_CHANGED,
EV_A_CHANGED,
NULL
};

4
legacy/eobj/examples/signals/simple.h
View File

@ -24,8 +24,8 @@ typedef struct
*/
#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
extern const Eo_Event_Description _SIG_A_CHANGED;
#define SIG_A_CHANGED (&(_SIG_A_CHANGED))
extern const Eo_Event_Description _EV_A_CHANGED;
#define EV_A_CHANGED (&(_EV_A_CHANGED))
#define SIMPLE_CLASS simple_class_get()
const Eo_Class *simple_class_get(void) EINA_CONST;