aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-11-16 19:00:48 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-16 19:11:51 +0900
commit313eb563b50bec68019b3f570f3465bbdd0a5586 (patch)
tree36488c70e75f19ffc28d132b6b8710f60d69d729 /src/lib/elementary/efl_ui_win.c
parentelm: return Efl.Access.Actions only if action_area is not set (diff)
downloadefl-313eb563b50bec68019b3f570f3465bbdd0a5586.tar.gz
win: Rename specific APIs to avoid clashes
This renames 3 basic APIs specific to Win: - name - type - role Ref https://phab.enlightenment.org/T5322
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 4c870ad82d..4ab637dd9a 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4657,7 +4657,7 @@ _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine)
}
static Eo *
-_elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_Win_Type type)
+_elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_Ui_Win_Type type)
{
Evas_Object *parent = NULL;
Evas *e;
@@ -5437,7 +5437,7 @@ _efl_ui_win_efl_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
}
EOLIAN static void
-_efl_ui_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Win_Type type)
+_efl_ui_win_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Type type)
{
if (efl_finalized_get(obj))
{
@@ -5448,13 +5448,13 @@ _efl_ui_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Win_Type type)
}
EOLIAN static Efl_Ui_Win_Type
-_efl_ui_win_type_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
+_efl_ui_win_win_type_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
{
return sd->type;
}
EOLIAN static void
-_efl_ui_win_name_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *name)
+_efl_ui_win_win_name_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *name)
{
if (efl_finalized_get(obj))
{
@@ -5465,7 +5465,7 @@ _efl_ui_win_name_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *name)
}
EOLIAN static const char *
-_efl_ui_win_name_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
+_efl_ui_win_win_name_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
{
return sd->name;
}
@@ -5503,7 +5503,7 @@ _efl_ui_win_noblank_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd)
}
EOLIAN static void
-_efl_ui_win_role_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *role)
+_efl_ui_win_win_role_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *role)
{
if (!role) return;
eina_stringshare_replace(&(sd->role), role);
@@ -5513,7 +5513,7 @@ _efl_ui_win_role_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *role)
}
EOLIAN static const char*
-_efl_ui_win_role_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
+_efl_ui_win_win_role_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
{
return sd->role;
}
@@ -8127,7 +8127,7 @@ _fake_canvas_set(Evas_Object *obj, Ecore_Evas *oee)
}
EAPI Evas_Object *
-elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
+elm_win_add(Evas_Object *parent, const char *name, Efl_Ui_Win_Type type)
{
const Efl_Class *klass = MY_CLASS;