aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-14 21:14:52 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-15 13:28:48 -0500
commitb493f15069f39db806182245d557d08c2c054d30 (patch)
tree45c518f56bdd3adc5f0f26b1b514c3121c66fe2f /src
parentEfl.Access: resolve more name conflicts (diff)
downloadefl-b493f15069f39db806182245d557d08c2c054d30.tar.gz
Efl.Access.Editable.Text: content -> text_content
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_access_editable_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/efl_ui_text.eo2
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_entry.eo2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/elementary/efl_access_editable_text.eo b/src/lib/elementary/efl_access_editable_text.eo
index 14d8b280e8..a1ec68f9c2 100644
--- a/src/lib/elementary/efl_access_editable_text.eo
+++ b/src/lib/elementary/efl_access_editable_text.eo
@@ -2,7 +2,7 @@ interface Efl.Access.Editable.Text ()
{
[[Elementary editable text interface]]
methods {
- @property content @protected @beta {
+ @property text_content @protected @beta {
[[Editable content property]]
set {
return: bool; [[$true if setting the value succeeded, $false otherwise]]
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 6604752c6f..cb46df142e 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -4383,7 +4383,7 @@ _efl_ui_text_efl_access_text_default_attributes_get(Eo *obj, Efl_Ui_Text_Data *_
}
EOLIAN static Eina_Bool
-_efl_ui_text_efl_access_editable_text_content_set(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, const char *content)
+_efl_ui_text_efl_access_editable_text_text_content_set(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, const char *content)
{
efl_text_set(obj, content);
return EINA_TRUE;
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index e873d9649c..52b05917bb 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -355,7 +355,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Access.Text.selections_count { get; }
Efl.Access.Text.selection_add;
Efl.Access.Text.selection_remove;
- Efl.Access.Editable.Text.content { set; }
+ Efl.Access.Editable.Text.text_content { set; }
Efl.Access.Editable.Text.insert;
Efl.Access.Editable.Text.copy;
Efl.Access.Editable.Text.cut;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index c041770f76..7278f3f33c 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -5960,7 +5960,7 @@ _elm_entry_efl_access_text_default_attributes_get(Eo *obj EINA_UNUSED, Elm_Entry
}
EOLIAN static Eina_Bool
-_elm_entry_efl_access_editable_text_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *content)
+_elm_entry_efl_access_editable_text_text_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *content)
{
elm_entry_entry_set(obj, content);
return EINA_TRUE;
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 5a1e679bef..c61ba350ac 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -868,7 +868,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Access.Text.selections_count { get; }
Efl.Access.Text.selection_add;
Efl.Access.Text.selection_remove;
- Efl.Access.Editable.Text.content { set; }
+ Efl.Access.Editable.Text.text_content { set; }
Efl.Access.Editable.Text.insert;
Efl.Access.Editable.Text.copy;
Efl.Access.Editable.Text.cut;