yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=ecc4612f44a760e35fb07123554efe9fec0c7e6c
commit ecc4612f44a760e35fb07123554efe9fec0c7e6c
Author: Yakov Goldberg <yako...@samsung.com>
Date: Wed Mar 2 17:53:15 2016 +0200
Update tests
---
src/tests/data/demo.c.ref | 132 ++++++++++++++--------------
src/tests/data/test_resources_cbs.c.ref | 8 +-
src/tests/data/test_resources_edjes.c.ref | 2 +-
src/tests/data/test_resources_images.c.ref | 2 +-
src/tests/data/test_widgets.c.ref | 2 +-
src/tests/data/test_widgets_create_cb.c.ref | 4 +-
src/tests/data/test_widgets_modify_cb.c.ref | 4 +-
7 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/src/tests/data/demo.c.ref b/src/tests/data/demo.c.ref
index 78488d7..a8fd3e7 100644
--- a/src/tests/data/demo.c.ref
+++ b/src/tests/data/demo.c.ref
@@ -25,55 +25,55 @@ static Egui_Layout_Widgets g_pub_widgets;
#endif
extern Eina_Bool
-_itemview_item_add_but_clicked_cb(void *data, Eo *obj, const
Eo_Event_Description *desc, void *event_info);
+_itemview_item_add_but_clicked_cb(void *data, const Eo_Event *event);
extern Eina_Bool
-_itemview_item_nested_add_but_clicked_cb(void *data, Eo *obj, const
Eo_Event_Description *desc, void *event_info);
+_itemview_item_nested_add_but_clicked_cb(void *data, const Eo_Event *event);
extern Eina_Bool
-_itemview_separator_add_but_clicked_cb(void *data, Eo *obj, const
Eo_Event_Description *desc, void *event_info);
+_itemview_separator_add_but_clicked_cb(void *data, const Eo_Event *event);
extern Eina_Bool
-_itemview_item_del_but_clicked_cb(void *data, Eo *obj, const
Eo_Event_Description *desc, void *event_info);
+_itemview_item_del_but_clicked_cb(void *data, const Eo_Event *event);
extern Eina_Bool
-_rm_add_button_clicked(void *data, Eo *obj, const Eo_Event_Description *desc,
void *event_info);
+_rm_add_button_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_settings_apply_button_clicked(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_settings_apply_button_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_settings_apply_button_enable(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_settings_apply_button_enable(void *data, const Eo_Event *event);
extern Eina_Bool
-_settings_win_request_delete(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_settings_win_request_delete(void *data, const Eo_Event *event);
extern Eina_Bool
-_rm_win_request_delete(void *data, Eo *obj, const Eo_Event_Description *desc,
void *event_info);
+_rm_win_request_delete(void *data, const Eo_Event *event);
extern Eina_Bool
-_graphviz_button_clicked_cb(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_graphviz_button_clicked_cb(void *data, const Eo_Event *event);
extern Eina_Bool
-_callbacksview_up_btn_clicked(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_callbacksview_up_btn_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_callbacksview_down_btn_clicked(void *data, Eo *obj, const
Eo_Event_Description *desc, void *event_info);
+_callbacksview_down_btn_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_callbacksview_del_btn_clicked(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_callbacksview_del_btn_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_toolbar_item_sel_cb(void *data, Eo *obj, const Eo_Event_Description *desc,
void *event_info);
+_toolbar_item_sel_cb(void *data, const Eo_Event *event);
extern Eina_Bool
-_proplayout_toolbar_clicked(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_proplayout_toolbar_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_contentview_up_btn_clicked(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_contentview_up_btn_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_contentview_down_btn_clicked(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_contentview_down_btn_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_contentview_del_btn_clicked(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_contentview_del_btn_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_itemview_up_btn_clicked(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_itemview_up_btn_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_itemview_down_btn_clicked(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_itemview_down_btn_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_settingsview_toolbar_clicked(void *data, Eo *obj, const Eo_Event_Description
*desc, void *event_info);
+_settingsview_toolbar_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_custom_theme_add_button_clicked(void *data, Eo *obj, const
Eo_Event_Description *desc, void *event_info);
+_custom_theme_add_button_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_custom_theme_del_button_clicked(void *data, Eo *obj, const
Eo_Event_Description *desc, void *event_info);
+_custom_theme_del_button_clicked(void *data, const Eo_Event *event);
extern Eina_Bool
-_theme_selector_hover_selected_cb(void *data, Eo *obj, const
Eo_Event_Description *desc, void *event_info);
+_theme_selector_hover_selected_cb(void *data, const Eo_Event *event);
extern Eina_Bool
-_rmview_toolbar_clicked(void *data, Eo *obj, const Eo_Event_Description *desc,
void *event_info);
+_rmview_toolbar_clicked(void *data, const Eo_Event *event);
#ifdef EGUI_LAYOUT_EDJE_PATH
const char *panes_layout = EGUI_LAYOUT_EDJE_PATH"/panes_layout.edj";
@@ -82,7 +82,7 @@ _rmview_toolbar_clicked(void *data, Eo *obj, const
Eo_Event_Description *desc, v
#endif
static Eina_Bool
-_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_pubs_free_cb(void *data, const Eo_Event *event EINA_UNUSED)
{
free(data);
return EINA_TRUE;
@@ -251,16 +251,16 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
}
static Eina_Bool
-rm_button_add_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+rm_button_add_clicked(void *data, const Eo_Event *event)
{
- _rm_add_button_clicked(data, obj, desc, event_info);
+ _rm_add_button_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-rm_win_delete_request(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+rm_win_delete_request(void *data, const Eo_Event *event)
{
- _rm_win_request_delete(data, obj, desc, event_info);
+ _rm_win_request_delete(data, event);
return EINA_TRUE;
}
@@ -404,37 +404,37 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
}
static Eina_Bool
-custom_theme_del_bt_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+custom_theme_del_bt_clicked(void *data, const Eo_Event *event)
{
- _custom_theme_del_button_clicked(data, obj, desc, event_info);
+ _custom_theme_del_button_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-project_name_entry_changed_user(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+project_name_entry_changed_user(void *data, const Eo_Event *event)
{
- _settings_apply_button_enable(data, obj, desc, event_info);
+ _settings_apply_button_enable(data, event);
return EINA_TRUE;
}
static Eina_Bool
-cutom_theme_fs_bt_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+cutom_theme_fs_bt_clicked(void *data, const Eo_Event *event)
{
- _custom_theme_add_button_clicked(data, obj, desc, event_info);
+ _custom_theme_add_button_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-settings_button_apply_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+settings_button_apply_clicked(void *data, const Eo_Event *event)
{
- _settings_apply_button_clicked(data, obj, desc, event_info);
+ _settings_apply_button_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-settings_win_delete_request(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+settings_win_delete_request(void *data, const Eo_Event *event)
{
- _settings_win_request_delete(data, obj, desc, event_info);
+ _settings_win_request_delete(data, event);
return EINA_TRUE;
}
@@ -600,93 +600,93 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
}
static Eina_Bool
-callbacksview_del_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+callbacksview_del_btn_clicked(void *data, const Eo_Event *event)
{
- _callbacksview_del_btn_clicked(data, obj, desc, event_info);
+ _callbacksview_del_btn_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-contentview_down_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+contentview_down_btn_clicked(void *data, const Eo_Event *event)
{
- _contentview_down_btn_clicked(data, obj, desc, event_info);
+ _contentview_down_btn_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-itemview_up_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+itemview_up_btn_clicked(void *data, const Eo_Event *event)
{
- _itemview_up_btn_clicked(data, obj, desc, event_info);
+ _itemview_up_btn_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-theme_selector_hoversel_selected(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+theme_selector_hoversel_selected(void *data, const Eo_Event *event)
{
- _theme_selector_hover_selected_cb(data, obj, desc, event_info);
+ _theme_selector_hover_selected_cb(data, event);
return EINA_TRUE;
}
static Eina_Bool
-callbacksview_down_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+callbacksview_down_btn_clicked(void *data, const Eo_Event *event)
{
- _callbacksview_down_btn_clicked(data, obj, desc, event_info);
+ _callbacksview_down_btn_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-itemview_add_separator_but_clicked(void *data EINA_UNUSED, Eo *obj
EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+itemview_add_separator_but_clicked(void *data, const Eo_Event *event)
{
- _itemview_separator_add_but_clicked_cb(data, obj, desc, event_info);
+ _itemview_separator_add_but_clicked_cb(data, event);
return EINA_TRUE;
}
static Eina_Bool
-itemview_del_item_but_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+itemview_del_item_but_clicked(void *data, const Eo_Event *event)
{
- _itemview_item_del_but_clicked_cb(data, obj, desc, event_info);
+ _itemview_item_del_but_clicked_cb(data, event);
return EINA_TRUE;
}
static Eina_Bool
-contentview_del_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+contentview_del_btn_clicked(void *data, const Eo_Event *event)
{
- _contentview_del_btn_clicked(data, obj, desc, event_info);
+ _contentview_del_btn_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-itemview_add_item_but_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+itemview_add_item_but_clicked(void *data, const Eo_Event *event)
{
- _itemview_item_add_but_clicked_cb(data, obj, desc, event_info);
+ _itemview_item_add_but_clicked_cb(data, event);
return EINA_TRUE;
}
static Eina_Bool
-itemview_add_item_nested_but_clicked(void *data EINA_UNUSED, Eo *obj
EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+itemview_add_item_nested_but_clicked(void *data, const Eo_Event *event)
{
- _itemview_item_nested_add_but_clicked_cb(data, obj, desc, event_info);
+ _itemview_item_nested_add_but_clicked_cb(data, event);
return EINA_TRUE;
}
static Eina_Bool
-callbacksview_up_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+callbacksview_up_btn_clicked(void *data, const Eo_Event *event)
{
- _callbacksview_up_btn_clicked(data, obj, desc, event_info);
+ _callbacksview_up_btn_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-itemview_down_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+itemview_down_btn_clicked(void *data, const Eo_Event *event)
{
- _itemview_down_btn_clicked(data, obj, desc, event_info);
+ _itemview_down_btn_clicked(data, event);
return EINA_TRUE;
}
static Eina_Bool
-contentview_up_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+contentview_up_btn_clicked(void *data, const Eo_Event *event)
{
- _contentview_up_btn_clicked(data, obj, desc, event_info);
+ _contentview_up_btn_clicked(data, event);
return EINA_TRUE;
}
diff --git a/src/tests/data/test_resources_cbs.c.ref
b/src/tests/data/test_resources_cbs.c.ref
index 28d7a61..ae8be5d 100644
--- a/src/tests/data/test_resources_cbs.c.ref
+++ b/src/tests/data/test_resources_cbs.c.ref
@@ -14,17 +14,17 @@
#include "test_resources_cbs.h"
extern Eina_Bool
-_my_callback_function(void *data, Eo *obj, const Eo_Event_Description *desc,
void *event_info);
+_my_callback_function(void *data, const Eo_Event *event);
static Eina_Bool
-elm_button1_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+elm_button1_clicked(void *data, const Eo_Event *event)
{
- _my_callback_function(data, obj, desc, event_info);
+ _my_callback_function(data, event);
return EINA_TRUE;
}
static Eina_Bool
-_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_pubs_free_cb(void *data, const Eo_Event *event EINA_UNUSED)
{
free(data);
return EINA_TRUE;
diff --git a/src/tests/data/test_resources_edjes.c.ref
b/src/tests/data/test_resources_edjes.c.ref
index 713b0d4..b23f9e1 100644
--- a/src/tests/data/test_resources_edjes.c.ref
+++ b/src/tests/data/test_resources_edjes.c.ref
@@ -20,7 +20,7 @@
#endif
static Eina_Bool
-_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_pubs_free_cb(void *data, const Eo_Event *event EINA_UNUSED)
{
free(data);
return EINA_TRUE;
diff --git a/src/tests/data/test_resources_images.c.ref
b/src/tests/data/test_resources_images.c.ref
index aa3d75c..314722a 100644
--- a/src/tests/data/test_resources_images.c.ref
+++ b/src/tests/data/test_resources_images.c.ref
@@ -21,7 +21,7 @@
#endif
static Eina_Bool
-_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_pubs_free_cb(void *data, const Eo_Event *event EINA_UNUSED)
{
free(data);
return EINA_TRUE;
diff --git a/src/tests/data/test_widgets.c.ref
b/src/tests/data/test_widgets.c.ref
index 6544de3..becd2b0 100644
--- a/src/tests/data/test_widgets.c.ref
+++ b/src/tests/data/test_widgets.c.ref
@@ -16,7 +16,7 @@
static Demo_Widgets g_pub_widgets;
static Eina_Bool
-_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_pubs_free_cb(void *data, const Eo_Event *event EINA_UNUSED)
{
free(data);
return EINA_TRUE;
diff --git a/src/tests/data/test_widgets_create_cb.c.ref
b/src/tests/data/test_widgets_create_cb.c.ref
index 1581088..3b8910d 100644
--- a/src/tests/data/test_widgets_create_cb.c.ref
+++ b/src/tests/data/test_widgets_create_cb.c.ref
@@ -18,7 +18,7 @@ static Demo_Widgets g_pub_widgets;
extern void demo_elm_win2_create_done(Demo_Elm_Win2_Widgets *wdgs);
static Eina_Bool
-elm_button1_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+elm_button1_clicked(void *data, const Eo_Event *event)
{
Demo_Elm_Win2_Widgets *wdgs = demo_elm_win2_create(NULL);
demo_elm_win2_create_done(wdgs);
@@ -26,7 +26,7 @@ elm_button1_clicked(void *data EINA_UNUSED, Eo *obj
EINA_UNUSED, const Eo_Event_
}
static Eina_Bool
-_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_pubs_free_cb(void *data, const Eo_Event *event EINA_UNUSED)
{
free(data);
return EINA_TRUE;
diff --git a/src/tests/data/test_widgets_modify_cb.c.ref
b/src/tests/data/test_widgets_modify_cb.c.ref
index e65770a..0b141b5 100644
--- a/src/tests/data/test_widgets_modify_cb.c.ref
+++ b/src/tests/data/test_widgets_modify_cb.c.ref
@@ -17,7 +17,7 @@ static Demo_Widgets g_pub_widgets;
static Eo *elm_button1;
static Eina_Bool
-elm_button1_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+elm_button1_clicked(void *data, const Eo_Event *event)
{
eo_do(elm_button1, efl_gfx_color_set(255, 0, 0, 255));
@@ -25,7 +25,7 @@ elm_button1_clicked(void *data EINA_UNUSED, Eo *obj
EINA_UNUSED, const Eo_Event_
}
static Eina_Bool
-_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_pubs_free_cb(void *data, const Eo_Event *event EINA_UNUSED)
{
free(data);
return EINA_TRUE;
--
