jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=7a85d0bc3b2118aa976e153444226735407545bc
commit 7a85d0bc3b2118aa976e153444226735407545bc Author: Jaehyun Cho <jae_hyun....@samsung.com> Date: Tue May 10 12:04:17 2016 +0900 live_edit: Remove unused code. live_edit does not need trigger any more. Therefore, code related to trigger is removed. --- src/bin/live_edit.c | 4 +--- src/bin/main.c | 9 +-------- src/bin/tools.c | 6 ------ src/include/live_edit.h | 2 +- src/include/tools.h | 1 - 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index ec4356a..d2cc29d 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -49,7 +49,6 @@ typedef struct live_editor_s Evas_Object *toolbox; Evas_Object *layout; Evas_Object *live_view; - Evas_Object *trigger; Evas_Object *ctrl_pt[Ctrl_Pt_Cnt]; Evas_Object *align_line[Align_Line_Cnt]; Evas_Object *info_text[Info_Text_Cnt]; @@ -1502,7 +1501,7 @@ live_edit_tools_create(Evas_Object *parent) } void -live_edit_init(Evas_Object *trigger) +live_edit_init(void) { live_data *ld = calloc(1, sizeof(live_data)); if (!ld) @@ -1511,7 +1510,6 @@ live_edit_init(Evas_Object *trigger) return; } g_ld = ld; - ld->trigger = trigger; ld->auto_align_dist = LIVE_EDIT_AUTO_ALIGN_DIST; } diff --git a/src/bin/main.c b/src/bin/main.c index b111344..9257363 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -846,13 +846,6 @@ statusbar_set() } static void -live_edit_set(Evas_Object *tools) -{ - Evas_Object *trigger = tools_live_edit_get(tools); - live_edit_init(trigger); -} - -static void keygrabber_init(app_data *ad) { Evas *e = evas_object_evas_get(base_enventor_get()); @@ -936,7 +929,7 @@ init(app_data *ad, int argc, char **argv) enventor_setup(ad); file_mgr_init(); Evas_Object *tools = tools_set(); - live_edit_set(tools); + live_edit_init(); base_gui_show(); diff --git a/src/bin/tools.c b/src/bin/tools.c index 549f0ff..787e673 100644 --- a/src/bin/tools.c +++ b/src/bin/tools.c @@ -325,12 +325,6 @@ tools_init(Evas_Object *parent) return box; } -Evas_Object * -tools_live_edit_get(Evas_Object *tools) -{ - return evas_object_data_get(tools, "live_edit"); -} - void tools_highlight_update(Eina_Bool toggle) { diff --git a/src/include/live_edit.h b/src/include/live_edit.h index a886442..9999944 100644 --- a/src/include/live_edit.h +++ b/src/include/live_edit.h @@ -5,7 +5,7 @@ #define LIVE_EDIT_MAX_DIST 999999 #define LIVE_EDIT_AUTO_ALIGN_DIST 10 -void live_edit_init(Evas_Object *trigger); +void live_edit_init(void); void live_edit_term(void); Eina_Bool live_edit_cancel(void); Eina_Bool live_edit_get(void); diff --git a/src/include/tools.h b/src/include/tools.h index 56ed3ea..eced985 100644 --- a/src/include/tools.h +++ b/src/include/tools.h @@ -1,6 +1,5 @@ Evas_Object *tools_init(Evas_Object *parent); void tools_term(void); -Evas_Object *tools_live_edit_get(Evas_Object *tools); void tools_highlight_update(Eina_Bool toggle); void tools_lines_update(Eina_Bool toggle); void tools_dummy_update(Eina_Bool toggle); --