summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Makefile_Edje.am4
-rw-r--r--src/lib/edje/Edje_Eo.h2
-rw-r--r--src/lib/edje/edje_part_external.c6
-rw-r--r--src/lib/edje/edje_util.c26
-rw-r--r--src/lib/edje/efl_canvas_layout_part_external.eo (renamed from src/lib/edje/efl_canvas_layout_external.eo)4
5 files changed, 21 insertions, 21 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 0148da5..5b87413 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -8,9 +8,9 @@ edje_eolian_files = \
8 lib/edje/edje_object.eo \ 8 lib/edje/edje_object.eo \
9 lib/edje/efl_canvas_layout_part.eo \ 9 lib/edje/efl_canvas_layout_part.eo \
10 lib/edje/efl_canvas_layout_part_box.eo \ 10 lib/edje/efl_canvas_layout_part_box.eo \
11 lib/edje/efl_canvas_layout_part_table.eo \ 11 lib/edje/efl_canvas_layout_part_external.eo \
12 lib/edje/efl_canvas_layout_part_swallow.eo \ 12 lib/edje/efl_canvas_layout_part_swallow.eo \
13 lib/edje/efl_canvas_layout_external.eo \ 13 lib/edje/efl_canvas_layout_part_table.eo \
14 lib/edje/efl_canvas_layout_part_text.eo \ 14 lib/edje/efl_canvas_layout_part_text.eo \
15 lib/edje/edje_edit.eo 15 lib/edje/edje_edit.eo
16 16
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index 23e9efc..877f3be 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -11,4 +11,4 @@
11#include "efl_canvas_layout_part_table.eo.h" 11#include "efl_canvas_layout_part_table.eo.h"
12#include "efl_canvas_layout_part_swallow.eo.h" 12#include "efl_canvas_layout_part_swallow.eo.h"
13#include "efl_canvas_layout_part_text.eo.h" 13#include "efl_canvas_layout_part_text.eo.h"
14#include "efl_canvas_layout_external.eo.h" 14#include "efl_canvas_layout_part_external.eo.h"
diff --git a/src/lib/edje/edje_part_external.c b/src/lib/edje/edje_part_external.c
index 1ffc416..c2f9554 100644
--- a/src/lib/edje/edje_part_external.c
+++ b/src/lib/edje/edje_part_external.c
@@ -1,7 +1,7 @@
1#include "edje_private.h" 1#include "edje_private.h"
2#include "edje_part_helper.h" 2#include "edje_part_helper.h"
3 3
4#define MY_CLASS EFL_CANVAS_LAYOUT_EXTERNAL_CLASS 4#define MY_CLASS EFL_CANVAS_LAYOUT_PART_EXTERNAL_CLASS
5 5
6static void _external_compose(Eo *obj, Edje *ed, const char *part); 6static void _external_compose(Eo *obj, Edje *ed, const char *part);
7 7
@@ -16,10 +16,10 @@ _external_compose(Eo *obj, Edje *ed, const char *part)
16} 16}
17 17
18EOLIAN static Efl_Gfx * 18EOLIAN static Efl_Gfx *
19_efl_canvas_layout_external_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED) 19_efl_canvas_layout_part_external_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED)
20{ 20{
21 PROXY_DATA_GET(obj, pd); 21 PROXY_DATA_GET(obj, pd);
22 RETURN_VAL(_edje_object_part_external_object_get(pd->ed, pd->part)); 22 RETURN_VAL(_edje_object_part_external_object_get(pd->ed, pd->part));
23} 23}
24 24
25#include "efl_canvas_layout_external.eo.c" 25#include "efl_canvas_layout_part_external.eo.c"
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index d14ce87..6eb431e 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -2841,7 +2841,7 @@ _edje_box_layout_builtin_find(const char *name)
2841} 2841}
2842 2842
2843static Eina_Rbtree_Direction 2843static Eina_Rbtree_Direction
2844_edje_box_layout_external_node_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, EINA_UNUSED void *data) 2844_edje_box_layout_part_external_node_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, EINA_UNUSED void *data)
2845{ 2845{
2846 Edje_Box_Layout *l = (Edje_Box_Layout *)left; 2846 Edje_Box_Layout *l = (Edje_Box_Layout *)left;
2847 Edje_Box_Layout *r = (Edje_Box_Layout *)right; 2847 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
2853} 2853}
2854 2854
2855static int 2855static int
2856_edje_box_layout_external_find_cmp(const Eina_Rbtree *node, const void *key, EINA_UNUSED int length, EINA_UNUSED void *data) 2856_edje_box_layout_part_external_find_cmp(const Eina_Rbtree *node, const void *key, EINA_UNUSED int length, EINA_UNUSED void *data)
2857{ 2857{
2858 Edje_Box_Layout *l = (Edje_Box_Layout *)node; 2858 Edje_Box_Layout *l = (Edje_Box_Layout *)node;
2859 return strcmp(key, l->name); 2859 return strcmp(key, l->name);
2860} 2860}
2861 2861
2862static Edje_Box_Layout * 2862static Edje_Box_Layout *
2863_edje_box_layout_external_find(const char *name) 2863_edje_box_layout_part_external_find(const char *name)
2864{ 2864{
2865 return (Edje_Box_Layout *)eina_rbtree_inline_lookup 2865 return (Edje_Box_Layout *)eina_rbtree_inline_lookup
2866 (_edje_box_layout_registry, name, 0, _edje_box_layout_external_find_cmp, 2866 (_edje_box_layout_registry, name, 0, _edje_box_layout_part_external_find_cmp,
2867 NULL); 2867 NULL);
2868} 2868}
2869 2869
@@ -2882,7 +2882,7 @@ _edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data,
2882 return EINA_TRUE; 2882 return EINA_TRUE;
2883 } 2883 }
2884 2884
2885 l = _edje_box_layout_external_find(name); 2885 l = _edje_box_layout_part_external_find(name);
2886 if (!l) return EINA_FALSE; 2886 if (!l) return EINA_FALSE;
2887 2887
2888 *cb = l->func; 2888 *cb = l->func;
@@ -2896,7 +2896,7 @@ _edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data,
2896} 2896}
2897 2897
2898static void 2898static void
2899_edje_box_layout_external_free(Eina_Rbtree *node, EINA_UNUSED void *data) 2899_edje_box_layout_part_external_free(Eina_Rbtree *node, EINA_UNUSED void *data)
2900{ 2900{
2901 Edje_Box_Layout *l = (Edje_Box_Layout *)node; 2901 Edje_Box_Layout *l = (Edje_Box_Layout *)node;
2902 2902
@@ -2906,7 +2906,7 @@ _edje_box_layout_external_free(Eina_Rbtree *node, EINA_UNUSED void *data)
2906} 2906}
2907 2907
2908static Edje_Box_Layout * 2908static Edje_Box_Layout *
2909_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) 2909_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)
2910{ 2910{
2911 Edje_Box_Layout *l; 2911 Edje_Box_Layout *l;
2912 size_t name_len; 2912 size_t name_len;
@@ -2942,7 +2942,7 @@ edje_box_layout_register(const char *name, Evas_Object_Box_Layout func, void *(*
2942 return; 2942 return;
2943 } 2943 }
2944 2944
2945 l = _edje_box_layout_external_find(name); 2945 l = _edje_box_layout_part_external_find(name);
2946 if (!l) 2946 if (!l)
2947 { 2947 {
2948 if (!func) 2948 if (!func)
@@ -2951,14 +2951,14 @@ edje_box_layout_register(const char *name, Evas_Object_Box_Layout func, void *(*
2951 return; 2951 return;
2952 } 2952 }
2953 2953
2954 l = _edje_box_layout_external_new 2954 l = _edje_box_layout_part_external_new
2955 (name, func, layout_data_get, layout_data_free, free_data, data); 2955 (name, func, layout_data_get, layout_data_free, free_data, data);
2956 if (!l) 2956 if (!l)
2957 return; 2957 return;
2958 2958
2959 _edje_box_layout_registry = eina_rbtree_inline_insert 2959 _edje_box_layout_registry = eina_rbtree_inline_insert
2960 (_edje_box_layout_registry, (Eina_Rbtree *)l, 2960 (_edje_box_layout_registry, (Eina_Rbtree *)l,
2961 _edje_box_layout_external_node_cmp, NULL); 2961 _edje_box_layout_part_external_node_cmp, NULL);
2962 } 2962 }
2963 else 2963 else
2964 { 2964 {
@@ -2978,8 +2978,8 @@ edje_box_layout_register(const char *name, Evas_Object_Box_Layout func, void *(*
2978 2978
2979 _edje_box_layout_registry = eina_rbtree_inline_remove 2979 _edje_box_layout_registry = eina_rbtree_inline_remove
2980 (_edje_box_layout_registry, (Eina_Rbtree *)l, 2980 (_edje_box_layout_registry, (Eina_Rbtree *)l,
2981 _edje_box_layout_external_node_cmp, NULL); 2981 _edje_box_layout_part_external_node_cmp, NULL);
2982 _edje_box_layout_external_free((Eina_Rbtree *)l, NULL); 2982 _edje_box_layout_part_external_free((Eina_Rbtree *)l, NULL);
2983 } 2983 }
2984 } 2984 }
2985} 2985}
@@ -3926,7 +3926,7 @@ _edje_box_shutdown(void)
3926 return; 3926 return;
3927 3927
3928 eina_rbtree_delete 3928 eina_rbtree_delete
3929 (_edje_box_layout_registry, _edje_box_layout_external_free, NULL); 3929 (_edje_box_layout_registry, _edje_box_layout_part_external_free, NULL);
3930 _edje_box_layout_registry = NULL; 3930 _edje_box_layout_registry = NULL;
3931} 3931}
3932 3932
diff --git a/src/lib/edje/efl_canvas_layout_external.eo b/src/lib/edje/efl_canvas_layout_part_external.eo
index bf723a5..8d5a483 100644
--- a/src/lib/edje/efl_canvas_layout_external.eo
+++ b/src/lib/edje/efl_canvas_layout_part_external.eo
@@ -1,7 +1,7 @@
1import edje_types; 1import edje_types;
2 2
3class Efl.Canvas.Layout.External (Efl.Canvas.Layout.Part, Efl.Container, 3class Efl.Canvas.Layout.Part_External (Efl.Canvas.Layout.Part, Efl.Container,
4 Efl.Canvas.Object) 4 Efl.Canvas.Object)
5{ 5{
6 [[Class representing an external part in Edje layouts. 6 [[Class representing an external part in Edje layouts.
7 7