rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=5e270bf6301dee66bde709ee3b72a92b1422e9af
commit 5e270bf6301dee66bde709ee3b72a92b1422e9af
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Mon Aug 15 13:12:53 2016 +0300
fix build
Follow the white rabbit.
---
src/bin/common/validator.c | 2 +-
src/bin/ui/colorclass_manager.c | 2 +-
src/bin/ui/project_navigator.c | 2 +-
src/bin/ui/property/property_group.c | 4 ++--
src/bin/ui/sound_manager.c | 4 ++--
src/bin/ui/sound_player/sound_player.c | 28 ++++++++++++++--------------
src/bin/ui/style_manager.c | 4 ++--
src/bin/ui/tab_home_import_edc.c | 2 +-
src/bin/ui/tab_home_import_edj.c | 2 +-
src/bin/ui/tab_home_new.c | 2 +-
src/bin/ui/workspace/group_navigator.c | 10 +++++-----
src/lib/ewe_ruler.c | 20 +++++++++-----------
src/lib/ewe_ruler.eo | 2 +-
13 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/src/bin/common/validator.c b/src/bin/common/validator.c
index 0b95702..eae52b9 100644
--- a/src/bin/common/validator.c
+++ b/src/bin/common/validator.c
@@ -112,5 +112,5 @@ resource_name_validator_helper(void *data, const Eo_Event
*event)
}
vc->signal = validator->signal;
if (validator->status)
- eo_event_callback_stop(event->object);
+ efl_event_callback_stop(event->object);
}
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index 55bf7fd..ac0721b 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -82,7 +82,7 @@ _add_colorclass_content_get(void *data __UNUSED__,
Evas_Object **to_focus)
LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "property", "1swallow")
ENTRY_ADD(item, mng.entry, true);
- eo_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, mng.name_validator);
+ efl_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, mng.name_validator);
evas_object_smart_callback_add(mng.entry, "changed", _validation, NULL);
elm_object_part_text_set(mng.entry, "guide", _("Type new color class name
here"));
elm_object_part_content_set(item, "elm.swallow.content", mng.entry);
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 2ae3320..71a97c3 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -400,7 +400,7 @@ _add_group_content_get(void *data __UNUSED__, Evas_Object
**to_focus)
LAYOUT_PROP_ADD(layout_p.box, _("Name"), "popup", "1swallow")
ENTRY_ADD(layout_p.box, layout_p.entry, true)
evas_object_smart_callback_add(layout_p.entry, "changed", _group_validate,
NULL);
- eo_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, validator);
+ efl_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, validator);
elm_layout_content_set(item, NULL, layout_p.entry);
elm_box_pack_end(layout_p.box, item);
glit = elm_genlist_selected_item_get(project_navigator.genlist);
diff --git a/src/bin/ui/property/property_group.c
b/src/bin/ui/property/property_group.c
index b72c62f..77554bd 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -792,10 +792,10 @@ _init_cb(Property_Attribute *pa, Property_Action *action)
elm_object_disabled_set(action->control, true);
break;
case ATTRIBUTE_PART_NAME:
- eo_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, group_pd.part_name_validator);
+ efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, group_pd.part_name_validator);
break;
case ATTRIBUTE_GROUP_DATA_NAME:
- eo_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, group_pd.group_data_name_validator);
+ efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, group_pd.group_data_name_validator);
break;
case ATTRIBUTE_STATE_IMAGE:
case ATTRIBUTE_GROUP_DATA_VALUE:
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index e46c79a..006ac1f 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -361,7 +361,7 @@ _add_tone_content_get(void *data __UNUSED__, Evas_Object
**to_focus)
elm_box_padding_set(box, 0, 10);
LAYOUT_PROP_ADD(box, _("Tone name:"), "popup", "1swallow")
ENTRY_ADD(item, mng.tone_entry, true);
- eo_event_callback_add(mng.tone_entry, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, mng.tone_validator);
+ efl_event_callback_add(mng.tone_entry, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, mng.tone_validator);
evas_object_smart_callback_add(mng.tone_entry, "changed", _validation,
NULL);
elm_object_part_text_set(mng.tone_entry, "guide", _("Type a new tone
name"));
elm_object_part_content_set(item, "elm.swallow.content", mng.tone_entry);
@@ -371,7 +371,7 @@ _add_tone_content_get(void *data __UNUSED__, Evas_Object
**to_focus)
LAYOUT_PROP_ADD(box, _("Frequency:"), "popup", "1swallow")
ENTRY_ADD(item, mng.frq_entry, true);
- eo_event_callback_add(mng.frq_entry, ELM_ENTRY_EVENT_VALIDATE,
elm_validator_regexp_helper, mng.frq_validator);
+ efl_event_callback_add(mng.frq_entry, ELM_ENTRY_EVENT_VALIDATE,
elm_validator_regexp_helper, mng.frq_validator);
evas_object_smart_callback_add(mng.frq_entry, "changed", _validation, NULL);
elm_object_part_text_set(mng.frq_entry, "guide", _("Type a frequency (20 -
20000)"));
elm_object_part_content_set(item, "elm.swallow.content", mng.frq_entry);
diff --git a/src/bin/ui/sound_player/sound_player.c
b/src/bin/ui/sound_player/sound_player.c
index 4760bd4..b50d306 100644
--- a/src/bin/ui/sound_player/sound_player.c
+++ b/src/bin/ui/sound_player/sound_player.c
@@ -112,16 +112,16 @@ _player_units_free(char *str)
static void
_play_finished_cb(void *data __UNUSED__, const Eo_Event *event __UNUSED__)
{
- eo_unref(in);
+ efl_unref(in);
in = NULL;
- eo_unref(out);
+ efl_unref(out);
out = NULL;
}
static void
_out_fail(void *data __UNUSED__, const Eo_Event *event)
{
- eo_unref(event->object);
+ efl_unref(event->object);
}
static Eina_Bool
@@ -157,13 +157,13 @@ _on_rewin_cb(void *data __UNUSED__,
static void
_create_io_stream()
{
- in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
assert(in != NULL);
- out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
+ out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
assert(out != NULL);
- eo_event_callback_add(out, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
+ efl_event_callback_add(out, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
_out_fail, NULL);
- eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED,
+ efl_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED,
_play_finished_cb, NULL);
}
static void
@@ -177,17 +177,17 @@ _tone_play()
if (!in)
{
- in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
ecore_audio_obj_name_set(in, tone->name);
- eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->freq);
+ efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->freq);
ecore_audio_obj_in_length_set(in, TONE_PLAYING_DURATION);
- eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED,
+ efl_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED,
_play_finished_cb, NULL);
}
if (!out)
- out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
- eo_event_callback_add(eo_self,
ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
+ out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
+ efl_event_callback_add(efl_self,
ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
_out_fail, NULL));
ret = ecore_audio_obj_out_input_attach(out, in);
@@ -307,9 +307,9 @@ _interrupt_playing()
elm_icon_standard_set(icon, "media_player/play");
playing = false;
- eo_unref(in);
+ efl_unref(in);
in = NULL;
- eo_unref(out);
+ efl_unref(out);
out = NULL;
}
}
diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c
index 8e44955..2c8691a 100644
--- a/src/bin/ui/style_manager.c
+++ b/src/bin/ui/style_manager.c
@@ -162,7 +162,7 @@ _add_style_content_get(void *data __UNUSED__, Evas_Object
**to_focus)
LAYOUT_PROP_ADD(mng.win, _("Style name:"), "popup", "1swallow");
mng.popup.item = item;
ENTRY_ADD(mng.popup.item, mng.popup.name, true);
- eo_event_callback_add(mng.popup.name, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, mng.popup.validator);
+ efl_event_callback_add(mng.popup.name, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, mng.popup.validator);
evas_object_smart_callback_add(mng.popup.name, "changed", _validate, NULL);
elm_object_part_text_set(mng.popup.name, "guide", _("Type a new style
name"));
elm_object_part_content_set(mng.popup.item, "elm.swallow.content",
mng.popup.name);
@@ -228,7 +228,7 @@ _add_tag_content_get(void *data __UNUSED__, Evas_Object
**to_focus)
LAYOUT_PROP_ADD(mng.win, "Tag name:", "popup", "1swallow");
ENTRY_ADD(item, mng.popup.name, true);
- eo_event_callback_add(mng.popup.name, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, mng.popup.validator);
+ efl_event_callback_add(mng.popup.name, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, mng.popup.validator);
evas_object_smart_callback_add(mng.popup.name, "changed", _validate, NULL);
elm_object_part_text_set(mng.popup.name, "guide", _("Type a new tag
name."));
elm_object_part_content_set(item, "elm.swallow.content", mng.popup.name);
diff --git a/src/bin/ui/tab_home_import_edc.c b/src/bin/ui/tab_home_import_edc.c
index ccd5d26..cbb76ee 100644
--- a/src/bin/ui/tab_home_import_edc.c
+++ b/src/bin/ui/tab_home_import_edc.c
@@ -491,7 +491,7 @@ _tab_import_edc_add(void)
/* label.name */
LAYOUT_PROP_ADD(tab_edc.box, _("Project name:"), "tab_home", "item")
ENTRY_ADD(item, tab_edc.name, true)
- eo_event_callback_add(tab_edc.name, ELM_ENTRY_EVENT_VALIDATE,
elm_validator_regexp_helper, tab_edc.name_validator);
+ efl_event_callback_add(tab_edc.name, ELM_ENTRY_EVENT_VALIDATE,
elm_validator_regexp_helper, tab_edc.name_validator);
evas_object_smart_callback_add(tab_edc.name, "changed", _validate, NULL);
elm_layout_content_set(item, NULL, tab_edc.name);
elm_box_pack_end(tab_edc.box, item);
diff --git a/src/bin/ui/tab_home_import_edj.c b/src/bin/ui/tab_home_import_edj.c
index 87a0bd5..af0956b 100644
--- a/src/bin/ui/tab_home_import_edj.c
+++ b/src/bin/ui/tab_home_import_edj.c
@@ -559,7 +559,7 @@ _tab_import_edj_add(void)
/* label.name */
elm_object_part_text_set(tab_edj.layout, "label.name", _("Project name:"));
ENTRY_ADD(tab_edj.layout, tab_edj.name, true)
- eo_event_callback_add(tab_edj.name, ELM_ENTRY_EVENT_VALIDATE,
elm_validator_regexp_helper, tab_edj.name_validator);
+ efl_event_callback_add(tab_edj.name, ELM_ENTRY_EVENT_VALIDATE,
elm_validator_regexp_helper, tab_edj.name_validator);
evas_object_smart_callback_add(tab_edj.name, "changed", _name_changed_cb,
NULL);
elm_object_part_content_set(tab_edj.layout, "swallow.name", tab_edj.name);
/* label.path */
diff --git a/src/bin/ui/tab_home_new.c b/src/bin/ui/tab_home_new.c
index d5dc0f1..5ec4e07 100644
--- a/src/bin/ui/tab_home_new.c
+++ b/src/bin/ui/tab_home_new.c
@@ -599,7 +599,7 @@ _tab_new_project_add(void)
/* label.name */
elm_object_part_text_set(tab_new.layout, "label.name", _("Project name:"));
ENTRY_ADD(tab_new.layout, tab_new.name, true)
- eo_event_callback_add(tab_new.name, ELM_ENTRY_EVENT_VALIDATE,
elm_validator_regexp_helper, tab_new.name_validator);
+ efl_event_callback_add(tab_new.name, ELM_ENTRY_EVENT_VALIDATE,
elm_validator_regexp_helper, tab_new.name_validator);
evas_object_smart_callback_add(tab_new.name, "changed", _validate, NULL);
elm_object_part_content_set(tab_new.layout, "swallow.name", tab_new.name);
/* label.path */
diff --git a/src/bin/ui/workspace/group_navigator.c
b/src/bin/ui/workspace/group_navigator.c
index a6e9fff..cec04c8 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -1103,7 +1103,7 @@ _add_part_content_get(void *data, Evas_Object **to_focus)
LAYOUT_PROP_ADD(box, _("Part name"), "popup", "1swallow")
ENTRY_ADD(box, pl->popup.entry_name, true);
- eo_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, pl->part_name_validator);
+ efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, pl->part_name_validator);
elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name
of the new part"));
resource_name_validator_list_set(pl->part_name_validator,
&pl->group->parts, false);
evas_object_smart_callback_add(pl->popup.entry_name, "changed",
_on_part_name_changed, pl);
@@ -1245,7 +1245,7 @@ _add_group_data_content_get(void *data, Evas_Object
**to_focus)
LAYOUT_PROP_ADD(box, _("Data item name"), "popup", "1swallow")
ENTRY_ADD(box, pl->popup.entry_name, true);
- eo_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, pl->group_data_name_validator);
+ efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper, pl->group_data_name_validator);
elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name
of the new group_data"));
resource_name_validator_list_set(pl->group_data_name_validator,
&pl->group->data_items, false);
evas_object_smart_callback_add(pl->popup.entry_name, "changed",
_on_group_data_name_changed, pl);
@@ -1395,7 +1395,7 @@ _add_state_content_get(void *data, Evas_Object **to_focus)
LAYOUT_PROP_ADD(box, _("State name"), "popup", "1swallow");
ENTRY_ADD(item, pl->popup.entry_name, true);
- eo_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
+ efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
elm_validator_regexp_helper, pl->name_validator);
evas_object_smart_callback_add(pl->popup.entry_name, "changed",
_state_validate, pl);
elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name
of the new state"));
@@ -1555,7 +1555,7 @@ _add_item_content_get(void *data, Evas_Object **to_focus)
LAYOUT_PROP_ADD(box, _("Name"), "popup", "1swallow")
ENTRY_ADD(item, pl->popup.entry_name, true);
- eo_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
+ efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
elm_validator_regexp_helper, pl->name_validator);
evas_object_smart_callback_add(pl->popup.entry_name, "changed",
_item_validate, pl);
elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter the name
of the new item"));
@@ -1695,7 +1695,7 @@ _add_program_content_get(void *data, Evas_Object
**to_focus)
LAYOUT_PROP_ADD(box, _("Program name"), "popup", "1swallow")
ENTRY_ADD(item, pl->popup.entry_name, true);
- eo_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
+ efl_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
resource_name_validator_helper,
pl->program_name_validator);
resource_name_validator_list_set(pl->program_name_validator,
&pl->group->programs, false);
evas_object_smart_callback_add(pl->popup.entry_name, "changed",
_program_validate, pl);
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index 20705e9..44ff418 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -18,8 +18,6 @@
#include "ewe_private.h"
#include "ewe_widget_ruler.h"
-EAPI Eo_Op EWE_OBJ_RULER_BASE_ID = EO_NOOP;
-
#define MY_CLASS EWE_RULER_CLASS
#define MY_CLASS_NAME "Ewe_Ruler"
@@ -781,7 +779,7 @@ _ewe_ruler_marker_style_get(Eo *obj EINA_UNUSED,
EOLIAN static void
_ewe_ruler_efl_canvas_group_group_add(Eo *obj, Ewe_Ruler_Smart_Data *sd)
{
- efl_canvas_group_add(eo_super(obj, MY_CLASS));
+ efl_canvas_group_add(efl_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj);
sd->obj = obj;
@@ -863,7 +861,7 @@ EOLIAN static void
_ewe_ruler_efl_canvas_group_group_hide(Eo* obj, Ewe_Ruler_Smart_Data *sd)
{
if (!sd->ruler_visible) return;
- efl_canvas_group_hide(eo_super(obj, MY_CLASS));
+ efl_canvas_group_hide(efl_super(obj, MY_CLASS));
Ewe_Ruler_Scale *scale;
Ewe_Ruler_Marker *marker;
Eina_List *ls, *l;
@@ -892,7 +890,7 @@ _ewe_ruler_efl_canvas_group_group_move(Eo *obj,
Evas_Coord y)
{
- efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y);
+ efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
evas_object_move(sd->clip, x, y);
evas_object_move(sd->bg, x, y);
@@ -915,7 +913,7 @@ _ewe_ruler_efl_canvas_group_group_resize(Eo *obj,
sd->geometry.width = w;
sd->geometry.height = h;
- efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
+ efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->clip, w, h);
evas_object_resize(sd->bg, w, h);
@@ -979,7 +977,7 @@ _ewe_ruler_elm_widget_theme_apply(Eo *obj,
Ewe_Ruler_Smart_Data *sd)
{
Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
int count;
- int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+ int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return ELM_THEME_APPLY_FAILED;
Ewe_Ruler_Scale *scale;
@@ -1016,7 +1014,7 @@ EAPI Evas_Object *
ewe_ruler_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = eo_add(MY_CLASS, parent);
+ Evas_Object *obj = efl_add(MY_CLASS, parent);
return obj;
}
@@ -1024,16 +1022,16 @@ ewe_ruler_add(Evas_Object *parent)
/* -----------------------------EO operations--------------------------------
*/
EOLIAN static Eo*
-_ewe_ruler_eo_base_constructor(Eo *obj, Ewe_Ruler_Smart_Data *sd)
+_ewe_ruler_efl_object_constructor(Eo *obj, Ewe_Ruler_Smart_Data *sd)
{
- obj = eo_constructor(eo_super(obj, MY_CLASS));
+ obj = efl_constructor(efl_super(obj, MY_CLASS));
sd->obj = obj;
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
return obj;
}
EOLIAN static void
-_ewe_ruler_class_constructor(Eo_Class *klass)
+_ewe_ruler_class_constructor(Efl_Class *klass)
{
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
diff --git a/src/lib/ewe_ruler.eo b/src/lib/ewe_ruler.eo
index 05f4897..5c97c67 100644
--- a/src/lib/ewe_ruler.eo
+++ b/src/lib/ewe_ruler.eo
@@ -313,7 +313,7 @@ class Ewe.Ruler (Elm.Widget)
}
implements {
class.constructor;
- Eo.Base.constructor;
+ Efl.Object.constructor;
Efl.Canvas.Group.group_add;
Efl.Canvas.Group.group_del;
Efl.Canvas.Group.group_resize;
--
