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

Edje eolian: Fix namespaces for all of the edje classes.

This commit is contained in:
Tom Hacohen 2014-06-26 20:15:41 +01:00
parent e4123fda30
commit aa450fa8dd
13 changed files with 183 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile_Edje.am
View File

@ -2,9 +2,9 @@
### Library
BUILT_SOURCES += \
lib/edje/edje.eo.c \
lib/edje/edje.eo.h \
lib/edje/edje.eo.legacy.h \
lib/edje/edje_object.eo.c \
lib/edje/edje_object.eo.h \
lib/edje/edje_object.eo.legacy.h \
lib/edje/edje_edit.eo.c \
lib/edje/edje_edit.eo.h \
lib/edje/edje_edit.eo.legacy.h
@ -12,7 +12,7 @@ BUILT_SOURCES += \
edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@
edjeeolianfiles_DATA = \
lib/edje/edje.eo \
lib/edje/edje_object.eo \
lib/edje/edje_edit.eo
EXTRA_DIST += \
@ -40,9 +40,9 @@ lib/edje/Edje_Legacy.h \
lib/edje/Edje_Edit.h
nodist_installed_edjemainheaders_DATA = \
lib/edje/edje.eo.h \
lib/edje/edje_object.eo.h \
lib/edje/edje_edit.eo.h \
lib/edje/edje.eo.legacy.h \
lib/edje/edje_object.eo.legacy.h \
lib/edje/edje_edit.eo.legacy.h
lib_edje_libedje_la_SOURCES = \

2
src/Makefile_Edje_Cxx.am
View File

@ -4,7 +4,7 @@ if HAVE_CXX11
### Generated headers
generated_edje_cxx_bindings = \
lib/edje/edje.eo.hh \
lib/edje/edje_object.eo.hh \
lib/edje/edje_edit.eo.hh
installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/

4
src/lib/edje/Edje_Eo.h
View File

@ -1,2 +1,2 @@
#include "edje.eo.h"
#include "edje_edit.eo.h"
#include "edje_object.eo.h"
#include "edje_edit.eo.h"

2
src/lib/edje/Edje_Legacy.h
View File

@ -157,5 +157,5 @@ EAPI void edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord
*/
EAPI void edje_extern_object_aspect_set (Evas_Object *obj, Edje_Aspect_Control aspect, Evas_Coord aw, Evas_Coord ah);
#include "edje.eo.legacy.h"
#include "edje_object.eo.legacy.h"
#include "edje_edit.eo.legacy.h"

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

@ -39,9 +39,9 @@ EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST = 0;
/* Get ed(Edje*) from obj(Evas_Object*) */
#define GET_ED_OR_RETURN(RET) \
Edje *ed; \
if (!eo_isa(obj, EDJE_CLASS)) \
if (!eo_isa(obj, EDJE_OBJECT_CLASS)) \
return RET; \
ed = eo_data_scope_get(obj, EDJE_CLASS);
ed = eo_data_scope_get(obj, EDJE_OBJECT_CLASS);
/* Get rp(Edje_Real_Part*) from obj(Evas_Object*) and part(char*) */
#define GET_RP_OR_RETURN(RET) \
@ -167,7 +167,7 @@ _edje_edit_program_script_free(Program_Script *ps)
}
EOLIAN static Eina_Bool
_edje_edit_edje_file_set(Eo *obj, Edje_Edit *eed, const char *file, const char *group)
_edje_edit_edje_object_file_set(Eo *obj, Edje_Edit *eed, const char *file, const char *group)
{
Eina_Bool ret;
Eet_File *ef;
@ -239,7 +239,7 @@ edje_edit_object_add(Evas *evas)
EOLIAN static void
_edje_edit_eo_base_constructor(Eo *obj, Edje_Edit *eed)
{
eed->base = eo_data_ref(obj, EDJE_CLASS);
eed->base = eo_data_ref(obj, EDJE_OBJECT_CLASS);
eo_do_super(obj, MY_CLASS, eo_constructor());
}
@ -982,7 +982,7 @@ _delete_play_actions(Evas_Object *obj, const char* name, int action_type, Eet_Fi
continue;
eeo = edje_edit_object_add(ed->base->evas);
if (!eo_isa(eeo, EDJE_CLASS))
if (!eo_isa(eeo, EDJE_OBJECT_CLASS))
return EINA_FALSE;
if (!edje_object_file_set(eeo, ed->file->path, pce->entry))
@ -998,7 +998,7 @@ _delete_play_actions(Evas_Object *obj, const char* name, int action_type, Eet_Fi
continue;
}
eed = eo_data_scope_get(eeo, EDJE_CLASS);
eed = eo_data_scope_get(eeo, EDJE_OBJECT_CLASS);
for (i = 0; i < eed->collection->patterns.table_programs_size; i++)
{
Edje_Program *program;

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

@ -1,10 +1,10 @@
class Edje_Edit (Edje)
class Edje.Edit (Edje.Object)
{
data: Edje_Edit;
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Evas_Object_Smart.del;
Edje.file.set;
Edje.Object.file.set;
}
}

10
src/lib/edje/edje_external.c
View File

@ -24,7 +24,7 @@ edje_external_param_type_str(Edje_External_Param_Type type)
}
EOLIAN Evas_Object*
_edje_part_external_object_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part)
_edje_object_part_external_object_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part)
{
Edje_Real_Part *rp;
@ -52,7 +52,7 @@ _edje_part_external_object_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part)
}
EOLIAN Eina_Bool
_edje_part_external_param_set(Eo *obj, Edje *ed, const char *part, const Edje_External_Param *param)
_edje_object_part_external_param_set(Eo *obj, Edje *ed, const char *part, const Edje_External_Param *param)
{
Edje_Real_Part *rp;
@ -73,7 +73,7 @@ _edje_part_external_param_set(Eo *obj, Edje *ed, const char *part, const Edje_Ex
}
EOLIAN Eina_Bool
_edje_part_external_param_get(Eo *obj, Edje *ed, const char *part, Edje_External_Param *param)
_edje_object_part_external_param_get(Eo *obj, Edje *ed, const char *part, Edje_External_Param *param)
{
Edje_Real_Part *rp;
@ -92,7 +92,7 @@ _edje_part_external_param_get(Eo *obj, Edje *ed, const char *part, Edje_External
}
EOLIAN Evas_Object*
_edje_part_external_content_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *content)
_edje_object_part_external_content_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *content)
{
Edje_Real_Part *rp;
@ -113,7 +113,7 @@ _edje_part_external_content_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part,
}
EOLIAN Edje_External_Param_Type
_edje_part_external_param_type_get(Eo *obj, Edje *ed, const char *part, const char *param)
_edje_object_part_external_param_type_get(Eo *obj, Edje *ed, const char *part, const char *param)
{
Edje_Real_Part *rp;
Edje_External_Type *type;

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

@ -73,14 +73,14 @@ static int _sort_defined_boxes(const void *a, const void *b);
/************************** API Routines **************************/
EOLIAN void
_edje_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file, const char **group)
_edje_object_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file, const char **group)
{
if (file) *file = ed->path;
if (group) *group = ed->group;
}
EOLIAN Edje_Load_Error
_edje_load_error_get(Eo *obj EINA_UNUSED, Edje *ed)
_edje_object_load_error_get(Eo *obj EINA_UNUSED, Edje *ed)
{
return ed->load_error;
}

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

@ -32,19 +32,19 @@ _edje_object_message_popornot_send(Evas_Object *obj, Edje_Message_Type type, int
}
EOLIAN void
_edje_message_send(Eo *obj, Edje *_pd EINA_UNUSED, Edje_Message_Type type, int id, void *msg)
_edje_object_message_send(Eo *obj, Edje *_pd EINA_UNUSED, Edje_Message_Type type, int id, void *msg)
{
_edje_object_message_popornot_send(obj, type, id, msg, EINA_FALSE);
}
EOLIAN void
_edje_message_handler_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Message_Handler_Cb func, void *data)
_edje_object_message_handler_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Message_Handler_Cb func, void *data)
{
_edje_message_cb_set(ed, func, data);
}
EOLIAN void
_edje_message_signal_process(Eo *obj EINA_UNUSED, Edje *ed)
_edje_object_message_signal_process(Eo *obj EINA_UNUSED, Edje *ed)
{
Eina_List *l, *ln, *tmpq = NULL;
Edje *lookup_ed;
@ -857,4 +857,4 @@ _edje_message_del(Edje *ed)
}
if (ed->message.num <= 0) return;
}
}
}

2
src/lib/edje/edje.eo → src/lib/edje/edje_object.eo
View File

@ -1,4 +1,4 @@
class Edje (Evas_Smart_Clipped)
class Edje.Object (Evas_Smart_Clipped)
{
legacy_prefix: edje_object;
eo_prefix: edje_obj;

14
src/lib/edje/edje_program.c
View File

@ -210,7 +210,7 @@ edje_object_propagate_callback_add(Evas_Object *obj, void (*func) (void *data, E
}
EOLIAN void
_edje_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
_edje_object_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
{
if ((!emission) || (!source) || (!func)) return;
@ -241,7 +241,7 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch
}
EOLIAN void*
_edje_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
_edje_object_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
{
if ((!emission) || (!source) || (!func)) return NULL;
if (!ed) return NULL;
@ -270,7 +270,7 @@ edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, con
}
EOLIAN void
_edje_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source)
_edje_object_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source)
{
if ((!emission) || (!source)) return;
if (!ed) return;
@ -280,7 +280,7 @@ _edje_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const cha
/* FIXDOC: Verify/Expand */
EOLIAN void
_edje_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play)
_edje_object_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play)
{
double t;
Eina_List *l;
@ -317,7 +317,7 @@ _edje_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play)
}
EOLIAN Eina_Bool
_edje_play_get(Eo *obj EINA_UNUSED, Edje *ed)
_edje_object_play_get(Eo *obj EINA_UNUSED, Edje *ed)
{
if (!ed) return EINA_FALSE;
if (ed->delete_me) return EINA_FALSE;
@ -328,7 +328,7 @@ _edje_play_get(Eo *obj EINA_UNUSED, Edje *ed)
/* FIXDOC: Verify/Expand */
EOLIAN void
_edje_animation_set(Eo *obj, Edje *ed, Eina_Bool on)
_edje_object_animation_set(Eo *obj, Edje *ed, Eina_Bool on)
{
Eina_List *l;
unsigned int i;
@ -386,7 +386,7 @@ break_prog:
}
EOLIAN Eina_Bool
_edje_animation_get(Eo *obj EINA_UNUSED, Edje *ed)
_edje_object_animation_get(Eo *obj EINA_UNUSED, Edje *ed)
{
if (!ed) return EINA_FALSE;
if (ed->delete_me) return EINA_FALSE;

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

@ -6,7 +6,7 @@
# undef MY_CLASS
#endif
#define MY_CLASS EDJE_CLASS
#define MY_CLASS EDJE_OBJECT_CLASS
#define MY_CLASS_NAME "Edje"
#define MY_CLASS_NAME_LEGACY "edje"
@ -25,7 +25,7 @@ edje_object_add(Evas *evas)
}
EOLIAN static void
_edje_eo_base_constructor(Eo *obj, Edje *ed)
_edje_object_eo_base_constructor(Eo *obj, Edje *ed)
{
ed->base = eo_data_ref(obj, EVAS_SMART_CLIPPED_CLASS);
@ -35,14 +35,14 @@ _edje_eo_base_constructor(Eo *obj, Edje *ed)
}
EOLIAN static void
_edje_eo_base_destructor(Eo *obj, Edje *class_data EINA_UNUSED)
_edje_object_eo_base_destructor(Eo *obj, Edje *class_data EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, eo_destructor());
eo_data_unref(obj, class_data);
}
EOLIAN static void
_edje_eo_base_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Eo_Dbg_Info *root)
_edje_object_eo_base_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Eo_Dbg_Info *root)
{
eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
@ -73,7 +73,7 @@ _edje_color_class_free(void *data)
/* Private Routines */
EOLIAN static void
_edje_evas_object_smart_add(Eo *obj, Edje *ed)
_edje_object_evas_object_smart_add(Eo *obj, Edje *ed)
{
Evas *tev = evas_object_evas_get(obj);
@ -115,7 +115,7 @@ _edje_evas_object_smart_add(Eo *obj, Edje *ed)
}
EOLIAN static void
_edje_evas_object_smart_del(Eo *obj, Edje *ed)
_edje_object_evas_object_smart_del(Eo *obj, Edje *ed)
{
_edje_block_violate(ed);
ed->delete_me = 1;
@ -139,7 +139,7 @@ _edje_evas_object_smart_del(Eo *obj, Edje *ed)
}
EOLIAN static void
_edje_evas_object_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y)
_edje_object_evas_object_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y)
{
unsigned int i;
@ -234,7 +234,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
}
EOLIAN static void
_edje_evas_object_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h)
_edje_object_evas_object_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h)
{
if ((w == ed->w) && (h == ed->h)) return;
if (ed->collection)
@ -270,7 +270,7 @@ _edje_evas_object_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas
}
EOLIAN static void
_edje_evas_object_smart_show(Eo *obj, Edje *ed)
_edje_object_evas_object_smart_show(Eo *obj, Edje *ed)
{
Eina_List *l;
Edje *edg;
@ -303,7 +303,7 @@ _edje_evas_object_smart_show(Eo *obj, Edje *ed)
}
EOLIAN static void
_edje_evas_object_smart_hide(Eo *obj, Edje *ed)
_edje_object_evas_object_smart_hide(Eo *obj, Edje *ed)
{
Eina_List *l;
Edje *edg;
@ -326,13 +326,13 @@ _edje_evas_object_smart_hide(Eo *obj, Edje *ed)
}
EOLIAN static void
_edje_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed)
_edje_object_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed)
{
_edje_recalc_do(ed);
}
EOLIAN static Eina_Bool
_edje_file_set(Eo *obj, Edje *_pd EINA_UNUSED, const char *file, const char *group)
_edje_object_file_set(Eo *obj, Edje *_pd EINA_UNUSED, const char *file, const char *group)
{
Eina_Bool ret;
Eina_File *f = NULL;
@ -365,7 +365,7 @@ _edje_file_set(Eo *obj, Edje *_pd EINA_UNUSED, const char *file, const char *gro
}
EOLIAN static Eina_Bool
_edje_mmap_set(Eo *obj, Edje *_pd EINA_UNUSED, const Eina_File *f, const char *group)
_edje_object_mmap_set(Eo *obj, Edje *_pd EINA_UNUSED, const Eina_File *f, const char *group)
{
Eina_Bool ret;
Eina_Array *nested;
@ -383,4 +383,4 @@ _edje_mmap_set(Eo *obj, Edje *_pd EINA_UNUSED, const Eina_File *f, const char *g
return ret;
}
#include "edje.eo.c"
#include "edje_object.eo.c"

264
src/lib/edje/edje_util.c
View File

File diff suppressed because it is too large Load Diff