kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Efl interfaces: Drop interface namespace from the used interfaces. 

We don't need this namespace, it just makes the names long and complicated.
This commit is contained in:
Tom Hacohen 2014-07-21 11:47:23 +01:00
parent bf55348a92
commit ceada9523f
16 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile_Efl.am
View File

@ -1,25 +1,25 @@
BUILT_SOURCES += \
lib/efl/interfaces/efl_interface_color.eo.c \
lib/efl/interfaces/efl_interface_color.eo.h \
lib/efl/interfaces/efl_interface_file.eo.c \
lib/efl/interfaces/efl_interface_file.eo.h \
lib/efl/interfaces/efl_file.eo.c \
lib/efl/interfaces/efl_file.eo.h \
lib/efl/interfaces/efl_interface_gui_object.eo.c \
lib/efl/interfaces/efl_interface_gui_object.eo.h \
lib/efl/interfaces/efl_interface_image.eo.c \
lib/efl/interfaces/efl_interface_image.eo.h \
lib/efl/interfaces/efl_interface_text.eo.c \
lib/efl/interfaces/efl_interface_text.eo.h \
lib/efl/interfaces/efl_interface_text_properties.eo.c \
lib/efl/interfaces/efl_interface_text_properties.eo.h
lib/efl/interfaces/efl_text_properties.eo.c \
lib/efl/interfaces/efl_text_properties.eo.h
efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
efleolianfiles_DATA = \
lib/efl/interfaces/efl_interface_color.eo \
lib/efl/interfaces/efl_interface_file.eo \
lib/efl/interfaces/efl_file.eo \
lib/efl/interfaces/efl_interface_gui_object.eo \
lib/efl/interfaces/efl_interface_image.eo \
lib/efl/interfaces/efl_interface_text.eo \
lib/efl/interfaces/efl_interface_text_properties.eo
lib/efl/interfaces/efl_text_properties.eo
EXTRA_DIST += \
${efleolianfiles_DATA}

4
src/Makefile_Efl_Cxx.am
View File

@ -3,8 +3,8 @@ if HAVE_CXX11
### Generated headers
generated_efl_cxx_bindings = \
lib/efl/interfaces/efl_interface_file.eo.hh \
lib/efl/interfaces/efl_interface_text_properties.eo.hh
lib/efl/interfaces/efl_file.eo.hh \
lib/efl/interfaces/efl_text_properties.eo.hh
lib/efl/Efl.hh: $(generated_efl_cxx_bindings)
@echo -e "#ifndef EFL_CXX_EDJE_HH\n#define EFL_CXX_EDJE_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh

4
src/lib/edje/edje_edit.c
View File

@ -169,7 +169,7 @@ _edje_edit_program_script_free(Program_Script *ps)
}
EOLIAN static Eina_Bool
_edje_edit_efl_interface_file_file_set(Eo *obj, Edje_Edit *eed, const char *file, const char *group)
_edje_edit_efl_file_file_set(Eo *obj, Edje_Edit *eed, const char *file, const char *group)
{
Eina_Bool ret;
Eet_File *ef;
@ -195,7 +195,7 @@ _edje_edit_efl_interface_file_file_set(Eo *obj, Edje_Edit *eed, const char *file
* groups).
*/
Eina_Bool int_ret = EINA_FALSE;
eo_do_super(obj, MY_CLASS, int_ret = efl_interface_file_set(file, group));
eo_do_super(obj, MY_CLASS, int_ret = efl_file_set(file, group));
if (!int_ret)
return ret;

2
src/lib/edje/edje_edit.eo
View File

@ -5,6 +5,6 @@ class Edje.Edit (Edje.Object)
Eo.Base.constructor;
Eo.Base.destructor;
Evas.Object_Smart.del;
Efl.Interface.File.file.set;
Efl.File.file.set;
}
}

2
src/lib/edje/edje_load.c
View File

@ -73,7 +73,7 @@ static int _sort_defined_boxes(const void *a, const void *b);
/************************** API Routines **************************/
EOLIAN void
_edje_object_efl_interface_file_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file, const char **group)
_edje_object_efl_file_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file, const char **group)
{
if (file) *file = ed->path;
if (group) *group = ed->group;

6
src/lib/edje/edje_object.eo
View File

@ -1,4 +1,4 @@
class Edje.Object (Evas.Smart_Clipped, Efl.Interface.File)
class Edje.Object (Evas.Smart_Clipped, Efl.File)
{
legacy_prefix: edje_object;
eo_prefix: edje_obj;
@ -2348,7 +2348,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.Interface.File)
Evas.Object_Smart.add;
Evas.Object_Smart.del;
Evas.Object_Smart.resize;
Efl.Interface.File.file.set;
Efl.Interface.File.file.get;
Efl.File.file.set;
Efl.File.file.get;
}
}

8
src/lib/edje/edje_smart.c
View File

@ -48,7 +48,7 @@ _edje_object_eo_base_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Eo_Dbg_Info
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
const char *file, *edje_group;
eo_do(eo_obj, efl_interface_file_get(&file, &edje_group));
eo_do(eo_obj, efl_file_get(&file, &edje_group));
EO_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file);
EO_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group);
@ -332,7 +332,7 @@ _edje_object_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed)
}
EOLIAN static Eina_Bool
_edje_object_efl_interface_file_file_set(Eo *obj, Edje *_pd EINA_UNUSED, const char *file, const char *group)
_edje_object_efl_file_file_set(Eo *obj, Edje *_pd EINA_UNUSED, const char *file, const char *group)
{
Eina_Bool ret;
Eina_File *f = NULL;
@ -387,14 +387,14 @@ EAPI Eina_Bool
edje_object_file_set(Eo *obj, const char *file, const char *group)
{
Eina_Bool ret = 0;
eo_do((Eo *) obj, ret = efl_interface_file_set(file, group));
eo_do((Eo *) obj, ret = efl_file_set(file, group));
return ret;
}
EAPI void
edje_object_file_get(const Eo *obj, const char **file, const char **group)
{
eo_do((Eo *) obj, efl_interface_file_get(file, group));
eo_do((Eo *) obj, efl_file_get(file, group));
}
#include "edje_object.eo.c"

42
src/lib/edje/edje_text.c
View File

@ -99,7 +99,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
evas_obj_text_ellipsis_set(chosen_desc->text.min_x ? -1 : params->type.text.ellipsis),
efl_interface_text_properties_font_set(font, size),
efl_text_properties_font_set(font, size),
evas_obj_text_set(text),
evas_obj_size_set(sw, sh));
@ -289,12 +289,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
eo_do(ep->object,
if (inlined_font) efl_interface_text_properties_font_source_set(ed->path);
else efl_interface_text_properties_font_source_set(NULL);
if (inlined_font) efl_text_properties_font_source_set(ed->path);
else efl_text_properties_font_source_set(NULL);
if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
efl_interface_text_properties_font_set(font, size);
efl_text_properties_font_set(font, size);
evas_obj_text_set(text));
part_get_geometry(ep, &tw, &th);
@ -305,12 +305,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
if (inlined_font) efl_interface_text_properties_font_source_set(ed->path);
else efl_interface_text_properties_font_source_set(NULL);
if (inlined_font) efl_text_properties_font_source_set(ed->path);
else efl_text_properties_font_source_set(NULL);
if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
efl_interface_text_properties_font_set(font, size));
efl_text_properties_font_set(font, size));
part_get_geometry(ep, &tw, &th);
}
@ -329,12 +329,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
if (inlined_font) efl_interface_text_properties_font_source_set(ed->path);
else efl_interface_text_properties_font_source_set(NULL);
if (inlined_font) efl_text_properties_font_source_set(ed->path);
else efl_text_properties_font_source_set(NULL);
if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
efl_interface_text_properties_font_set(font, size);
efl_text_properties_font_set(font, size);
evas_obj_text_set(text));
part_get_geometry(ep, &tw, &th);
@ -354,11 +354,11 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
if (inlined_font) efl_interface_text_properties_font_source_set(ed->path);
else efl_interface_text_properties_font_source_set(NULL);
if (inlined_font) efl_text_properties_font_source_set(ed->path);
else efl_text_properties_font_source_set(NULL);
if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
efl_interface_text_properties_font_set(font, size));
efl_text_properties_font_set(font, size));
part_get_geometry(ep, &tw, &th);
if ((size > 0) && (th == 0)) break;
@ -371,7 +371,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
efl_interface_text_properties_font_set(font, 10));
efl_text_properties_font_set(font, 10));
part_get_geometry(ep, &tw, &th);
@ -393,7 +393,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
efl_interface_text_properties_font_set(font, current));
efl_text_properties_font_set(font, current));
part_get_geometry(ep, &tw, &th);
@ -409,7 +409,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
efl_interface_text_properties_font_set(font, current));
efl_text_properties_font_set(font, current));
part_get_geometry(ep, &tw, &th);
} while (th <= sh);
@ -430,8 +430,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (!chosen_desc->text.min_x)
{
eo_do(ep->object,
if (inlined_font) efl_interface_text_properties_font_source_set(ed->path);
else efl_interface_text_properties_font_source_set(NULL));
if (inlined_font) efl_text_properties_font_source_set(ed->path);
else efl_text_properties_font_source_set(NULL));
text = _edje_text_fit_x(ed, ep, params, chosen_desc,
text, font, size,
@ -473,12 +473,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
arrange_text:
eo_do(ep->object,
if (inlined_font) efl_interface_text_properties_font_source_set(ed->path);
else efl_interface_text_properties_font_source_set(NULL);
if (inlined_font) efl_text_properties_font_source_set(ed->path);
else efl_text_properties_font_source_set(NULL);
if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
efl_interface_text_properties_font_set(font, size),
efl_text_properties_font_set(font, size),
evas_obj_text_set(text));
part_get_geometry(ep, &tw, &th);

4
src/lib/efl/Efl.h
View File

@ -4,7 +4,7 @@
#include <Eo.h>
/* Interfaces */
#include "interfaces/efl_interface_file.eo.h"
#include "interfaces/efl_interface_text_properties.eo.h"
#include "interfaces/efl_file.eo.h"
#include "interfaces/efl_text_properties.eo.h"
#endif

2
src/lib/efl/interfaces/efl_interface_file.eo → src/lib/efl/interfaces/efl_file.eo
View File

@ -1,4 +1,4 @@
interface Efl.Interface.File {
interface Efl.File {
legacy_prefix: null;
properties {
file {

4
src/lib/efl/interfaces/efl_interfaces_main.c
View File

@ -4,5 +4,5 @@
#include <Efl.h>
#include "interfaces/efl_interface_file.eo.c"
#include "interfaces/efl_interface_text_properties.eo.c"
#include "interfaces/efl_file.eo.c"
#include "interfaces/efl_text_properties.eo.c"

2
src/lib/efl/interfaces/efl_interface_text_properties.eo → src/lib/efl/interfaces/efl_text_properties.eo
View File

@ -1,6 +1,6 @@
type Efl_Font_Size: int;
interface Efl.Interface.Text_Properties {
interface Efl.Text_Properties {
legacy_prefix: null;
properties {
font {

20
src/lib/evas/canvas/evas_object_text.c
View File

@ -388,7 +388,7 @@ _evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *class_data EINA_UNUSE
}
EOLIAN static void
_evas_text_efl_interface_text_properties_font_source_set(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, const char *font_source)
_evas_text_efl_text_properties_font_source_set(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, const char *font_source)
{
if ((o->cur.source) && (font_source) &&
(!strcmp(o->cur.source, font_source)))
@ -402,14 +402,14 @@ _evas_text_efl_interface_text_properties_font_source_set(Eo *eo_obj EINA_UNUSED,
}
EOLIAN static const char*
_evas_text_efl_interface_text_properties_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
_evas_text_efl_text_properties_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
{
return o->cur.source;
}
EOLIAN static void
_evas_text_efl_interface_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o, const char *font, Evas_Font_Size size)
_evas_text_efl_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o, const char *font, Evas_Font_Size size)
{
Eina_Bool is, was = EINA_FALSE;
Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
@ -497,7 +497,7 @@ _evas_text_efl_interface_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o,
}
EOLIAN static void
_evas_text_efl_interface_text_properties_font_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, const char **font, Evas_Font_Size *size)
_evas_text_efl_text_properties_font_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, const char **font, Evas_Font_Size *size)
{
if (font) *font = o->cur.font;
if (size) *size = o->cur.size;
@ -955,11 +955,11 @@ _evas_text_eo_base_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Eo_Db
const char *text;
int size;
eo_do(eo_obj, efl_interface_text_properties_font_get(&text, &size));
eo_do(eo_obj, efl_text_properties_font_get(&text, &size));
EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
eo_do(eo_obj, text = efl_interface_text_properties_font_source_get());
eo_do(eo_obj, text = efl_text_properties_font_source_get());
EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
eo_do(eo_obj, text = evas_obj_text_get());
@ -2478,27 +2478,27 @@ update:
EAPI void
evas_object_text_font_source_set(Eo *obj, const char *font_source)
{
eo_do((Eo *) obj, efl_interface_text_properties_font_source_set(font_source));
eo_do((Eo *) obj, efl_text_properties_font_source_set(font_source));
}
EAPI const char *
evas_object_text_font_source_get(const Eo *obj)
{
const char *font_source = 0;
eo_do((Eo *) obj, font_source = efl_interface_text_properties_font_source_get());
eo_do((Eo *) obj, font_source = efl_text_properties_font_source_get());
return font_source;
}
EAPI void
evas_object_text_font_set(Eo *obj, const char *font, Evas_Font_Size size)
{
eo_do((Eo *) obj, efl_interface_text_properties_font_set(font, size));
eo_do((Eo *) obj, efl_text_properties_font_set(font, size));
}
EAPI void
evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_Size *size)
{
eo_do((Eo *) obj, efl_interface_text_properties_font_get(font, size));
eo_do((Eo *) obj, efl_text_properties_font_get(font, size));
}
#include "canvas/evas_text.eo.c"

20
src/lib/evas/canvas/evas_object_textgrid.c
View File

@ -1124,7 +1124,7 @@ _evas_textgrid_size_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int *w, i
}
EOLIAN static void
_evas_textgrid_efl_interface_text_properties_font_source_set(Eo *eo_obj, Evas_Textgrid_Data *o, const char *font_source)
_evas_textgrid_efl_text_properties_font_source_set(Eo *eo_obj, Evas_Textgrid_Data *o, const char *font_source)
{
if ((!font_source) || (!*font_source))
@ -1141,13 +1141,13 @@ _evas_textgrid_efl_interface_text_properties_font_source_set(Eo *eo_obj, Evas_Te
}
EOLIAN static const char*
_evas_textgrid_efl_interface_text_properties_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o)
_evas_textgrid_efl_text_properties_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o)
{
return o->cur.font_source;
}
EOLIAN static void
_evas_textgrid_efl_interface_text_properties_font_set(Eo *eo_obj, Evas_Textgrid_Data *o, const char *font_name, Evas_Font_Size font_size)
_evas_textgrid_efl_text_properties_font_set(Eo *eo_obj, Evas_Textgrid_Data *o, const char *font_name, Evas_Font_Size font_size)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
Eina_Bool is, was = EINA_FALSE;
@ -1283,7 +1283,7 @@ _evas_textgrid_efl_interface_text_properties_font_set(Eo *eo_obj, Evas_Textgrid_
}
EOLIAN static void
_evas_textgrid_efl_interface_text_properties_font_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, const char **font_name, Evas_Font_Size *font_size)
_evas_textgrid_efl_text_properties_font_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, const char **font_name, Evas_Font_Size *font_size)
{
if (font_name) *font_name = o->cur.font_name;
if (font_size) *font_size = o->cur.font_size;
@ -1491,11 +1491,11 @@ _evas_textgrid_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSE
const char *text;
int size;
eo_do(eo_obj, efl_interface_text_properties_font_get(&text, &size));
eo_do(eo_obj, efl_text_properties_font_get(&text, &size));
EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
eo_do(eo_obj, text = efl_interface_text_properties_font_source_get());
eo_do(eo_obj, text = efl_text_properties_font_source_get());
EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
{
@ -1510,27 +1510,27 @@ _evas_textgrid_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSE
EAPI void
evas_object_textgrid_font_source_set(Eo *obj, const char *font_source)
{
eo_do((Eo *) obj, efl_interface_text_properties_font_source_set(font_source));
eo_do((Eo *) obj, efl_text_properties_font_source_set(font_source));
}
EAPI const char *
evas_object_textgrid_font_source_get(const Eo *obj)
{
const char *font_source = NULL;
eo_do((Eo *) obj, font_source = efl_interface_text_properties_font_source_get());
eo_do((Eo *) obj, font_source = efl_text_properties_font_source_get());
return font_source;
}
EAPI void
evas_object_textgrid_font_set(Eo *obj, const char *font_name, Evas_Font_Size font_size)
{
eo_do((Eo *) obj, efl_interface_text_properties_font_set(font_name, font_size));
eo_do((Eo *) obj, efl_text_properties_font_set(font_name, font_size));
}
EAPI void
evas_object_textgrid_font_get(const Eo *obj, const char **font_name, Evas_Font_Size *font_size)
{
eo_do((Eo *) obj, efl_interface_text_properties_font_get(font_name, font_size));
eo_do((Eo *) obj, efl_text_properties_font_get(font_name, font_size));
}
#include "canvas/evas_textgrid.eo.c"

10
src/lib/evas/canvas/evas_text.eo
View File

@ -1,4 +1,4 @@
class Evas.Text (Evas.Object, Efl.Interface.Text_Properties)
class Evas.Text (Evas.Object, Efl.Text_Properties)
{
legacy_prefix: evas_object_text;
eo_prefix: evas_obj_text;
@ -385,9 +385,9 @@ class Evas.Text (Evas.Object, Efl.Interface.Text_Properties)
Eo.Base.destructor;
Eo.Base.dbg_info_get;
Evas.Object.size.set;
Efl.Interface.Text_Properties.font.get;
Efl.Interface.Text_Properties.font.set;
Efl.Interface.Text_Properties.font_source.get;
Efl.Interface.Text_Properties.font_source.set;
Efl.Text_Properties.font.get;
Efl.Text_Properties.font.set;
Efl.Text_Properties.font_source.get;
Efl.Text_Properties.font_source.set;
}
}

10
src/lib/evas/canvas/evas_textgrid.eo
View File

@ -1,4 +1,4 @@
class Evas.Textgrid (Evas.Object, Efl.Interface.Text_Properties)
class Evas.Textgrid (Evas.Object, Efl.Text_Properties)
{
legacy_prefix: evas_object_textgrid;
eo_prefix: evas_obj_textgrid;
@ -195,9 +195,9 @@ class Evas.Textgrid (Evas.Object, Efl.Interface.Text_Properties)
Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.dbg_info_get;
Efl.Interface.Text_Properties.font.get;
Efl.Interface.Text_Properties.font.set;
Efl.Interface.Text_Properties.font_source.get;
Efl.Interface.Text_Properties.font_source.set;
Efl.Text_Properties.font.get;
Efl.Text_Properties.font.set;
Efl.Text_Properties.font_source.get;
Efl.Text_Properties.font_source.set;
}
}