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

edje: Rename part external class 

This was missed in the previous commit as this special part class didn't
include the internal keyword.

Ref T5315
Ref T5306
This commit is contained in:
Jean-Philippe Andre 2017-09-13 13:58:38 +09:00
parent d5a31f3f30
commit a973294820
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile_Edje.am
View File

@ -8,9 +8,9 @@ edje_eolian_files = \
lib/edje/edje_object.eo \
lib/edje/efl_canvas_layout_part.eo \
lib/edje/efl_canvas_layout_part_box.eo \
lib/edje/efl_canvas_layout_part_table.eo \
lib/edje/efl_canvas_layout_part_external.eo \
lib/edje/efl_canvas_layout_part_swallow.eo \
lib/edje/efl_canvas_layout_external.eo \
lib/edje/efl_canvas_layout_part_table.eo \
lib/edje/efl_canvas_layout_part_text.eo \
lib/edje/edje_edit.eo

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

@ -11,4 +11,4 @@
#include "efl_canvas_layout_part_table.eo.h"
#include "efl_canvas_layout_part_swallow.eo.h"
#include "efl_canvas_layout_part_text.eo.h"
#include "efl_canvas_layout_external.eo.h"
#include "efl_canvas_layout_part_external.eo.h"

6
src/lib/edje/edje_part_external.c
View File

@ -1,7 +1,7 @@
#include "edje_private.h"
#include "edje_part_helper.h"
#define MY_CLASS EFL_CANVAS_LAYOUT_EXTERNAL_CLASS
#define MY_CLASS EFL_CANVAS_LAYOUT_PART_EXTERNAL_CLASS
static void _external_compose(Eo *obj, Edje *ed, const char *part);
@ -16,10 +16,10 @@ _external_compose(Eo *obj, Edje *ed, const char *part)
}
EOLIAN static Efl_Gfx *
_efl_canvas_layout_external_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED)
_efl_canvas_layout_part_external_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED)
{
PROXY_DATA_GET(obj, pd);
RETURN_VAL(_edje_object_part_external_object_get(pd->ed, pd->part));
}
#include "efl_canvas_layout_external.eo.c"
#include "efl_canvas_layout_part_external.eo.c"

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

@ -2841,7 +2841,7 @@ _edje_box_layout_builtin_find(const char *name)
}
static Eina_Rbtree_Direction
_edje_box_layout_external_node_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, EINA_UNUSED void *data)
_edje_box_layout_part_external_node_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, EINA_UNUSED void *data)
{
Edje_Box_Layout *l = (Edje_Box_Layout *)left;
Edje_Box_Layout *r = (Edje_Box_Layout *)right;
@ -2853,17 +2853,17 @@ _edje_box_layout_external_node_cmp(const Eina_Rbtree *left, const Eina_Rbtree *r
}
static int
_edje_box_layout_external_find_cmp(const Eina_Rbtree *node, const void *key, EINA_UNUSED int length, EINA_UNUSED void *data)
_edje_box_layout_part_external_find_cmp(const Eina_Rbtree *node, const void *key, EINA_UNUSED int length, EINA_UNUSED void *data)
{
Edje_Box_Layout *l = (Edje_Box_Layout *)node;
return strcmp(key, l->name);
}
static Edje_Box_Layout *
_edje_box_layout_external_find(const char *name)
_edje_box_layout_part_external_find(const char *name)
{
return (Edje_Box_Layout *)eina_rbtree_inline_lookup
(_edje_box_layout_registry, name, 0, _edje_box_layout_external_find_cmp,
(_edje_box_layout_registry, name, 0, _edje_box_layout_part_external_find_cmp,
NULL);
}
@ -2882,7 +2882,7 @@ _edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data,
return EINA_TRUE;
}
l = _edje_box_layout_external_find(name);
l = _edje_box_layout_part_external_find(name);
if (!l) return EINA_FALSE;
*cb = l->func;
@ -2896,7 +2896,7 @@ _edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data,
}
static void
_edje_box_layout_external_free(Eina_Rbtree *node, EINA_UNUSED void *data)
_edje_box_layout_part_external_free(Eina_Rbtree *node, EINA_UNUSED void *data)
{
Edje_Box_Layout *l = (Edje_Box_Layout *)node;
@ -2906,7 +2906,7 @@ _edje_box_layout_external_free(Eina_Rbtree *node, EINA_UNUSED void *data)
}
static Edje_Box_Layout *
_edje_box_layout_external_new(const char *name, Evas_Object_Box_Layout func, void *(*layout_data_get)(void *), void (*layout_data_free)(void *), void (*free_data)(void *), void *data)
_edje_box_layout_part_external_new(const char *name, Evas_Object_Box_Layout func, void *(*layout_data_get)(void *), void (*layout_data_free)(void *), void (*free_data)(void *), void *data)
{
Edje_Box_Layout *l;
size_t name_len;
@ -2942,7 +2942,7 @@ edje_box_layout_register(const char *name, Evas_Object_Box_Layout func, void *(*
return;
}
l = _edje_box_layout_external_find(name);
l = _edje_box_layout_part_external_find(name);
if (!l)
{
if (!func)
@ -2951,14 +2951,14 @@ edje_box_layout_register(const char *name, Evas_Object_Box_Layout func, void *(*
return;
}
l = _edje_box_layout_external_new
l = _edje_box_layout_part_external_new
(name, func, layout_data_get, layout_data_free, free_data, data);
if (!l)
return;
_edje_box_layout_registry = eina_rbtree_inline_insert
(_edje_box_layout_registry, (Eina_Rbtree *)l,
_edje_box_layout_external_node_cmp, NULL);
_edje_box_layout_part_external_node_cmp, NULL);
}
else
{
@ -2978,8 +2978,8 @@ edje_box_layout_register(const char *name, Evas_Object_Box_Layout func, void *(*
_edje_box_layout_registry = eina_rbtree_inline_remove
(_edje_box_layout_registry, (Eina_Rbtree *)l,
_edje_box_layout_external_node_cmp, NULL);
_edje_box_layout_external_free((Eina_Rbtree *)l, NULL);
_edje_box_layout_part_external_node_cmp, NULL);
_edje_box_layout_part_external_free((Eina_Rbtree *)l, NULL);
}
}
}
@ -3926,7 +3926,7 @@ _edje_box_shutdown(void)
return;
eina_rbtree_delete
(_edje_box_layout_registry, _edje_box_layout_external_free, NULL);
(_edje_box_layout_registry, _edje_box_layout_part_external_free, NULL);
_edje_box_layout_registry = NULL;
}

4
src/lib/edje/efl_canvas_layout_external.eo → src/lib/edje/efl_canvas_layout_part_external.eo
View File

@ -1,7 +1,7 @@
import edje_types;
class Efl.Canvas.Layout.External (Efl.Canvas.Layout.Part, Efl.Container,
Efl.Canvas.Object)
class Efl.Canvas.Layout.Part_External (Efl.Canvas.Layout.Part, Efl.Container,
Efl.Canvas.Object)
{
[[Class representing an external part in Edje layouts.