enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

* edje: Fix naming for amalgamation and make static functions 

that should.


SVN revision: 46394
This commit is contained in:
Cedric BAIL 2010-02-23 15:55:04 +00:00
parent 51de26862a
commit 3eaea2b9fa
2 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
legacy/edje/src/lib/edje_callbacks.c
View File

@ -4,8 +4,8 @@
#include "edje_private.h" #include "edje_private.h"
void static void
_edje_hold_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) _edje_hold_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
{ {
Evas_Event_Hold *ev; Evas_Event_Hold *ev;
Edje *ed; Edje *ed;
@ -23,8 +23,8 @@ _edje_hold_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
e = NULL; e = NULL;
} }
void static void
_edje_focus_in_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) _edje_focus_in_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
@ -39,8 +39,8 @@ _edje_focus_in_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
e = NULL; e = NULL;
} }
void static void
_edje_focus_out_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) _edje_focus_out_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
@ -55,8 +55,8 @@ _edje_focus_out_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
e = NULL; e = NULL;
} }
void static void
_edje_mouse_in_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) _edje_mouse_in_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
{ {
Evas_Event_Mouse_In *ev; Evas_Event_Mouse_In *ev;
Edje *ed; Edje *ed;
@ -73,8 +73,8 @@ _edje_mouse_in_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
e = NULL; e = NULL;
} }
void static void
_edje_mouse_out_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) _edje_mouse_out_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
{ {
Evas_Event_Mouse_Out *ev; Evas_Event_Mouse_Out *ev;
Edje *ed; Edje *ed;
@ -91,8 +91,8 @@ _edje_mouse_out_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
e = NULL; e = NULL;
} }
void static void
_edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) _edje_mouse_down_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
{ {
Evas_Event_Mouse_Down *ev; Evas_Event_Mouse_Down *ev;
Edje *ed; Edje *ed;
@ -207,8 +207,8 @@ _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
e = NULL; e = NULL;
} }
void static void
_edje_mouse_up_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) _edje_mouse_up_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
{ {
Evas_Event_Mouse_Up *ev; Evas_Event_Mouse_Up *ev;
Edje *ed; Edje *ed;
@ -275,8 +275,8 @@ _edje_mouse_up_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
e = NULL; e = NULL;
} }
void static void
_edje_mouse_move_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) _edje_mouse_move_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
{ {
Evas_Event_Mouse_Move *ev; Evas_Event_Mouse_Move *ev;
Edje *ed; Edje *ed;
@ -354,8 +354,8 @@ _edje_mouse_move_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
e = NULL; e = NULL;
} }
void static void
_edje_mouse_wheel_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) _edje_mouse_wheel_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
{ {
Evas_Event_Mouse_Wheel *ev; Evas_Event_Mouse_Wheel *ev;
Edje *ed; Edje *ed;
@ -468,31 +468,31 @@ _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
{ {
evas_object_event_callback_add(obj, evas_object_event_callback_add(obj,
EVAS_CALLBACK_HOLD, EVAS_CALLBACK_HOLD,
_edje_hold_cb, _edje_hold_signal_cb,
ed); ed);
evas_object_event_callback_add(obj, evas_object_event_callback_add(obj,
EVAS_CALLBACK_MOUSE_IN, EVAS_CALLBACK_MOUSE_IN,
_edje_mouse_in_cb, _edje_mouse_in_signal_cb,
ed); ed);
evas_object_event_callback_add(obj, evas_object_event_callback_add(obj,
EVAS_CALLBACK_MOUSE_OUT, EVAS_CALLBACK_MOUSE_OUT,
_edje_mouse_out_cb, _edje_mouse_out_signal_cb,
ed); ed);
evas_object_event_callback_add(obj, evas_object_event_callback_add(obj,
EVAS_CALLBACK_MOUSE_DOWN, EVAS_CALLBACK_MOUSE_DOWN,
_edje_mouse_down_cb, _edje_mouse_down_signal_cb,
ed); ed);
evas_object_event_callback_add(obj, evas_object_event_callback_add(obj,
EVAS_CALLBACK_MOUSE_UP, EVAS_CALLBACK_MOUSE_UP,
_edje_mouse_up_cb, _edje_mouse_up_signal_cb,
ed); ed);
evas_object_event_callback_add(obj, evas_object_event_callback_add(obj,
EVAS_CALLBACK_MOUSE_MOVE, EVAS_CALLBACK_MOUSE_MOVE,
_edje_mouse_move_cb, _edje_mouse_move_signal_cb,
ed); ed);
evas_object_event_callback_add(obj, evas_object_event_callback_add(obj,
EVAS_CALLBACK_MOUSE_WHEEL, EVAS_CALLBACK_MOUSE_WHEEL,
_edje_mouse_wheel_cb, _edje_mouse_wheel_signal_cb,
ed); ed);
evas_object_data_set(obj, "real_part", rp); evas_object_data_set(obj, "real_part", rp);
} }
@ -502,31 +502,31 @@ _edje_callbacks_del(Evas_Object *obj, Edje *ed)
{ {
evas_object_event_callback_del_full(obj, evas_object_event_callback_del_full(obj,
EVAS_CALLBACK_HOLD, EVAS_CALLBACK_HOLD,
_edje_hold_cb, _edje_hold_signal_cb,
ed); ed);
evas_object_event_callback_del_full(obj, evas_object_event_callback_del_full(obj,
EVAS_CALLBACK_MOUSE_IN, EVAS_CALLBACK_MOUSE_IN,
_edje_mouse_in_cb, _edje_mouse_in_signal_cb,
ed); ed);
evas_object_event_callback_del_full(obj, evas_object_event_callback_del_full(obj,
EVAS_CALLBACK_MOUSE_OUT, EVAS_CALLBACK_MOUSE_OUT,
_edje_mouse_out_cb, _edje_mouse_out_signal_cb,
ed); ed);
evas_object_event_callback_del_full(obj, evas_object_event_callback_del_full(obj,
EVAS_CALLBACK_MOUSE_DOWN, EVAS_CALLBACK_MOUSE_DOWN,
_edje_mouse_down_cb, _edje_mouse_down_signal_cb,
ed); ed);
evas_object_event_callback_del_full(obj, evas_object_event_callback_del_full(obj,
EVAS_CALLBACK_MOUSE_UP, EVAS_CALLBACK_MOUSE_UP,
_edje_mouse_up_cb, _edje_mouse_up_signal_cb,
ed); ed);
evas_object_event_callback_del_full(obj, evas_object_event_callback_del_full(obj,
EVAS_CALLBACK_MOUSE_MOVE, EVAS_CALLBACK_MOUSE_MOVE,
_edje_mouse_move_cb, _edje_mouse_move_signal_cb,
ed); ed);
evas_object_event_callback_del_full(obj, evas_object_event_callback_del_full(obj,
EVAS_CALLBACK_MOUSE_WHEEL, EVAS_CALLBACK_MOUSE_WHEEL,
_edje_mouse_wheel_cb, _edje_mouse_wheel_signal_cb,
ed); ed);
evas_object_data_del(obj, "real_part"); evas_object_data_del(obj, "real_part");
} }
@ -536,11 +536,11 @@ _edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
{ {
evas_object_event_callback_add(obj, evas_object_event_callback_add(obj,
EVAS_CALLBACK_FOCUS_IN, EVAS_CALLBACK_FOCUS_IN,
_edje_focus_in_cb, _edje_focus_in_signal_cb,
ed); ed);
evas_object_event_callback_add(obj, evas_object_event_callback_add(obj,
EVAS_CALLBACK_FOCUS_OUT, EVAS_CALLBACK_FOCUS_OUT,
_edje_focus_out_cb, _edje_focus_out_signal_cb,
ed); ed);
evas_object_data_set(obj, "real_part", rp); evas_object_data_set(obj, "real_part", rp);
} }
@ -550,10 +550,10 @@ _edje_callbacks_focus_del(Evas_Object *obj, Edje *ed)
{ {
evas_object_event_callback_del_full(obj, evas_object_event_callback_del_full(obj,
EVAS_CALLBACK_FOCUS_IN, EVAS_CALLBACK_FOCUS_IN,
_edje_focus_in_cb, _edje_focus_in_signal_cb,
ed); ed);
evas_object_event_callback_del_full(obj, evas_object_event_callback_del_full(obj,
EVAS_CALLBACK_FOCUS_OUT, EVAS_CALLBACK_FOCUS_OUT,
_edje_focus_out_cb, _edje_focus_out_signal_cb,
ed); ed);
} }

6
legacy/edje/src/lib/edje_private.h
View File

@ -1220,12 +1220,6 @@ void _edje_part_recalc_1(Edje *ed, Edje_Real_Part *ep);
int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y); int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y);
void _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y); void _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y);
void _edje_mouse_in_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
void _edje_mouse_out_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
void _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
void _edje_mouse_up_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
void _edje_mouse_move_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
void _edje_mouse_wheel_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
int _edje_timer_cb(void *data); int _edje_timer_cb(void *data);
int _edje_pending_timer_cb(void *data); int _edje_pending_timer_cb(void *data);
void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp); void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp);