summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2012-10-22 09:36:23 +0000
committerDaniel Zaoui <daniel.zaoui@yahoo.com>2012-10-22 09:36:23 +0000
commit4eb9ea75879145ed82346f2a446694c36001863b (patch)
treefd9cf4dd052b47c94619034102218fa6017d874c /legacy
parent8255c19814a0d03f539a1df3e7127d4846664176 (diff)
Fix for amalgamation.
Signed-off-by: Daniel Zaoui <daniel.zaoui@samsung.com> SVN revision: 78325
Diffstat (limited to 'legacy')
-rw-r--r--legacy/edje/src/lib/edje_edit.c16
-rw-r--r--legacy/edje/src/lib/edje_smart.c16
2 files changed, 20 insertions, 12 deletions
diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c
index 07ad3599b4..adf52e89c3 100644
--- a/legacy/edje/src/lib/edje_edit.c
+++ b/legacy/edje/src/lib/edje_edit.c
@@ -14,6 +14,10 @@
14 14
15#include <Eo.h> 15#include <Eo.h>
16 16
17#ifdef MY_CLASS
18# undef MY_CLASS
19#endif
20
17#define MY_CLASS EDJE_EDIT_CLASS 21#define MY_CLASS EDJE_EDIT_CLASS
18 22
19static const char EDJE_EDIT_ERROR_GROUP_CURRENTLY_USED_STR[] = "Current group cannot be deleted"; 23static const char EDJE_EDIT_ERROR_GROUP_CURRENTLY_USED_STR[] = "Current group cannot be deleted";
@@ -257,7 +261,7 @@ edje_edit_object_add(Evas *evas)
257} 261}
258 262
259static void 263static void
260_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) 264_edje_edit_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
261{ 265{
262 Edje_Edit *eed = class_data; 266 Edje_Edit *eed = class_data;
263 eed->base = eo_data_get(obj, EDJE_OBJ_CLASS); 267 eed->base = eo_data_get(obj, EDJE_OBJ_CLASS);
@@ -7804,10 +7808,10 @@ edje_edit_print_internal_status(Evas_Object *obj)
7804} 7808}
7805 7809
7806static void 7810static void
7807_class_constructor(Eo_Class *klass) 7811_edje_edit_class_constructor(Eo_Class *klass)
7808{ 7812{
7809 const Eo_Op_Func_Description func_desc[] = { 7813 const Eo_Op_Func_Description func_desc[] = {
7810 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 7814 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _edje_edit_constructor),
7811 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _edje_edit_smart_del), 7815 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _edje_edit_smart_del),
7812 EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_FILE_SET), _edje_edit_smart_file_set), 7816 EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_FILE_SET), _edje_edit_smart_file_set),
7813 EO_OP_FUNC_SENTINEL 7817 EO_OP_FUNC_SENTINEL
@@ -7816,16 +7820,16 @@ _class_constructor(Eo_Class *klass)
7816 eo_class_funcs_set(klass, func_desc); 7820 eo_class_funcs_set(klass, func_desc);
7817} 7821}
7818 7822
7819static const Eo_Class_Description class_desc = { 7823static const Eo_Class_Description edje_edit_class_desc = {
7820 EO_VERSION, 7824 EO_VERSION,
7821 "Edje_Edit", 7825 "Edje_Edit",
7822 EO_CLASS_TYPE_REGULAR, 7826 EO_CLASS_TYPE_REGULAR,
7823 EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0), 7827 EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
7824 NULL, 7828 NULL,
7825 sizeof(Edje_Edit), 7829 sizeof(Edje_Edit),
7826 _class_constructor, 7830 _edje_edit_class_constructor,
7827 NULL 7831 NULL
7828}; 7832};
7829 7833
7830EO_DEFINE_CLASS(edje_edit_class_get, &class_desc, EDJE_OBJ_CLASS, NULL); 7834EO_DEFINE_CLASS(edje_edit_class_get, &edje_edit_class_desc, EDJE_OBJ_CLASS, NULL);
7831 7835
diff --git a/legacy/edje/src/lib/edje_smart.c b/legacy/edje/src/lib/edje_smart.c
index 22ea2bfcfb..24c83534e3 100644
--- a/legacy/edje/src/lib/edje_smart.c
+++ b/legacy/edje/src/lib/edje_smart.c
@@ -4,6 +4,10 @@
4 4
5EAPI Eo_Op EDJE_OBJ_BASE_ID = EO_NOOP; 5EAPI Eo_Op EDJE_OBJ_BASE_ID = EO_NOOP;
6 6
7#ifdef MY_CLASS
8# undef MY_CLASS
9#endif
10
7#define MY_CLASS EDJE_OBJ_CLASS 11#define MY_CLASS EDJE_OBJ_CLASS
8 12
9Eina_List *_edje_edjes = NULL; 13Eina_List *_edje_edjes = NULL;
@@ -20,7 +24,7 @@ edje_object_add(Evas *evas)
20} 24}
21 25
22static void 26static void
23_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) 27_edje_smart_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
24{ 28{
25 Edje *ed = class_data; 29 Edje *ed = class_data;
26 ed->base = eo_data_get(obj, EVAS_OBJ_SMART_CLIPPED_CLASS); 30 ed->base = eo_data_get(obj, EVAS_OBJ_SMART_CLIPPED_CLASS);
@@ -292,10 +296,10 @@ _edje_smart_file_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
292} 296}
293 297
294static void 298static void
295_class_constructor(Eo_Class *klass) 299_edje_smart_class_constructor(Eo_Class *klass)
296{ 300{
297 const Eo_Op_Func_Description func_desc[] = { 301 const Eo_Op_Func_Description func_desc[] = {
298 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 302 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _edje_smart_constructor),
299 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _edje_smart_add), 303 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _edje_smart_add),
300 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _edje_smart_del), 304 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _edje_smart_del),
301 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _edje_smart_move), 305 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _edje_smart_move),
@@ -587,16 +591,16 @@ static const Eo_Op_Description op_desc[] = {
587 EO_OP_DESCRIPTION_SENTINEL 591 EO_OP_DESCRIPTION_SENTINEL
588}; 592};
589 593
590static const Eo_Class_Description class_desc = { 594static const Eo_Class_Description edje_smart_class_desc = {
591 EO_VERSION, 595 EO_VERSION,
592 "Edje_Smart", 596 "Edje_Smart",
593 EO_CLASS_TYPE_REGULAR, 597 EO_CLASS_TYPE_REGULAR,
594 EO_CLASS_DESCRIPTION_OPS(&EDJE_OBJ_BASE_ID, op_desc, EDJE_OBJ_SUB_ID_LAST), 598 EO_CLASS_DESCRIPTION_OPS(&EDJE_OBJ_BASE_ID, op_desc, EDJE_OBJ_SUB_ID_LAST),
595 NULL, 599 NULL,
596 sizeof(Edje), 600 sizeof(Edje),
597 _class_constructor, 601 _edje_smart_class_constructor,
598 NULL 602 NULL
599}; 603};
600 604
601EO_DEFINE_CLASS(edje_object_class_get, &class_desc, EVAS_OBJ_SMART_CLIPPED_CLASS, NULL); 605EO_DEFINE_CLASS(edje_object_class_get, &edje_smart_class_desc, EVAS_OBJ_SMART_CLIPPED_CLASS, NULL);
602 606