summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubhransu Mohanty <sub.mohanty@samsung.com>2016-07-04 20:10:29 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-07-04 20:21:12 +0900
commit53035f23e6d4d0cfc93356c1776d8a2a58d18f91 (patch)
tree00942c75994c8a1de49b2e07ee8023541832dd27
parent186d9938cd56ae94cededa32136b6f06080fe6e6 (diff)
elm_frame: updated the eo prefix and documentation
Summary: No idea what else can be done with this widget. Reviewers: jpeg, cedric, woohyun Subscribers: raster, cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3930
-rw-r--r--src/Makefile_Elementary.am10
-rw-r--r--src/lib/elementary/Makefile.am10
-rw-r--r--src/lib/elementary/efl_ui_frame.c (renamed from src/lib/elementary/elm_frame.c)46
-rw-r--r--src/lib/elementary/efl_ui_frame.eo (renamed from src/lib/elementary/elm_frame.eo)10
-rw-r--r--src/lib/elementary/efl_ui_frame_legacy.h (renamed from src/lib/elementary/elm_frame_legacy.h)2
-rw-r--r--src/lib/elementary/efl_ui_widget_frame.h (renamed from src/lib/elementary/elm_widget_frame.h)24
-rw-r--r--src/lib/elementary/elm_frame.h4
-rw-r--r--src/lib/elementary/elm_frame_eo.h1
8 files changed, 55 insertions, 52 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 12d5961815..9011b24e3d 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -30,7 +30,7 @@ elm_public_eolian_files = \
30 lib/elementary/efl_ui_flip.eo \ 30 lib/elementary/efl_ui_flip.eo \
31 lib/elementary/efl_ui_flip_internal_part.eo \ 31 lib/elementary/efl_ui_flip_internal_part.eo \
32 lib/elementary/elm_flipselector.eo \ 32 lib/elementary/elm_flipselector.eo \
33 lib/elementary/elm_frame.eo \ 33 lib/elementary/efl_ui_frame.eo \
34 lib/elementary/elm_gengrid.eo \ 34 lib/elementary/elm_gengrid.eo \
35 lib/elementary/elm_gengrid_pan.eo \ 35 lib/elementary/elm_gengrid_pan.eo \
36 lib/elementary/elm_genlist.eo \ 36 lib/elementary/elm_genlist.eo \
@@ -228,7 +228,7 @@ includesunstable_HEADERS = \
228 lib/elementary/elm_widget_fileselector_entry.h \ 228 lib/elementary/elm_widget_fileselector_entry.h \
229 lib/elementary/efl_ui_widget_flip.h \ 229 lib/elementary/efl_ui_widget_flip.h \
230 lib/elementary/elm_widget_flipselector.h \ 230 lib/elementary/elm_widget_flipselector.h \
231 lib/elementary/elm_widget_frame.h \ 231 lib/elementary/efl_ui_widget_frame.h \
232 lib/elementary/elm_widget_gengrid.h \ 232 lib/elementary/elm_widget_gengrid.h \
233 lib/elementary/elm_widget_genlist.h \ 233 lib/elementary/elm_widget_genlist.h \
234 lib/elementary/elm_widget_glview.h \ 234 lib/elementary/elm_widget_glview.h \
@@ -395,8 +395,8 @@ includesub_HEADERS = \
395 lib/elementary/elm_focus_item.h \ 395 lib/elementary/elm_focus_item.h \
396 lib/elementary/elm_font.h \ 396 lib/elementary/elm_font.h \
397 lib/elementary/elm_frame.h \ 397 lib/elementary/elm_frame.h \
398 lib/elementary/elm_frame_eo.h \ 398 lib/elementary/efl_ui_frame.eo.h \
399 lib/elementary/elm_frame_legacy.h \ 399 lib/elementary/efl_ui_frame_legacy.h \
400 lib/elementary/elm_gen.h \ 400 lib/elementary/elm_gen.h \
401 lib/elementary/elm_general.h \ 401 lib/elementary/elm_general.h \
402 lib/elementary/elm_gengrid.h \ 402 lib/elementary/elm_gengrid.h \
@@ -612,7 +612,7 @@ lib_elementary_libelementary_la_SOURCES = \
612 lib/elementary/efl_ui_internal_text_interactive.c \ 612 lib/elementary/efl_ui_internal_text_interactive.c \
613 lib/elementary/elm_flipselector.c \ 613 lib/elementary/elm_flipselector.c \
614 lib/elementary/elm_font.c \ 614 lib/elementary/elm_font.c \
615 lib/elementary/elm_frame.c \ 615 lib/elementary/efl_ui_frame.c \
616 lib/elementary/elm_gengrid.c \ 616 lib/elementary/elm_gengrid.c \
617 lib/elementary/elm_genlist.c \ 617 lib/elementary/elm_genlist.c \
618 lib/elementary/elm_gesture_layer.c \ 618 lib/elementary/elm_gesture_layer.c \
diff --git a/src/lib/elementary/Makefile.am b/src/lib/elementary/Makefile.am
index 3b8cd0e104..53739bdb6a 100644
--- a/src/lib/elementary/Makefile.am
+++ b/src/lib/elementary/Makefile.am
@@ -34,7 +34,7 @@ elm_eolian_files = \
34 efl_ui_flip.eo \ 34 efl_ui_flip.eo \
35 efl_ui_flip_internal_part.eo \ 35 efl_ui_flip_internal_part.eo \
36 elm_flipselector.eo \ 36 elm_flipselector.eo \
37 elm_frame.eo \ 37 efl_ui_frame.eo \
38 elm_gengrid.eo \ 38 elm_gengrid.eo \
39 elm_gengrid_pan.eo \ 39 elm_gengrid_pan.eo \
40 elm_genlist.eo \ 40 elm_genlist.eo \
@@ -185,7 +185,7 @@ includesunstable_HEADERS = \
185 elm_widget_fileselector_entry.h \ 185 elm_widget_fileselector_entry.h \
186 efl_ui_widget_flip.h \ 186 efl_ui_widget_flip.h \
187 elm_widget_flipselector.h \ 187 elm_widget_flipselector.h \
188 elm_widget_frame.h \ 188 efl_ui_widget_frame.h \
189 elm_widget_gengrid.h \ 189 elm_widget_gengrid.h \
190 elm_widget_genlist.h \ 190 elm_widget_genlist.h \
191 elm_widget_glview.h \ 191 elm_widget_glview.h \
@@ -340,8 +340,8 @@ includesub_HEADERS = \
340 elm_focus_item.h \ 340 elm_focus_item.h \
341 elm_font.h \ 341 elm_font.h \
342 elm_frame.h \ 342 elm_frame.h \
343 elm_frame_eo.h \ 343 efl_ui_frame.eo.h \
344 elm_frame_legacy.h \ 344 efl_ui_frame_legacy.h \
345 elm_gen.h \ 345 elm_gen.h \
346 elm_general.h \ 346 elm_general.h \
347 elm_gengrid.h \ 347 elm_gengrid.h \
@@ -548,7 +548,7 @@ libelementary_la_SOURCES = \
548 efl_ui_flip.c \ 548 efl_ui_flip.c \
549 elm_flipselector.c \ 549 elm_flipselector.c \
550 elm_font.c \ 550 elm_font.c \
551 elm_frame.c \ 551 efl_ui_frame.c \
552 elm_gengrid.c \ 552 elm_gengrid.c \
553 elm_genlist.c \ 553 elm_genlist.c \
554 elm_gesture_layer.c \ 554 elm_gesture_layer.c \
diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/efl_ui_frame.c
index b89d5a23fd..7d8a0bbf27 100644
--- a/src/lib/elementary/elm_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -7,12 +7,12 @@
7 7
8#include <Elementary.h> 8#include <Elementary.h>
9#include "elm_priv.h" 9#include "elm_priv.h"
10#include "elm_widget_frame.h" 10#include "efl_ui_widget_frame.h"
11#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
12 12
13#define MY_CLASS ELM_FRAME_CLASS 13#define MY_CLASS EFL_UI_FRAME_CLASS
14 14
15#define MY_CLASS_NAME "Elm_Frame" 15#define MY_CLASS_NAME "Efl_Ui_Frame"
16#define MY_CLASS_NAME_LEGACY "elm_frame" 16#define MY_CLASS_NAME_LEGACY "elm_frame"
17 17
18static const char SIG_CLICKED[] = "clicked"; 18static const char SIG_CLICKED[] = "clicked";
@@ -38,14 +38,14 @@ static const Elm_Layout_Part_Alias_Description _text_aliases[] =
38 38
39static void 39static void
40_sizing_eval(Evas_Object *obj, 40_sizing_eval(Evas_Object *obj,
41 Elm_Frame_Data *sd EINA_UNUSED) 41 Efl_Ui_Frame_Data *sd EINA_UNUSED)
42{ 42{
43 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 43 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
44 Evas_Coord minw = -1, minh = -1; 44 Evas_Coord minw = -1, minh = -1;
45 Evas_Coord cminw = -1, cminh = -1; 45 Evas_Coord cminw = -1, cminh = -1;
46 46
47 edje_object_size_min_calc(wd->resize_obj, &minw, &minh); 47 edje_object_size_min_calc(wd->resize_obj, &minw, &minh);
48 efl_gfx_size_hint_combined_min_get(obj, &cminw, &cminh); 48 evas_object_size_hint_min_get(obj, &cminw, &cminh);
49 if ((minw == cminw) && (minh == cminh)) return; 49 if ((minw == cminw) && (minh == cminh)) return;
50 50
51 evas_object_size_hint_min_set(obj, minw, minh); 51 evas_object_size_hint_min_set(obj, minw, minh);
@@ -53,13 +53,13 @@ _sizing_eval(Evas_Object *obj,
53} 53}
54 54
55EOLIAN static Eina_Bool 55EOLIAN static Eina_Bool
56_elm_frame_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED) 56_efl_ui_frame_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
57{ 57{
58 return EINA_TRUE; 58 return EINA_TRUE;
59} 59}
60 60
61EOLIAN static Eina_Bool 61EOLIAN static Eina_Bool
62_elm_frame_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item) 62_efl_ui_frame_elm_widget_focus_next(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *_pd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
63{ 63{
64 Evas_Object *content; 64 Evas_Object *content;
65 65
@@ -75,13 +75,13 @@ _elm_frame_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_U
75} 75}
76 76
77EOLIAN static Eina_Bool 77EOLIAN static Eina_Bool
78_elm_frame_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED) 78_efl_ui_frame_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
79{ 79{
80 return EINA_TRUE; 80 return EINA_TRUE;
81} 81}
82 82
83EOLIAN static Eina_Bool 83EOLIAN static Eina_Bool
84_elm_frame_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight) 84_efl_ui_frame_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *_pd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
85{ 85{
86 Evas_Object *content; 86 Evas_Object *content;
87 87
@@ -109,7 +109,7 @@ _on_recalc_done(void *data,
109 const char *sig EINA_UNUSED, 109 const char *sig EINA_UNUSED,
110 const char *src EINA_UNUSED) 110 const char *src EINA_UNUSED)
111{ 111{
112 ELM_FRAME_DATA_GET(data, sd); 112 EFL_UI_FRAME_DATA_GET(data, sd);
113 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 113 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
114 114
115 eo_event_callback_del 115 eo_event_callback_del
@@ -125,7 +125,7 @@ _on_frame_clicked(void *data,
125 const char *sig EINA_UNUSED, 125 const char *sig EINA_UNUSED,
126 const char *src EINA_UNUSED) 126 const char *src EINA_UNUSED)
127{ 127{
128 ELM_FRAME_DATA_GET(data, sd); 128 EFL_UI_FRAME_DATA_GET(data, sd);
129 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 129 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
130 130
131 if (sd->anim) return; 131 if (sd->anim) return;
@@ -143,7 +143,7 @@ _on_frame_clicked(void *data,
143 143
144/* using deferred sizing evaluation, just like the parent */ 144/* using deferred sizing evaluation, just like the parent */
145EOLIAN static void 145EOLIAN static void
146_elm_frame_efl_canvas_group_group_calculate(Eo *obj, Elm_Frame_Data *sd) 146_efl_ui_frame_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Frame_Data *sd)
147{ 147{
148 ELM_LAYOUT_DATA_GET(obj, ld); 148 ELM_LAYOUT_DATA_GET(obj, ld);
149 149
@@ -156,7 +156,7 @@ _elm_frame_efl_canvas_group_group_calculate(Eo *obj, Elm_Frame_Data *sd)
156} 156}
157 157
158EOLIAN static void 158EOLIAN static void
159_elm_frame_efl_canvas_group_group_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) 159_efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
160{ 160{
161 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 161 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
162 162
@@ -179,13 +179,13 @@ _elm_frame_efl_canvas_group_group_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
179} 179}
180 180
181EOLIAN static const Elm_Layout_Part_Alias_Description* 181EOLIAN static const Elm_Layout_Part_Alias_Description*
182_elm_frame_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED) 182_efl_ui_frame_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
183{ 183{
184 return _content_aliases; 184 return _content_aliases;
185} 185}
186 186
187EOLIAN static const Elm_Layout_Part_Alias_Description* 187EOLIAN static const Elm_Layout_Part_Alias_Description*
188_elm_frame_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED) 188_efl_ui_frame_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
189{ 189{
190 return _text_aliases; 190 return _text_aliases;
191} 191}
@@ -199,7 +199,7 @@ elm_frame_add(Evas_Object *parent)
199} 199}
200 200
201EOLIAN static Eo * 201EOLIAN static Eo *
202_elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) 202_efl_ui_frame_eo_base_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
203{ 203{
204 obj = eo_constructor(eo_super(obj, MY_CLASS)); 204 obj = eo_constructor(eo_super(obj, MY_CLASS));
205 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 205 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -210,20 +210,20 @@ _elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
210} 210}
211 211
212EOLIAN static void 212EOLIAN static void
213_elm_frame_autocollapse_set(Eo *obj EINA_UNUSED, Elm_Frame_Data *sd, Eina_Bool autocollapse) 213_efl_ui_frame_autocollapse_set(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *sd, Eina_Bool autocollapse)
214{ 214{
215 215
216 sd->collapsible = !!autocollapse; 216 sd->collapsible = !!autocollapse;
217} 217}
218 218
219EOLIAN static Eina_Bool 219EOLIAN static Eina_Bool
220_elm_frame_autocollapse_get(Eo *obj EINA_UNUSED, Elm_Frame_Data *sd) 220_efl_ui_frame_autocollapse_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *sd)
221{ 221{
222 return sd->collapsible; 222 return sd->collapsible;
223} 223}
224 224
225EOLIAN static void 225EOLIAN static void
226_elm_frame_collapse_set(Eo *obj, Elm_Frame_Data *sd, Eina_Bool collapse) 226_efl_ui_frame_collapse_set(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
227{ 227{
228 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 228 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
229 229
@@ -239,7 +239,7 @@ _elm_frame_collapse_set(Eo *obj, Elm_Frame_Data *sd, Eina_Bool collapse)
239} 239}
240 240
241EOLIAN static void 241EOLIAN static void
242_elm_frame_collapse_go(Eo *obj, Elm_Frame_Data *sd, Eina_Bool collapse) 242_efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
243{ 243{
244 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 244 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
245 245
@@ -254,15 +254,15 @@ _elm_frame_collapse_go(Eo *obj, Elm_Frame_Data *sd, Eina_Bool collapse)
254} 254}
255 255
256EOLIAN static Eina_Bool 256EOLIAN static Eina_Bool
257_elm_frame_collapse_get(Eo *obj EINA_UNUSED, Elm_Frame_Data *sd) 257_efl_ui_frame_collapse_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *sd)
258{ 258{
259 return sd->collapsed; 259 return sd->collapsed;
260} 260}
261 261
262EOLIAN static void 262EOLIAN static void
263_elm_frame_class_constructor(Eo_Class *klass) 263_efl_ui_frame_class_constructor(Eo_Class *klass)
264{ 264{
265 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 265 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
266} 266}
267 267
268#include "elm_frame.eo.c" 268#include "efl_ui_frame.eo.c"
diff --git a/src/lib/elementary/elm_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 053f3495ee..db718a45a7 100644
--- a/src/lib/elementary/elm_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,8 +1,12 @@
1class Elm.Frame (Elm.Layout, Efl.Ui.Clickable) 1class Efl.Ui.Frame (Elm.Layout, Efl.Ui.Clickable)
2{ 2{
3 [[Frame widget
4
5 The Frame widget allows for collapsing and expanding the content widget
6 by clicking on the frame label.
7 the label and content can be set using text_set and content_set api.
8 ]]
3 legacy_prefix: elm_frame; 9 legacy_prefix: elm_frame;
4 eo_prefix: elm_obj_frame;
5 event_prefix: elm_frame;
6 methods { 10 methods {
7 @property collapse { 11 @property collapse {
8 set { 12 set {
diff --git a/src/lib/elementary/elm_frame_legacy.h b/src/lib/elementary/efl_ui_frame_legacy.h
index a0f51f876d..3a1f89b233 100644
--- a/src/lib/elementary/elm_frame_legacy.h
+++ b/src/lib/elementary/efl_ui_frame_legacy.h
@@ -8,4 +8,4 @@
8 */ 8 */
9EAPI Evas_Object *elm_frame_add(Evas_Object *parent); 9EAPI Evas_Object *elm_frame_add(Evas_Object *parent);
10 10
11#include "elm_frame.eo.legacy.h" \ No newline at end of file 11#include "efl_ui_frame.eo.legacy.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_widget_frame.h b/src/lib/elementary/efl_ui_widget_frame.h
index 6f74b245ad..30c3a796a4 100644
--- a/src/lib/elementary/elm_widget_frame.h
+++ b/src/lib/elementary/efl_ui_widget_frame.h
@@ -1,5 +1,5 @@
1#ifndef ELM_WIDGET_FRAME_H 1#ifndef EFL_UI_WIDGET_FRAME_H
2#define ELM_WIDGET_FRAME_H 2#define EFL_UI_WIDGET_FRAME_H
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
@@ -23,8 +23,8 @@
23/** 23/**
24 * Base layout smart data extended with frame instance data. 24 * Base layout smart data extended with frame instance data.
25 */ 25 */
26typedef struct _Elm_Frame_Data Elm_Frame_Data; 26typedef struct _Efl_Ui_Frame_Data Efl_Ui_Frame_Data;
27struct _Elm_Frame_Data 27struct _Efl_Ui_Frame_Data
28{ 28{
29 Eina_Bool collapsed : 1; 29 Eina_Bool collapsed : 1;
30 Eina_Bool collapsible : 1; 30 Eina_Bool collapsible : 1;
@@ -35,11 +35,11 @@ struct _Elm_Frame_Data
35 * @} 35 * @}
36 */ 36 */
37 37
38#define ELM_FRAME_DATA_GET(o, sd) \ 38#define EFL_UI_FRAME_DATA_GET(o, sd) \
39 Elm_Frame_Data * sd = eo_data_scope_get(o, ELM_FRAME_CLASS) 39 Efl_Ui_Frame_Data * sd = eo_data_scope_get(o, EFL_UI_FRAME_CLASS)
40 40
41#define ELM_FRAME_DATA_GET_OR_RETURN(o, ptr) \ 41#define EFL_UI_FRAME_DATA_GET_OR_RETURN(o, ptr) \
42 ELM_FRAME_DATA_GET(o, ptr); \ 42 EFL_UI_FRAME_DATA_GET(o, ptr); \
43 if (EINA_UNLIKELY(!ptr)) \ 43 if (EINA_UNLIKELY(!ptr)) \
44 { \ 44 { \
45 CRI("No widget data for object %p (%s)", \ 45 CRI("No widget data for object %p (%s)", \
@@ -47,8 +47,8 @@ struct _Elm_Frame_Data
47 return; \ 47 return; \
48 } 48 }
49 49
50#define ELM_FRAME_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ 50#define EFL_UI_FRAME_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
51 ELM_FRAME_DATA_GET(o, ptr); \ 51 EFL_UI_FRAME_DATA_GET(o, ptr); \
52 if (EINA_UNLIKELY(!ptr)) \ 52 if (EINA_UNLIKELY(!ptr)) \
53 { \ 53 { \
54 CRI("No widget data for object %p (%s)", \ 54 CRI("No widget data for object %p (%s)", \
@@ -56,8 +56,8 @@ struct _Elm_Frame_Data
56 return val; \ 56 return val; \
57 } 57 }
58 58
59#define ELM_FRAME_CHECK(obj) \ 59#define EFL_UI_FRAME_CHECK(obj) \
60 if (EINA_UNLIKELY(!eo_isa((obj), ELM_FRAME_CLASS))) \ 60 if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_FRAME_CLASS))) \
61 return 61 return
62 62
63#endif 63#endif
diff --git a/src/lib/elementary/elm_frame.h b/src/lib/elementary/elm_frame.h
index 5ff0e17b49..f1b1031681 100644
--- a/src/lib/elementary/elm_frame.h
+++ b/src/lib/elementary/elm_frame.h
@@ -49,10 +49,10 @@
49 */ 49 */
50 50
51#ifdef EFL_EO_API_SUPPORT 51#ifdef EFL_EO_API_SUPPORT
52#include "elm_frame_eo.h" 52#include "efl_ui_frame.eo.h"
53#endif 53#endif
54#ifndef EFL_NOLEGACY_API_SUPPORT 54#ifndef EFL_NOLEGACY_API_SUPPORT
55#include "elm_frame_legacy.h" 55#include "efl_ui_frame_legacy.h"
56#endif 56#endif
57/** 57/**
58 * @} 58 * @}
diff --git a/src/lib/elementary/elm_frame_eo.h b/src/lib/elementary/elm_frame_eo.h
deleted file mode 100644
index 4db1c987b8..0000000000
--- a/src/lib/elementary/elm_frame_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_frame.eo.h" \ No newline at end of file