summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/default/base.src.in2
-rw-r--r--config/mobile/base.src.in2
-rw-r--r--config/standard/base.src.in2
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/Makefile_Elementary.am10
-rw-r--r--src/bin/elementary/test_efl_ui_text.c2
-rw-r--r--src/bin/elementary/test_evas_mask.c6
-rw-r--r--src/bin/elementary/test_evas_snapshot.c8
-rw-r--r--src/bin/elementary/test_gfx_filters.c2
-rw-r--r--src/examples/elementary/button_cxx_example_00.cc2
-rw-r--r--src/lib/elementary/efl_ui_button.c (renamed from src/lib/elementary/elm_button.c)68
-rw-r--r--src/lib/elementary/efl_ui_button.eo (renamed from src/lib/elementary/elm_button.eo)3
-rw-r--r--src/lib/elementary/efl_ui_button_eo.h1
-rw-r--r--src/lib/elementary/efl_ui_button_internal_part.eo (renamed from src/lib/elementary/elm_button_internal_part.eo)2
-rw-r--r--src/lib/elementary/efl_ui_button_private.h (renamed from src/lib/elementary/elm_widget_button.h)12
-rw-r--r--src/lib/elementary/efl_ui_nstate.c2
-rw-r--r--src/lib/elementary/efl_ui_nstate.eo2
-rw-r--r--src/lib/elementary/elm_button.h2
-rw-r--r--src/lib/elementary/elm_button_eo.h1
-rw-r--r--src/lib/elementary/elm_button_legacy.h2
-rw-r--r--src/lib/elementary/elm_combobox.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_button.eo2
-rw-r--r--src/lib/elementary/elm_hoversel.eo2
-rw-r--r--src/lib/elementary/elm_part_helper.h2
-rw-r--r--src/tests/elementary/elm_test_layout.c4
25 files changed, 72 insertions, 73 deletions
diff --git a/config/default/base.src.in b/config/default/base.src.in
index a2a698c00a..6c9cfd9952 100644
--- a/config/default/base.src.in
+++ b/config/default/base.src.in
@@ -608,7 +608,7 @@ group "Elm_Config" struct {
608 } 608 }
609 } 609 }
610 group "Elm_Config_Bindings_Widget" struct { 610 group "Elm_Config_Bindings_Widget" struct {
611 value "name" string: "Elm_Button"; 611 value "name" string: "Efl.Ui.Button";
612 group "key_bindings" list { 612 group "key_bindings" list {
613 group "Elm_Config_Binding_Key" struct { 613 group "Elm_Config_Binding_Key" struct {
614 value "context" int: 0; 614 value "context" int: 0;
diff --git a/config/mobile/base.src.in b/config/mobile/base.src.in
index 957e05f25a..b6b128b82a 100644
--- a/config/mobile/base.src.in
+++ b/config/mobile/base.src.in
@@ -612,7 +612,7 @@ group "Elm_Config" struct {
612 } 612 }
613 } 613 }
614 group "Elm_Config_Bindings_Widget" struct { 614 group "Elm_Config_Bindings_Widget" struct {
615 value "name" string: "Elm_Button"; 615 value "name" string: "Efl.Ui.Button";
616 group "key_bindings" list { 616 group "key_bindings" list {
617 group "Elm_Config_Binding_Key" struct { 617 group "Elm_Config_Binding_Key" struct {
618 value "context" int: 0; 618 value "context" int: 0;
diff --git a/config/standard/base.src.in b/config/standard/base.src.in
index d085e3a51f..61848b3da9 100644
--- a/config/standard/base.src.in
+++ b/config/standard/base.src.in
@@ -609,7 +609,7 @@ group "Elm_Config" struct {
609 } 609 }
610 } 610 }
611 group "Elm_Config_Bindings_Widget" struct { 611 group "Elm_Config_Bindings_Widget" struct {
612 value "name" string: "Elm_Button"; 612 value "name" string: "Efl.Ui.Button";
613 group "key_bindings" list { 613 group "key_bindings" list {
614 group "Elm_Config_Binding_Key" struct { 614 group "Elm_Config_Binding_Key" struct {
615 value "context" int: 0; 615 value "context" int: 0;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d5d211cc4..a5b38bf458 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -105,7 +105,7 @@ src/lib/elementary/elm_actionslider.c
105src/lib/elementary/elm_bg.c 105src/lib/elementary/elm_bg.c
106src/lib/elementary/elm_box.c 106src/lib/elementary/elm_box.c
107src/lib/elementary/elm_bubble.c 107src/lib/elementary/elm_bubble.c
108src/lib/elementary/elm_button.c 108src/lib/elementary/efl_ui_button.c
109src/lib/elementary/elm_calendar.c 109src/lib/elementary/elm_calendar.c
110src/lib/elementary/efl_ui_check.c 110src/lib/elementary/efl_ui_check.c
111src/lib/elementary/elm_clock.c 111src/lib/elementary/elm_clock.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 8b047fe615..483d8d2a4e 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -5,7 +5,7 @@ elm_public_eolian_files = \
5 lib/elementary/elm_atspi_bridge.eo \ 5 lib/elementary/elm_atspi_bridge.eo \
6 lib/elementary/elm_atspi_app_object.eo \ 6 lib/elementary/elm_atspi_app_object.eo \
7 lib/elementary/elm_bg.eo \ 7 lib/elementary/elm_bg.eo \
8 lib/elementary/elm_button.eo \ 8 lib/elementary/efl_ui_button.eo \
9 lib/elementary/elm_calendar.eo \ 9 lib/elementary/elm_calendar.eo \
10 lib/elementary/efl_ui_check.eo \ 10 lib/elementary/efl_ui_check.eo \
11 lib/elementary/elm_clock.eo \ 11 lib/elementary/elm_clock.eo \
@@ -94,7 +94,7 @@ elm_public_eolian_files = \
94 lib/elementary/efl_ui_grid_static.eo \ 94 lib/elementary/efl_ui_grid_static.eo \
95 lib/elementary/efl_ui_layout_internal_box.eo \ 95 lib/elementary/efl_ui_layout_internal_box.eo \
96 lib/elementary/efl_ui_layout_internal_table.eo \ 96 lib/elementary/efl_ui_layout_internal_table.eo \
97 lib/elementary/elm_button_internal_part.eo \ 97 lib/elementary/efl_ui_button_internal_part.eo \
98 lib/elementary/elm_ctxpopup_internal_part.eo \ 98 lib/elementary/elm_ctxpopup_internal_part.eo \
99 lib/elementary/elm_dayselector_internal_part.eo \ 99 lib/elementary/elm_dayselector_internal_part.eo \
100 lib/elementary/elm_entry_internal_part.eo \ 100 lib/elementary/elm_entry_internal_part.eo \
@@ -215,7 +215,7 @@ includesunstable_HEADERS = \
215 lib/elementary/elm_widget_bg.h \ 215 lib/elementary/elm_widget_bg.h \
216 lib/elementary/elm_widget_box.h \ 216 lib/elementary/elm_widget_box.h \
217 lib/elementary/elm_widget_bubble.h \ 217 lib/elementary/elm_widget_bubble.h \
218 lib/elementary/elm_widget_button.h \ 218 lib/elementary/efl_ui_button_private.h \
219 lib/elementary/elm_widget_calendar.h \ 219 lib/elementary/elm_widget_calendar.h \
220 lib/elementary/efl_ui_check_private.h \ 220 lib/elementary/efl_ui_check_private.h \
221 lib/elementary/elm_widget_clock.h \ 221 lib/elementary/elm_widget_clock.h \
@@ -333,7 +333,7 @@ includesub_HEADERS = \
333 lib/elementary/elm_bubble.h \ 333 lib/elementary/elm_bubble.h \
334 lib/elementary/elm_bubble_legacy.h \ 334 lib/elementary/elm_bubble_legacy.h \
335 lib/elementary/elm_button.h \ 335 lib/elementary/elm_button.h \
336 lib/elementary/elm_button_eo.h \ 336 lib/elementary/efl_ui_button_eo.h \
337 lib/elementary/elm_button_legacy.h \ 337 lib/elementary/elm_button_legacy.h \
338 lib/elementary/elm_cache.h \ 338 lib/elementary/elm_cache.h \
339 lib/elementary/elm_calendar.h \ 339 lib/elementary/elm_calendar.h \
@@ -553,7 +553,7 @@ lib_elementary_libelementary_la_SOURCES = \
553 lib/elementary/elm_bg.c \ 553 lib/elementary/elm_bg.c \
554 lib/elementary/elm_box.c \ 554 lib/elementary/elm_box.c \
555 lib/elementary/elm_bubble.c \ 555 lib/elementary/elm_bubble.c \
556 lib/elementary/elm_button.c \ 556 lib/elementary/efl_ui_button.c \
557 lib/elementary/elm_calendar.c \ 557 lib/elementary/elm_calendar.c \
558 lib/elementary/efl_ui_check.c \ 558 lib/elementary/efl_ui_check.c \
559 lib/elementary/elm_clock.c \ 559 lib/elementary/elm_clock.c \
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index 6ac5e5749d..a8e05b9680 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -84,7 +84,7 @@ my_efl_ui_text_anchor_hover_opened(void *data EINA_UNUSED, const Efl_Event *even
84 84
85 Efl_Ui_Text_Anchor_Hover_Info *ei = event->info; 85 Efl_Ui_Text_Anchor_Hover_Info *ei = event->info;
86 86
87 bt = efl_add(ELM_BUTTON_CLASS, en); 87 bt = efl_add(EFL_UI_BUTTON_CLASS, en);
88 elm_object_text_set(bt, ei->anchor_info->name); 88 elm_object_text_set(bt, ei->anchor_info->name);
89 evas_object_show(bt); 89 evas_object_show(bt);
90 elm_object_part_content_set(ei->hover, "middle", bt); 90 elm_object_part_content_set(ei->hover, "middle", bt);
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index 33b8d9bd42..9938e9f4ba 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -164,19 +164,19 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
164 efl_gfx_visible_set(efl_added, 1)); 164 efl_gfx_visible_set(efl_added, 1));
165 165
166 // FIXME: button EO API 166 // FIXME: button EO API
167 efl_add(ELM_BUTTON_CLASS, win, 167 efl_add(EFL_UI_BUTTON_CLASS, win,
168 efl_text_set(efl_added, "Toggle mask"), 168 efl_text_set(efl_added, "Toggle mask"),
169 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly), 169 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly),
170 efl_pack(box2, efl_added), 170 efl_pack(box2, efl_added),
171 efl_gfx_visible_set(efl_added, 1)); 171 efl_gfx_visible_set(efl_added, 1));
172 172
173 efl_add(ELM_BUTTON_CLASS, win, 173 efl_add(EFL_UI_BUTTON_CLASS, win,
174 efl_text_set(efl_added, "Toggle map"), 174 efl_text_set(efl_added, "Toggle map"),
175 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly), 175 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly),
176 efl_pack(box2, efl_added), 176 efl_pack(box2, efl_added),
177 efl_gfx_visible_set(efl_added, 1)); 177 efl_gfx_visible_set(efl_added, 1));
178 178
179 efl_add(ELM_BUTTON_CLASS, win, 179 efl_add(EFL_UI_BUTTON_CLASS, win,
180 efl_text_set(efl_added, "Rotate Window"), 180 efl_text_set(efl_added, "Rotate Window"),
181 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win), 181 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win),
182 efl_pack(box2, efl_added), 182 efl_pack(box2, efl_added),
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index 2a32277819..d7aa804efb 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -190,7 +190,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
190 efl_pack_grid(grid, efl_added, 0, GRID_SIZE + 1, GRID_SIZE, 1), 190 efl_pack_grid(grid, efl_added, 0, GRID_SIZE + 1, GRID_SIZE, 1),
191 efl_gfx_visible_set(efl_added, 1)); 191 efl_gfx_visible_set(efl_added, 1));
192 192
193 efl_add(ELM_BUTTON_CLASS, win, 193 efl_add(EFL_UI_BUTTON_CLASS, win,
194 efl_text_set(efl_added, "Toggle animation"), 194 efl_text_set(efl_added, "Toggle animation"),
195 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), 195 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
196 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 196 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
@@ -198,7 +198,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
198 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win), 198 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win),
199 efl_gfx_visible_set(efl_added, 1)); 199 efl_gfx_visible_set(efl_added, 1));
200 200
201 efl_add(ELM_BUTTON_CLASS, win, 201 efl_add(EFL_UI_BUTTON_CLASS, win,
202 efl_text_set(efl_added, "Save to file"), 202 efl_text_set(efl_added, "Save to file"),
203 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), 203 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
204 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 204 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
@@ -206,7 +206,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
206 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win), 206 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win),
207 efl_gfx_visible_set(efl_added, 1)); 207 efl_gfx_visible_set(efl_added, 1));
208 208
209 efl_add(ELM_BUTTON_CLASS, win, 209 efl_add(EFL_UI_BUTTON_CLASS, win,
210 efl_text_set(efl_added, "Map"), 210 efl_text_set(efl_added, "Map"),
211 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), 211 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
212 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 212 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
@@ -214,7 +214,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
214 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win), 214 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win),
215 efl_gfx_visible_set(efl_added, 1)); 215 efl_gfx_visible_set(efl_added, 1));
216 216
217 efl_add(ELM_BUTTON_CLASS, win, 217 efl_add(EFL_UI_BUTTON_CLASS, win,
218 efl_text_set(efl_added, "Close"), 218 efl_text_set(efl_added, "Close"),
219 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), 219 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
220 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 220 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index dfa8a084fb..c7e19f9f8b 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -368,7 +368,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
368 efl_gfx_visible_set(efl_added, 1)); 368 efl_gfx_visible_set(efl_added, 1));
369 efl_pack(box2, o); 369 efl_pack(box2, o);
370 370
371 o = efl_add(ELM_BUTTON_CLASS, win, 371 o = efl_add(EFL_UI_BUTTON_CLASS, win,
372 efl_text_set(efl_added, "Flip"), 372 efl_text_set(efl_added, "Flip"),
373 efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0), 373 efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0),
374 efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5), 374 efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5),
diff --git a/src/examples/elementary/button_cxx_example_00.cc b/src/examples/elementary/button_cxx_example_00.cc
index 79b9dcb93c..b3547cde68 100644
--- a/src/examples/elementary/button_cxx_example_00.cc
+++ b/src/examples/elementary/button_cxx_example_00.cc
@@ -23,7 +23,7 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED)
23 // win.title_set("Hello, World!"); 23 // win.title_set("Hello, World!");
24 win.autohide_set(true); 24 win.autohide_set(true);
25 25
26 ::elm::Button btn(win); 26 efl::ui::Button btn(win);
27 btn.eo_cxx::elm::Layout::text_set(nullptr,"Good-Bye, World!"); 27 btn.eo_cxx::elm::Layout::text_set(nullptr,"Good-Bye, World!");
28 btn.eo_cxx::efl::Gfx::size_set(120, 30); 28 btn.eo_cxx::efl::Gfx::size_set(120, 30);
29 btn.eo_cxx::efl::Gfx::position_set(60, 15); 29 btn.eo_cxx::efl::Gfx::position_set(60, 15);
diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/efl_ui_button.c
index 2ca0ae8e67..5303386313 100644
--- a/src/lib/elementary/elm_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -8,14 +8,14 @@
8 8
9#include <Elementary.h> 9#include <Elementary.h>
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_button.h" 11#include "efl_ui_button_private.h"
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13#include "elm_button_internal_part.eo.h" 13#include "efl_ui_button_internal_part.eo.h"
14#include "elm_part_helper.h" 14#include "elm_part_helper.h"
15 15
16#define MY_CLASS ELM_BUTTON_CLASS 16#define MY_CLASS EFL_UI_BUTTON_CLASS
17 17
18#define MY_CLASS_NAME "Elm_Button" 18#define MY_CLASS_NAME "Efl.Ui.Button"
19#define MY_CLASS_NAME_LEGACY "elm_button" 19#define MY_CLASS_NAME_LEGACY "elm_button"
20 20
21static const char SIG_CLICKED[] = "clicked"; 21static const char SIG_CLICKED[] = "clicked";
@@ -75,7 +75,7 @@ _activate(Evas_Object *obj)
75} 75}
76 76
77EOLIAN static void 77EOLIAN static void
78_elm_button_elm_layout_sizing_eval(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) 78_efl_ui_button_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
79{ 79{
80 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 80 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
81 Evas_Coord minw = -1, minh = -1; 81 Evas_Coord minw = -1, minh = -1;
@@ -87,7 +87,7 @@ _elm_button_elm_layout_sizing_eval(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
87} 87}
88 88
89EOLIAN static Eina_Bool 89EOLIAN static Eina_Bool
90_elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_Activate act) 90_efl_ui_button_elm_widget_activate(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Elm_Activate act)
91{ 91{
92 if (elm_widget_disabled_get(obj)) return EINA_FALSE; 92 if (elm_widget_disabled_get(obj)) return EINA_FALSE;
93 if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; 93 if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
@@ -120,7 +120,7 @@ _icon_signal_emit(Evas_Object *obj)
120 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 120 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
121 * can changed the theme API */ 121 * can changed the theme API */
122EOLIAN static Elm_Theme_Apply 122EOLIAN static Elm_Theme_Apply
123_elm_button_elm_widget_theme_apply(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) 123_efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
124{ 124{
125 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 125 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
126 126
@@ -135,7 +135,7 @@ _elm_button_elm_widget_theme_apply(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
135 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 135 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
136 * can changed the theme API */ 136 * can changed the theme API */
137EOLIAN static Eina_Bool 137EOLIAN static Eina_Bool
138_elm_button_elm_widget_sub_object_del(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj) 138_efl_ui_button_elm_widget_sub_object_del(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj)
139{ 139{
140 Eina_Bool int_ret = EINA_FALSE; 140 Eina_Bool int_ret = EINA_FALSE;
141 141
@@ -151,7 +151,7 @@ _elm_button_elm_widget_sub_object_del(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
151 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 151 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
152 * can changed the theme API */ 152 * can changed the theme API */
153static Eina_Bool 153static Eina_Bool
154_elm_button_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content) 154_efl_ui_button_content_set(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
155{ 155{
156 Eina_Bool int_ret = EINA_FALSE; 156 Eina_Bool int_ret = EINA_FALSE;
157 157
@@ -172,7 +172,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
172} 172}
173 173
174EOLIAN static Eina_Bool 174EOLIAN static Eina_Bool
175_elm_button_elm_widget_widget_event(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 175_efl_ui_button_elm_widget_widget_event(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
176{ 176{
177 (void) src; 177 (void) src;
178 Evas_Event_Key_Down *ev = event_info; 178 Evas_Event_Key_Down *ev = event_info;
@@ -281,7 +281,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
281} 281}
282 282
283EOLIAN static void 283EOLIAN static void
284_elm_button_efl_canvas_group_group_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) 284_efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
285{ 285{
286 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 286 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
287 287
@@ -312,13 +312,13 @@ _elm_button_efl_canvas_group_group_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED
312} 312}
313 313
314EOLIAN static const Elm_Layout_Part_Alias_Description* 314EOLIAN static const Elm_Layout_Part_Alias_Description*
315_elm_button_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) 315_efl_ui_button_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
316{ 316{
317 return _content_aliases; 317 return _content_aliases;
318} 318}
319 319
320EOLIAN static const Elm_Layout_Part_Alias_Description* 320EOLIAN static const Elm_Layout_Part_Alias_Description*
321_elm_button_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) 321_efl_ui_button_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
322{ 322{
323 return _text_aliases; 323 return _text_aliases;
324} 324}
@@ -332,7 +332,7 @@ elm_button_add(Evas_Object *parent)
332} 332}
333 333
334EOLIAN static Eo * 334EOLIAN static Eo *
335_elm_button_efl_object_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) 335_efl_ui_button_efl_object_constructor(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
336{ 336{
337 obj = efl_constructor(efl_super(obj, MY_CLASS)); 337 obj = efl_constructor(efl_super(obj, MY_CLASS));
338 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 338 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -343,7 +343,7 @@ _elm_button_efl_object_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
343} 343}
344 344
345EOLIAN static void 345EOLIAN static void
346_elm_button_efl_ui_autorepeat_autorepeat_enabled_set(Eo *obj EINA_UNUSED, Elm_Button_Data *sd, Eina_Bool on) 346_efl_ui_button_efl_ui_autorepeat_autorepeat_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *sd, Eina_Bool on)
347{ 347{
348 ELM_SAFE_FREE(sd->timer, ecore_timer_del); 348 ELM_SAFE_FREE(sd->timer, ecore_timer_del);
349 sd->autorepeat = on; 349 sd->autorepeat = on;
@@ -351,10 +351,10 @@ _elm_button_efl_ui_autorepeat_autorepeat_enabled_set(Eo *obj EINA_UNUSED, Elm_Bu
351} 351}
352 352
353#define _AR_CAPABLE(obj) \ 353#define _AR_CAPABLE(obj) \
354 (_internal_elm_button_autorepeat_supported_get(obj)) 354 (_internal_efl_ui_button_autorepeat_supported_get(obj))
355 355
356static Eina_Bool 356static Eina_Bool
357_internal_elm_button_autorepeat_supported_get(const Evas_Object *obj) 357_internal_efl_ui_button_autorepeat_supported_get(const Evas_Object *obj)
358{ 358{
359 Eina_Bool ret = EINA_FALSE; 359 Eina_Bool ret = EINA_FALSE;
360 ret = efl_ui_autorepeat_supported_get(obj); 360 ret = efl_ui_autorepeat_supported_get(obj);
@@ -362,19 +362,19 @@ _internal_elm_button_autorepeat_supported_get(const Evas_Object *obj)
362} 362}
363 363
364EOLIAN static Eina_Bool 364EOLIAN static Eina_Bool
365_elm_button_efl_ui_autorepeat_autorepeat_supported_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) 365_efl_ui_button_efl_ui_autorepeat_autorepeat_supported_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
366{ 366{
367 return EINA_TRUE; 367 return EINA_TRUE;
368} 368}
369 369
370EOLIAN static Eina_Bool 370EOLIAN static Eina_Bool
371_elm_button_efl_ui_autorepeat_autorepeat_enabled_get(Eo *obj, Elm_Button_Data *sd) 371_efl_ui_button_efl_ui_autorepeat_autorepeat_enabled_get(Eo *obj, Efl_Ui_Button_Data *sd)
372{ 372{
373 return (_AR_CAPABLE(obj) & sd->autorepeat); 373 return (_AR_CAPABLE(obj) & sd->autorepeat);
374} 374}
375 375
376EOLIAN static void 376EOLIAN static void
377_elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_set(Eo *obj, Elm_Button_Data *sd, double t) 377_efl_ui_button_efl_ui_autorepeat_autorepeat_initial_timeout_set(Eo *obj, Efl_Ui_Button_Data *sd, double t)
378{ 378{
379 if (!_AR_CAPABLE(obj)) 379 if (!_AR_CAPABLE(obj))
380 { 380 {
@@ -388,7 +388,7 @@ _elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_set(Eo *obj, Elm_Button
388} 388}
389 389
390EOLIAN static double 390EOLIAN static double
391_elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_get(Eo *obj, Elm_Button_Data *sd) 391_efl_ui_button_efl_ui_autorepeat_autorepeat_initial_timeout_get(Eo *obj, Efl_Ui_Button_Data *sd)
392{ 392{
393 if (!_AR_CAPABLE(obj)) 393 if (!_AR_CAPABLE(obj))
394 return 0.0; 394 return 0.0;
@@ -397,7 +397,7 @@ _elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_get(Eo *obj, Elm_Button
397} 397}
398 398
399EOLIAN static void 399EOLIAN static void
400_elm_button_efl_ui_autorepeat_autorepeat_gap_timeout_set(Eo *obj, Elm_Button_Data *sd, double t) 400_efl_ui_button_efl_ui_autorepeat_autorepeat_gap_timeout_set(Eo *obj, Efl_Ui_Button_Data *sd, double t)
401{ 401{
402 if (!_AR_CAPABLE(obj)) 402 if (!_AR_CAPABLE(obj))
403 { 403 {
@@ -412,25 +412,25 @@ _elm_button_efl_ui_autorepeat_autorepeat_gap_timeout_set(Eo *obj, Elm_Button_Dat
412} 412}
413 413
414EOLIAN static double 414EOLIAN static double
415_elm_button_efl_ui_autorepeat_autorepeat_gap_timeout_get(Eo *obj EINA_UNUSED, Elm_Button_Data *sd) 415_efl_ui_button_efl_ui_autorepeat_autorepeat_gap_timeout_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *sd)
416{ 416{
417 return sd->ar_gap_timeout; 417 return sd->ar_gap_timeout;
418} 418}
419 419
420EOLIAN static Eina_Bool 420EOLIAN static Eina_Bool
421_elm_button_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) 421_efl_ui_button_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
422{ 422{
423 return EINA_FALSE; 423 return EINA_FALSE;
424} 424}
425 425
426EOLIAN static Eina_Bool 426EOLIAN static Eina_Bool
427_elm_button_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) 427_efl_ui_button_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
428{ 428{
429 return EINA_FALSE; 429 return EINA_FALSE;
430} 430}
431 431
432EOLIAN const Elm_Atspi_Action * 432EOLIAN const Elm_Atspi_Action *
433_elm_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Button_Data *pd EINA_UNUSED) 433_efl_ui_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *pd EINA_UNUSED)
434{ 434{
435 static Elm_Atspi_Action atspi_actions[] = { 435 static Elm_Atspi_Action atspi_actions[] = {
436 { "activate", "activate", NULL, _key_action_activate }, 436 { "activate", "activate", NULL, _key_action_activate },
@@ -440,18 +440,18 @@ _elm_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
440} 440}
441 441
442static void 442static void
443_elm_button_class_constructor(Efl_Class *klass) 443_efl_ui_button_class_constructor(Efl_Class *klass)
444{ 444{
445 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 445 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
446} 446}
447 447
448EFL_TEXT_DEFAULT_IMPLEMENT(elm_button, Elm_Button_Data) 448EFL_TEXT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
449 449
450/* Efl.Part begin */ 450/* Efl.Part begin */
451 451
452ELM_PART_OVERRIDE(elm_button, ELM_BUTTON, ELM_LAYOUT, Elm_Button_Data, Elm_Part_Data) 452ELM_PART_OVERRIDE(efl_ui_button, EFL_UI_BUTTON, ELM_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
453ELM_PART_OVERRIDE_CONTENT_SET(elm_button, ELM_BUTTON, ELM_LAYOUT, Elm_Button_Data, Elm_Part_Data) 453ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_button, EFL_UI_BUTTON, ELM_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
454#include "elm_button_internal_part.eo.c" 454#include "efl_ui_button_internal_part.eo.c"
455 455
456/* Efl.Part end */ 456/* Efl.Part end */
457 457
@@ -493,7 +493,7 @@ elm_button_autorepeat_get(const Evas_Object *obj)
493 493
494/* Internal EO APIs and hidden overrides */ 494/* Internal EO APIs and hidden overrides */
495 495
496#define ELM_BUTTON_EXTRA_OPS \ 496#define EFL_UI_BUTTON_EXTRA_OPS \
497 EFL_CANVAS_GROUP_ADD_OPS(elm_button) 497 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)
498 498
499#include "elm_button.eo.c" 499#include "efl_ui_button.eo.c"
diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/efl_ui_button.eo
index 9489e6cc21..cdde5ceb4b 100644
--- a/src/lib/elementary/elm_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
1class Elm.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text, 1class Efl.Ui.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
2 Elm.Interface.Atspi_Widget_Action) 2 Elm.Interface.Atspi_Widget_Action)
3{ 3{
4 [[Push-button widget 4 [[Push-button widget
@@ -7,7 +7,6 @@ class Elm.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
7 and it also has an autorepeat feature. 7 and it also has an autorepeat feature.
8 ]] 8 ]]
9 legacy_prefix: elm_button; 9 legacy_prefix: elm_button;
10 eo_prefix: elm_obj_button;
11 methods { 10 methods {
12 } 11 }
13 implements { 12 implements {
diff --git a/src/lib/elementary/efl_ui_button_eo.h b/src/lib/elementary/efl_ui_button_eo.h
new file mode 100644
index 0000000000..5ef3a00d10
--- /dev/null
+++ b/src/lib/elementary/efl_ui_button_eo.h
@@ -0,0 +1 @@
#include "efl_ui_button.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_button_internal_part.eo b/src/lib/elementary/efl_ui_button_internal_part.eo
index 7d7c5bb51f..fde79c863d 100644
--- a/src/lib/elementary/elm_button_internal_part.eo
+++ b/src/lib/elementary/efl_ui_button_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Button.Internal.Part (Elm.Layout.Internal.Part) 1class Efl.Ui.Button.Internal.Part (Elm.Layout.Internal.Part)
2{ 2{
3 [[Elementary button internal part class]] 3 [[Elementary button internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_widget_button.h b/src/lib/elementary/efl_ui_button_private.h
index d227d5eb9b..49bfcdbae4 100644
--- a/src/lib/elementary/elm_widget_button.h
+++ b/src/lib/elementary/efl_ui_button_private.h
@@ -1,5 +1,5 @@
1#ifndef ELM_WIDGET_BUTTON_H 1#ifndef EFL_UI_BUTTON_PRIVATE_H
2#define ELM_WIDGET_BUTTON_H 2#define EFL_UI_BUTTON_PRIVATE_H
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
@@ -24,7 +24,7 @@
24/** 24/**
25 * Base widget smart data extended with button instance data. 25 * Base widget smart data extended with button instance data.
26 */ 26 */
27typedef struct _Elm_Button_Data 27typedef struct _Efl_Ui_button_Data
28{ 28{
29 /* auto-repeat stuff */ 29 /* auto-repeat stuff */
30 double ar_initial_timeout; /**< Time to wait until first auto-repeated click is generated */ 30 double ar_initial_timeout; /**< Time to wait until first auto-repeated click is generated */
@@ -34,14 +34,14 @@ typedef struct _Elm_Button_Data
34 34
35 Eina_Bool autorepeat : 1; /**< Whether auto-repetition of clicks is enabled or not (bound to _Elm_Button_Smart_Class::admits_autorepeat) */ 35 Eina_Bool autorepeat : 1; /**< Whether auto-repetition of clicks is enabled or not (bound to _Elm_Button_Smart_Class::admits_autorepeat) */
36 Eina_Bool repeating : 1; /**< Whether auto-repetition is going on */ 36 Eina_Bool repeating : 1; /**< Whether auto-repetition is going on */
37} Elm_Button_Data; 37} Efl_Ui_Button_Data;
38 38
39/** 39/**
40 * @} 40 * @}
41 */ 41 */
42 42
43#define ELM_BUTTON_DATA_GET(o, sd) \ 43#define ELM_BUTTON_DATA_GET(o, sd) \
44 Elm_Button_Data * sd = efl_data_scope_get(o, ELM_BUTTON_CLASS) 44 Efl_Ui_Button_Data * sd = efl_data_scope_get(o, EFL_UI_BUTTON_CLASS)
45 45
46#define ELM_BUTTON_DATA_GET_OR_RETURN(o, ptr) \ 46#define ELM_BUTTON_DATA_GET_OR_RETURN(o, ptr) \
47 ELM_BUTTON_DATA_GET(o, ptr); \ 47 ELM_BUTTON_DATA_GET(o, ptr); \
@@ -62,7 +62,7 @@ typedef struct _Elm_Button_Data
62 } 62 }
63 63
64#define ELM_BUTTON_CHECK(obj) \ 64#define ELM_BUTTON_CHECK(obj) \
65 if (EINA_UNLIKELY(!efl_isa((obj), ELM_BUTTON_CLASS))) \ 65 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_BUTTON_CLASS))) \
66 return 66 return
67 67
68#endif 68#endif
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index 271a4b1c35..fc5a56fb70 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -6,7 +6,7 @@
6#include "Elementary.h" 6#include "Elementary.h"
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "efl_ui_nstate.eo.h" 8#include "efl_ui_nstate.eo.h"
9#include "elm_widget_button.h" 9#include "efl_ui_button_private.h"
10 10
11#define MY_CLASS EFL_UI_NSTATE_CLASS 11#define MY_CLASS EFL_UI_NSTATE_CLASS
12#define MY_CLASS_NAME "Efl.Ui.Nstate" 12#define MY_CLASS_NAME "Efl.Ui.Nstate"
diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo
index a3546f6536..7f8bb978f6 100644
--- a/src/lib/elementary/efl_ui_nstate.eo
+++ b/src/lib/elementary/efl_ui_nstate.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Nstate(Elm.Button) 1class Efl.Ui.Nstate(Efl.Ui.Button)
2{ 2{
3 [[Efl UI nstate class]] 3 [[Efl UI nstate class]]
4 methods { 4 methods {
diff --git a/src/lib/elementary/elm_button.h b/src/lib/elementary/elm_button.h
index 0df901ff1b..f8396a730c 100644
--- a/src/lib/elementary/elm_button.h
+++ b/src/lib/elementary/elm_button.h
@@ -68,7 +68,7 @@
68 */ 68 */
69 69
70#ifdef EFL_EO_API_SUPPORT 70#ifdef EFL_EO_API_SUPPORT
71#include "elm_button_eo.h" 71#include "efl_ui_button_eo.h"
72#endif 72#endif
73#ifndef EFL_NOLEGACY_API_SUPPORT 73#ifndef EFL_NOLEGACY_API_SUPPORT
74#include "elm_button_legacy.h" 74#include "elm_button_legacy.h"
diff --git a/src/lib/elementary/elm_button_eo.h b/src/lib/elementary/elm_button_eo.h
deleted file mode 100644
index c77b179516..0000000000
--- a/src/lib/elementary/elm_button_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_button.eo.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_button_legacy.h b/src/lib/elementary/elm_button_legacy.h
index ee7fe79eaf..05760f82db 100644
--- a/src/lib/elementary/elm_button_legacy.h
+++ b/src/lib/elementary/elm_button_legacy.h
@@ -108,4 +108,4 @@ EAPI void elm_button_autorepeat_set(Evas_Object *obj, Ein
108 */ 108 */
109EAPI Eina_Bool elm_button_autorepeat_get(const Evas_Object *obj); 109EAPI Eina_Bool elm_button_autorepeat_get(const Evas_Object *obj);
110 110
111#include "elm_button.eo.legacy.h" 111#include "efl_ui_button.eo.legacy.h"
diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index def7430efe..d4633a11d5 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/elm_combobox.eo
@@ -1,4 +1,4 @@
1class Elm.Combobox (Elm.Button, Efl.Ui.Selectable, 1class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Elm.Entry, Elm.Genlist, Elm.Hover) 3 Elm.Entry, Elm.Genlist, Elm.Hover)
4{ 4{
diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo
index 977e39110e..5cfcb544bc 100644
--- a/src/lib/elementary/elm_fileselector_button.eo
+++ b/src/lib/elementary/elm_fileselector_button.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector_Button (Elm.Button, Elm.Interface.Fileselector) 1class Elm.Fileselector_Button (Efl.Ui.Button, Elm.Interface.Fileselector)
2{ 2{
3 [[Elementary fileselector button class]] 3 [[Elementary fileselector button class]]
4 event_prefix: elm_fileselector_button; 4 event_prefix: elm_fileselector_button;
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 4b5204f85d..fcdd6cfa57 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -1,6 +1,6 @@
1import elm_general; 1import elm_general;
2 2
3class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable, 3class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable,
4 Efl.Ui.Clickable, 4 Efl.Ui.Clickable,
5 Elm.Interface.Atspi_Widget_Action) 5 Elm.Interface.Atspi_Widget_Action)
6{ 6{
diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h
index 017365ad7b..36c7888406 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -133,7 +133,7 @@ _ ## type ## _efl_text_text_set(Eo *obj, Type *pd EINA_UNUSED, const char *text)
133} \ 133} \
134\ 134\
135EOLIAN static const char * \ 135EOLIAN static const char * \
136_ ## type ## _efl_text_text_get(Eo *obj, Elm_Button_Data *pd EINA_UNUSED) \ 136_ ## type ## _efl_text_text_get(Eo *obj, Efl_Ui_Button_Data *pd EINA_UNUSED) \
137{ \ 137{ \
138 return elm_layout_text_get(obj, NULL); \ 138 return elm_layout_text_get(obj, NULL); \
139} 139}
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 725ab602c4..87004b52f8 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -37,7 +37,7 @@ START_TEST(elm_layout_swallows)
37 elm_layout_file_set(ly, buf, "layout"); 37 elm_layout_file_set(ly, buf, "layout");
38 evas_object_show(ly); 38 evas_object_show(ly);
39 39
40 bt = efl_add(ELM_BUTTON_CLASS, ly); 40 bt = efl_add(EFL_UI_BUTTON_CLASS, ly);
41 fail_if(!efl_content_set(efl_part(ly, "element1"), bt)); 41 fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
42 ck_assert_ptr_eq(efl_parent_get(bt), ly); 42 ck_assert_ptr_eq(efl_parent_get(bt), ly);
43 43
@@ -47,7 +47,7 @@ START_TEST(elm_layout_swallows)
47 fail_if(!efl_content_set(efl_part(ly, "element1"), bt)); 47 fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
48 ck_assert_ptr_eq(efl_parent_get(bt), ly); 48 ck_assert_ptr_eq(efl_parent_get(bt), ly);
49 49
50 bt2 = efl_add(ELM_BUTTON_CLASS, ly); 50 bt2 = efl_add(EFL_UI_BUTTON_CLASS, ly);
51 fail_if(!efl_content_set(efl_part(ly, "element1"), bt2)); 51 fail_if(!efl_content_set(efl_part(ly, "element1"), bt2));
52 ck_assert_ptr_eq(efl_parent_get(bt2), ly); 52 ck_assert_ptr_eq(efl_parent_get(bt2), ly);
53 /* bt is deleted at this point. */ 53 /* bt is deleted at this point. */