hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=e08cc69795bef5dd4c1474e6aab007f877e717d5

commit e08cc69795bef5dd4c1474e6aab007f877e717d5
Author: Hermet Park <her...@hermet.pe.kr>
Date:   Sun May 1 20:27:08 2016 +0900

    code refactoring
    
    change declarations type of enventor object
    
    from Evas_Object to Enventor_Object
---
 src/bin/base_gui.c       |  6 +--
 src/bin/edc_navigator.c  | 14 +++----
 src/bin/live_edit.c      |  2 +-
 src/bin/main.c           | 98 ++++++++++++++++++++++++------------------------
 src/bin/menu.c           |  4 +-
 src/bin/search.c         | 10 ++---
 src/include/base_gui.h   |  4 +-
 src/lib/enventor_smart.c |  6 +--
 8 files changed, 71 insertions(+), 73 deletions(-)

diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 43a8b2a..01d4011 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -5,7 +5,7 @@ typedef struct base_s
    Evas_Object *win;
    Evas_Object *layout;
    Evas_Object *console;
-   Evas_Object *enventor;
+   Enventor_Object *enventor;
    Ecore_Timer *edc_navi_update_timer;
    Eina_Bool console_msg : 1;
 } base_data;
@@ -343,7 +343,7 @@ base_gui_show(void)
    evas_object_show(g_bd->win);
 }
 
-Evas_Object *
+Enventor_Object *
 base_enventor_get(void)
 {
    base_data *bd = g_bd;
@@ -352,7 +352,7 @@ base_enventor_get(void)
 }
 
 void
-base_enventor_set(Evas_Object *enventor)
+base_enventor_set(Enventor_Object *enventor)
 {
    base_data *bd = g_bd;
    assert(bd);
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index b4f499f..39549f2 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -640,7 +640,7 @@ gl_state_selected_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
 static void
 states_update(navi_data *nd, part_it *pit)
 {
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
    Eina_List *state_list = enventor_object_part_states_list_get(enventor,
                                                                 pit->name);
    char *name;
@@ -742,8 +742,7 @@ static void
 program_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
    program_it *pit = data;
-   Evas_Object *enventor = base_enventor_get();
-   enventor_object_program_run(enventor, pit->name);
+   enventor_object_program_run(base_enventor_get(), pit->name);
 
    if (!config_stats_bar_get()) return;
 
@@ -835,7 +834,7 @@ sub_programs_update(navi_data *nd, programs_it *pit)
 {
    navigator_sub_programs_clear(pit);
 
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
    Eina_List *program_list = enventor_object_programs_list_get(enventor);
    if (!program_list) return;
 
@@ -881,8 +880,7 @@ static void
 programs_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
    programs_it *pit = data;
-   Evas_Object *enventor = base_enventor_get();
-   enventor_object_programs_stop(enventor);
+   enventor_object_programs_stop(base_enventor_get());
 
    if (!config_stats_bar_get()) return;
 
@@ -921,7 +919,7 @@ gl_programs_selected_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
 static void
 programs_update(navi_data *nd, group_it *git)
 {
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
    Eina_List *program_list = enventor_object_programs_list_get(enventor);
 
    //oh, no programs.. 
@@ -1155,7 +1153,7 @@ gl_part_selected_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
 static void
 parts_update(navi_data *nd, group_it *git)
 {
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
    Eina_List *part_list = enventor_object_parts_list_get(enventor);
    Eina_List *l, *ll;
    part_it *pit;
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 66d84fd..b93d261 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -118,7 +118,7 @@ info_text_update(live_data *ld)
    Evas_Coord lx, ly, lw, lh;
    evas_object_geometry_get(ld->live_view, &lx, &ly, &lw, &lh);
 
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
 
    //reverse coordinates if mirror mode is enabled.
    double ox = ld->part_info.rel1_x;
diff --git a/src/bin/main.c b/src/bin/main.c
index 1e57ca1..7b1eea3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -8,7 +8,6 @@
 
 typedef struct app_s
 {
-   Evas_Object *enventor;
    Evas_Object *keygrabber;
    Eina_Bool on_saving : 1;
    Eina_Bool lazy_save : 1;
@@ -20,7 +19,7 @@ void
 auto_comp_toggle(app_data *ad)
 {
    Eina_Bool toggle = !config_auto_complete_get();
-   enventor_object_auto_complete_set(ad->enventor, toggle);
+   enventor_object_auto_complete_set(base_enventor_get(), toggle);
    if (toggle) stats_info_msg_update(_("Auto Completion Enabled."));
    else stats_info_msg_update(_("Auto Completion Disabled."));
    config_auto_complete_set(toggle);
@@ -30,7 +29,7 @@ static void
 auto_indent_toggle(app_data *ad)
 {
    Eina_Bool toggle = !config_auto_indent_get();
-   enventor_object_auto_indent_set(ad->enventor, toggle);
+   enventor_object_auto_indent_set(base_enventor_get(), toggle);
    if (toggle) stats_info_msg_update(_("Auto Indentation Enabled."));
    else stats_info_msg_update(_("Auto Indentation Disabled."));
    config_auto_indent_set(toggle);
@@ -49,7 +48,7 @@ tools_update(void)
 }
 
 static void
-enventor_common_setup(Evas_Object *enventor)
+enventor_common_setup(Enventor_Object *enventor)
 {
    const char *font_name;
    const char *font_style;
@@ -76,7 +75,7 @@ enventor_common_setup(Evas_Object *enventor)
 }
 
 static void
-syntax_color_update(Evas_Object *enventor)
+syntax_color_update(Enventor_Object *enventor)
 {
    const char *config_color;
    const char *enventor_color;
@@ -105,7 +104,7 @@ syntax_color_update(Evas_Object *enventor)
 }
 
 static void
-syntax_color_init(Evas_Object *enventor)
+syntax_color_init(Enventor_Object *enventor)
 {
    const char *config_color;
    const char *enventor_color;
@@ -128,7 +127,7 @@ static void
 config_update_cb(void *data)
 {
    app_data *ad = data;
-   Evas_Object *enventor = ad->enventor;
+   Enventor_Object *enventor = base_enventor_get();
 
    enventor_common_setup(enventor);
    tools_update();
@@ -155,7 +154,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void 
*ev)
       return ECORE_CALLBACK_PASS_ON;
 
    //View Scale
-   Evas_Object *view = enventor_object_live_view_get(ad->enventor);
+   Evas_Object *view = enventor_object_live_view_get(base_enventor_get());
    evas_object_geometry_get(view, &x, &y, &w, &h);
 
    if ((event->x >= x) && (event->x <= (x + w)) &&
@@ -168,7 +167,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void 
*ev)
 
         config_view_scale_set(scale);
         scale = config_view_scale_get();
-        enventor_object_live_view_scale_set(ad->enventor, scale);
+        enventor_object_live_view_scale_set(base_enventor_get(), scale);
 
         Evas_Coord ww, hh;
         config_view_size_get(&ww, &hh);
@@ -183,7 +182,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void 
*ev)
      }
 
    //Font Size
-   evas_object_geometry_get(ad->enventor, &x, &y, &w, &h);
+   evas_object_geometry_get(base_enventor_get(), &x, &y, &w, &h);
 
    if ((event->x >= x) && (event->x <= (x + w)) &&
        (event->y >= y) && (event->y <= (y + h)))
@@ -191,13 +190,13 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, 
void *ev)
         if (event->z < 0)
           {
              config_font_scale_set(config_font_scale_get() + 0.1f);
-             enventor_object_font_scale_set(ad->enventor,
+             enventor_object_font_scale_set(base_enventor_get(),
                                             config_font_scale_get());
           }
         else
           {
              config_font_scale_set(config_font_scale_get() - 0.1f);
-             enventor_object_font_scale_set(ad->enventor,
+             enventor_object_font_scale_set(base_enventor_get(),
                                             config_font_scale_get());
           }
 
@@ -405,7 +404,7 @@ elm_setup()
 
 static void
 enventor_cursor_line_changed_cb(void *data EINA_UNUSED,
-                                Evas_Object *obj EINA_UNUSED,
+                                Enventor_Object *obj EINA_UNUSED,
                                 void *event_info)
 {
    Enventor_Cursor_Line *cur_line = (Enventor_Cursor_Line *)event_info;
@@ -414,7 +413,7 @@ enventor_cursor_line_changed_cb(void *data EINA_UNUSED,
 
 static void
 enventor_cursor_group_changed_cb(void *data EINA_UNUSED,
-                                 Evas_Object *obj EINA_UNUSED,
+                                 Enventor_Object *obj EINA_UNUSED,
                                  void *event_info)
 {
    const char *group_name = event_info;
@@ -423,7 +422,8 @@ enventor_cursor_group_changed_cb(void *data EINA_UNUSED,
 }
 
 static void
-enventor_compile_error_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+enventor_compile_error_cb(void *data EINA_UNUSED,
+                          Enventor_Object *obj EINA_UNUSED,
                           void *event_info)
 {
    const char *msg = event_info;
@@ -432,7 +432,7 @@ enventor_compile_error_cb(void *data EINA_UNUSED, 
Evas_Object *obj EINA_UNUSED,
 
 static void
 enventor_live_view_resized_cb(void *data EINA_UNUSED,
-                              Evas_Object *obj EINA_UNUSED,
+                              Enventor_Object *obj EINA_UNUSED,
                               void *event_info)
 {
    if (!config_stats_bar_get()) return;
@@ -442,7 +442,7 @@ enventor_live_view_resized_cb(void *data EINA_UNUSED,
 }
 
 static void
-enventor_live_view_loaded_cb(void *data EINA_UNUSED, Evas_Object *obj,
+enventor_live_view_loaded_cb(void *data EINA_UNUSED, Enventor_Object *obj,
                              void *event_info EINA_UNUSED)
 {
    Evas_Coord w, h;
@@ -453,7 +453,7 @@ enventor_live_view_loaded_cb(void *data EINA_UNUSED, 
Evas_Object *obj,
 
 static void
 enventor_live_view_cursor_moved_cb(void *data EINA_UNUSED,
-                                   Evas_Object *obj EINA_UNUSED,
+                                   Enventor_Object *obj EINA_UNUSED,
                                    void *event_info)
 {
    if (!config_stats_bar_get()) return;
@@ -464,7 +464,7 @@ enventor_live_view_cursor_moved_cb(void *data EINA_UNUSED,
 
 static void
 enventor_ctxpopup_activated_cb(void *data EINA_UNUSED,
-                               Evas_Object *obj EINA_UNUSED,
+                               Enventor_Object *obj EINA_UNUSED,
                                void *event_info)
 {
    Enventor_Ctxpopup_Type type = (Enventor_Ctxpopup_Type) event_info;
@@ -477,7 +477,7 @@ enventor_ctxpopup_activated_cb(void *data EINA_UNUSED,
 }
 
 static void
-enventor_ctxpopup_changed_cb(void *data, Evas_Object *obj,
+enventor_ctxpopup_changed_cb(void *data, Enventor_Object *obj,
                              void *event_info EINA_UNUSED)
 {
    app_data *ad = data;
@@ -492,7 +492,7 @@ enventor_ctxpopup_changed_cb(void *data, Evas_Object *obj,
 }
 
 static void
-enventor_live_view_updated_cb(void *data, Evas_Object *obj,
+enventor_live_view_updated_cb(void *data, Enventor_Object *obj,
                               void *event_info EINA_UNUSED)
 {
    app_data *ad = data;
@@ -510,7 +510,7 @@ enventor_live_view_updated_cb(void *data, Evas_Object *obj,
 }
 
 static void
-enventor_ctxpopup_dismissed_cb(void *data EINA_UNUSED, Evas_Object *obj,
+enventor_ctxpopup_dismissed_cb(void *data EINA_UNUSED, Enventor_Object *obj,
                                void *event_info EINA_UNUSED)
 {
    if (menu_activated_get() > 0)
@@ -518,7 +518,7 @@ enventor_ctxpopup_dismissed_cb(void *data EINA_UNUSED, 
Evas_Object *obj,
 }
 
 static void
-enventor_focused_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+enventor_focused_cb(void *data EINA_UNUSED, Enventor_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
    if (file_mgr_edc_modified_get()) file_mgr_warning_open();
@@ -526,7 +526,7 @@ enventor_focused_cb(void *data EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED,
 
 static void
 enventor_mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
-                       Evas_Object *obj EINA_UNUSED,
+                       Enventor_Object *obj EINA_UNUSED,
                        void *event_info EINA_UNUSED)
 {
    base_edc_navigator_deselect();
@@ -535,7 +535,7 @@ enventor_mouse_down_cb(void *data EINA_UNUSED, Evas *e 
EINA_UNUSED,
 static void
 enventor_setup(app_data *ad)
 {
-   Evas_Object *enventor = enventor_object_add(base_layout_get());
+   Enventor_Object *enventor = enventor_object_add(base_layout_get());
    evas_object_smart_callback_add(enventor, "max_line,changed",
                                   enventor_cursor_line_changed_cb, ad);
    evas_object_smart_callback_add(enventor, "cursor,line,changed",
@@ -574,8 +574,6 @@ enventor_setup(app_data *ad)
    base_enventor_set(enventor);
    base_title_set(config_input_path_get());
    base_live_view_set(enventor_object_live_view_get(enventor));
-
-   ad->enventor = enventor;
 }
 
 static void
@@ -588,12 +586,14 @@ default_template_insert(app_data *ad)
      }
 
    char syntax[12];
-   if (enventor_object_template_insert(ad->enventor, 
ENVENTOR_TEMPLATE_INSERT_DEFAULT, syntax, sizeof(syntax)))
+   if (enventor_object_template_insert(base_enventor_get(),
+                                       ENVENTOR_TEMPLATE_INSERT_DEFAULT,
+                                       syntax, sizeof(syntax)))
      {
         char msg[64];
         snprintf(msg, sizeof(msg), _("Template code inserted, (%s)"), syntax);
         stats_info_msg_update(msg);
-        enventor_object_save(ad->enventor, config_input_path_get());
+        enventor_object_save(base_enventor_get(), config_input_path_get());
      }
    else
      {
@@ -654,7 +654,7 @@ ctrl_func(app_data *ad, Evas_Event_Key_Down *event)
   //Delete Line
    if (!strcmp(event->key, "d") || !strcmp(event->key, "D"))
      {
-        enventor_object_line_delete(ad->enventor);
+        enventor_object_line_delete(base_enventor_get());
         return EINA_TRUE;
      }
    //Find/Replace
@@ -710,7 +710,7 @@ ctrl_func(app_data *ad, Evas_Event_Key_Down *event)
 
    if (!strcmp(event->key, "space"))
      {
-        enventor_object_auto_complete_list_show(ad->enventor);
+        enventor_object_auto_complete_list_show(base_enventor_get());
         return EINA_TRUE;
      }
 
@@ -731,7 +731,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
 
         if (live_edit_cancel())
           {
-             enventor_object_focus_set(ad->enventor, EINA_TRUE);
+             enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
              return;
           }
         if (file_mgr_warning_is_opened())
@@ -739,9 +739,9 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
              file_mgr_warning_close();
              return;
           }
-        if (enventor_object_ctxpopup_visible_get(ad->enventor))
+        if (enventor_object_ctxpopup_visible_get(base_enventor_get()))
           {
-             enventor_object_ctxpopup_dismiss(ad->enventor);
+             enventor_object_ctxpopup_dismiss(base_enventor_get());
              return;
           }
 
@@ -752,7 +752,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
    if (menu_activated_get() > 0) return;
    if (file_mgr_warning_is_opened()) return;
 
-   enventor_object_ctxpopup_dismiss(ad->enventor);
+   enventor_object_ctxpopup_dismiss(base_enventor_get());
    stats_ctxpopup_dismiss();
 
    if (ctrl_func(ad, ev)) return;
@@ -761,7 +761,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
    //README
    if (!strcmp(ev->key, "F1"))
      {
-        enventor_object_ctxpopup_dismiss(ad->enventor);
+        enventor_object_ctxpopup_dismiss(base_enventor_get());
         live_edit_cancel();
         menu_about();
         return;
@@ -769,7 +769,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
    //New
    if (!strcmp(ev->key, "F2"))
      {
-        enventor_object_ctxpopup_dismiss(ad->enventor);
+        enventor_object_ctxpopup_dismiss(base_enventor_get());
         live_edit_cancel();
         menu_edc_new(EINA_FALSE);
         return;
@@ -777,7 +777,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
    //Save
    if (!strcmp(ev->key, "F3"))
      {
-        enventor_object_ctxpopup_dismiss(ad->enventor);
+        enventor_object_ctxpopup_dismiss(base_enventor_get());
         live_edit_cancel();
         menu_edc_save();
         return;
@@ -785,7 +785,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
    //Load
    if (!strcmp(ev->key, "F4"))
      {
-        enventor_object_ctxpopup_dismiss(ad->enventor);
+        enventor_object_ctxpopup_dismiss(base_enventor_get());
         live_edit_cancel();
         menu_edc_load();
         return;
@@ -793,35 +793,35 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
    //Line Number
    if (!strcmp(ev->key, "F5"))
      {
-        enventor_object_ctxpopup_dismiss(ad->enventor);
+        enventor_object_ctxpopup_dismiss(base_enventor_get());
         tools_lines_update(EINA_TRUE);
         return;
      }
    //Tools
    if (!strcmp(ev->key, "F8"))
      {
-        enventor_object_ctxpopup_dismiss(ad->enventor);
+        enventor_object_ctxpopup_dismiss(base_enventor_get());
         base_tools_toggle(EINA_TRUE);
         return;
      }
    //File Browser
    if (!strcmp(ev->key, "F9"))
      {
-        enventor_object_ctxpopup_dismiss(ad->enventor);
+        enventor_object_ctxpopup_dismiss(base_enventor_get());
         tools_file_browser_update(EINA_TRUE);
         return;
      }
    //EDC Navigator
    if (!strcmp(ev->key, "F10"))
      {
-        enventor_object_ctxpopup_dismiss(ad->enventor);
+        enventor_object_ctxpopup_dismiss(base_enventor_get());
         tools_edc_navigator_update(EINA_TRUE);
         return;
      }
    //Statusbar
    if (!strcmp(ev->key, "F11"))
      {
-        enventor_object_ctxpopup_dismiss(ad->enventor);
+        enventor_object_ctxpopup_dismiss(base_enventor_get());
         tools_status_update(EINA_TRUE);
         return;
      }
@@ -829,7 +829,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
    if (!strcmp(ev->key, "F12"))
      {
         live_edit_cancel();
-        enventor_object_ctxpopup_dismiss(ad->enventor);
+        enventor_object_ctxpopup_dismiss(base_enventor_get());
         menu_setting();
         return;
      }
@@ -855,7 +855,7 @@ live_edit_set(Evas_Object *tools)
 static void
 keygrabber_init(app_data *ad)
 {
-   Evas *e = evas_object_evas_get(ad->enventor);
+   Evas *e = evas_object_evas_get(base_enventor_get());
    ad->keygrabber = evas_object_rectangle_add(e);
    evas_object_event_callback_add(ad->keygrabber, EVAS_CALLBACK_KEY_DOWN,
                                   keygrabber_key_down_cb, ad);
@@ -941,15 +941,15 @@ init(app_data *ad, int argc, char **argv)
    base_gui_show();
 
    //Guarantee Enventor editor has focus.
-   enventor_object_focus_set(ad->enventor, EINA_TRUE);
+   enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
 
    menu_init();
 
    if (template) menu_edc_new(EINA_TRUE);
 
    //Initialize syntax color.
-   syntax_color_init(ad->enventor);
-   syntax_color_update(ad->enventor);
+   syntax_color_init(base_enventor_get());
+   syntax_color_update(base_enventor_get());
 
    keygrabber_init(ad);
 
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 7522e28..e8cb337 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -412,7 +412,7 @@ fileselector_save_done_cb(void *data, Evas_Object *obj, 
void *event_info)
         is_edc = EINA_TRUE;
      }
 
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
 
    if (is_edc)
      {
@@ -796,7 +796,7 @@ void
 menu_exit(void)
 {
    menu_data *md = g_md;
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
    if (enventor_object_modified_get(enventor))
      {
         search_close();
diff --git a/src/bin/search.c b/src/bin/search.c
index 1d6ae13..4fd5cbc 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -59,7 +59,7 @@ replace_all_proc(search_data *sd)
 
    char buf[256];
    int replace_cnt = 0;
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
 
    const char *text =
       (const char *) enventor_object_text_get(enventor);
@@ -104,7 +104,7 @@ find_forward_proc(search_data *sd)
 
    char buf[256];
    Eina_Bool need_iterate = EINA_TRUE;
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
 
    const char *text = (const char *) enventor_object_text_get(enventor);
    if (!text) return;
@@ -153,7 +153,7 @@ find_backward_proc(search_data *sd)
    char buf[256];
    Eina_Bool need_iterate = EINA_TRUE;
    int len = 0;
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
 
 
    const char *text = (const char *) enventor_object_text_get(enventor);
@@ -211,7 +211,7 @@ static Eina_Bool
 replace_proc(search_data *sd)
 {
    const char *find = elm_entry_entry_get(sd->en_find);
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
    const char *selection =
       (const char * ) enventor_object_selection_get(enventor);
    if (!find || !selection) return EINA_FALSE;
@@ -449,7 +449,7 @@ search_close(void)
    search_data *sd = g_sd;
    if (!sd) return EINA_FALSE;
 
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
 
    enventor_object_select_none(enventor);
    while (sd->syntax_color > 0)
diff --git a/src/include/base_gui.h b/src/include/base_gui.h
index d644791..3b9b88d 100644
--- a/src/include/base_gui.h
+++ b/src/include/base_gui.h
@@ -8,7 +8,7 @@ Eina_Bool base_gui_init(void);
 void base_gui_show(void);
 Evas_Object *base_win_get(void);
 Evas_Object *base_layout_get(void);
-Evas_Object *base_enventor_get(void);
+Enventor_Object *base_enventor_get(void);
 void base_win_resize_object_add(Evas_Object *resize_obj);
 void base_title_set(const char *path);
 void base_statusbar_toggle(Eina_Bool config);
@@ -20,7 +20,7 @@ void base_editors_full_view(void);
 void base_console_auto_hide(void);
 void base_console_toggle(void);
 void base_live_view_set(Evas_Object *live_view);
-void base_enventor_set(Evas_Object *enventor);
+void base_enventor_set(Enventor_Object *enventor);
 void base_gui_term(void);
 void base_console_reset(void);
 void base_error_msg_set(const char *msg);
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 3e6489c..3f176c0 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -797,8 +797,8 @@ _enventor_object_programs_stop(Eo *obj EINA_UNUSED,
 /*****************************************************************************/
 /* Externally accessible calls                                               */
 /*****************************************************************************/
-EAPI Evas_Object *
-enventor_object_add(Evas_Object *parent)
+EAPI Enventor_Object *
+enventor_object_add(Enventor_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
    Evas_Object *obj = eo_add(MY_CLASS, parent);
@@ -806,7 +806,7 @@ enventor_object_add(Evas_Object *parent)
 }
 
 EAPI Eina_Bool
-enventor_object_file_set(Evas_Object *obj, const char *file)
+enventor_object_file_set(Enventor_Object *obj, const char *file)
 {
    return efl_file_set(obj, file, NULL);
 }

-- 


Reply via email to