From 69afa9d2ad436980c968c1e8e87fc13c93533c29 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 17 Apr 2012 14:01:09 +0000 Subject: [PATCH] Eobj: EOBJ_CLASS_BASE -> EOBJ_BASE_CLASS. SVN revision: 70272 --- legacy/eobj/examples/access/simple.c | 2 +- legacy/eobj/examples/composite_objects/comp.c | 2 +- legacy/eobj/examples/composite_objects/simple.c | 2 +- legacy/eobj/examples/constructors/simple.c | 2 +- legacy/eobj/examples/constructors/simple2.c | 2 +- legacy/eobj/examples/constructors/simple3.c | 2 +- legacy/eobj/examples/constructors/simple5.c | 2 +- legacy/eobj/examples/constructors/simple6.c | 2 +- legacy/eobj/examples/evas/evas_obj.c | 2 +- legacy/eobj/examples/function_overrides/simple.c | 2 +- legacy/eobj/examples/mixin/simple.c | 2 +- legacy/eobj/examples/signals/simple.c | 2 +- legacy/eobj/lib/Eobj.h | 6 +++--- legacy/eobj/lib/eobj_base_class.c | 2 +- legacy/eobj/tests/class_simple.c | 2 +- legacy/eobj/tests/eobj_test_general.c | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/legacy/eobj/examples/access/simple.c b/legacy/eobj/examples/access/simple.c index 821c5fb46e..cf8e572f38 100644 --- a/legacy/eobj/examples/access/simple.c +++ b/legacy/eobj/examples/access/simple.c @@ -68,5 +68,5 @@ simple_class_get(void) NULL }; - return _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL); + return _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL); } diff --git a/legacy/eobj/examples/composite_objects/comp.c b/legacy/eobj/examples/composite_objects/comp.c index abd3d01836..98819a7426 100644 --- a/legacy/eobj/examples/composite_objects/comp.c +++ b/legacy/eobj/examples/composite_objects/comp.c @@ -63,6 +63,6 @@ comp_class_get(void) NULL }; - return _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, + return _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, SIMPLE_CLASS, NULL); } diff --git a/legacy/eobj/examples/composite_objects/simple.c b/legacy/eobj/examples/composite_objects/simple.c index 4991e90e4b..d81f05a4e6 100644 --- a/legacy/eobj/examples/composite_objects/simple.c +++ b/legacy/eobj/examples/composite_objects/simple.c @@ -71,5 +71,5 @@ simple_class_get(void) NULL }; - return _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL); + return _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL); } diff --git a/legacy/eobj/examples/constructors/simple.c b/legacy/eobj/examples/constructors/simple.c index 1ad348680b..d5dc189217 100644 --- a/legacy/eobj/examples/constructors/simple.c +++ b/legacy/eobj/examples/constructors/simple.c @@ -104,5 +104,5 @@ simple_class_get(void) _class_destructor }; - return _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, MIXIN_CLASS, NULL); + return _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, MIXIN_CLASS, NULL); } diff --git a/legacy/eobj/examples/constructors/simple2.c b/legacy/eobj/examples/constructors/simple2.c index 534993b296..0fcd7b3516 100644 --- a/legacy/eobj/examples/constructors/simple2.c +++ b/legacy/eobj/examples/constructors/simple2.c @@ -31,6 +31,6 @@ simple2_class_get(void) NULL }; - _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL); + _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL); return _my_class; } diff --git a/legacy/eobj/examples/constructors/simple3.c b/legacy/eobj/examples/constructors/simple3.c index 7e44d306e9..335aa575d2 100644 --- a/legacy/eobj/examples/constructors/simple3.c +++ b/legacy/eobj/examples/constructors/simple3.c @@ -29,6 +29,6 @@ simple3_class_get(void) NULL }; - _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL); + _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL); return _my_class; } diff --git a/legacy/eobj/examples/constructors/simple5.c b/legacy/eobj/examples/constructors/simple5.c index ca0663a0e8..a2ced9fab2 100644 --- a/legacy/eobj/examples/constructors/simple5.c +++ b/legacy/eobj/examples/constructors/simple5.c @@ -29,6 +29,6 @@ simple5_class_get(void) NULL }; - _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL); + _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL); return _my_class; } diff --git a/legacy/eobj/examples/constructors/simple6.c b/legacy/eobj/examples/constructors/simple6.c index d142c3d4c9..d094a35b36 100644 --- a/legacy/eobj/examples/constructors/simple6.c +++ b/legacy/eobj/examples/constructors/simple6.c @@ -31,6 +31,6 @@ simple6_class_get(void) NULL }; - _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL); + _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL); return _my_class; } diff --git a/legacy/eobj/examples/evas/evas_obj.c b/legacy/eobj/examples/evas/evas_obj.c index f7d5a40152..5984d058b4 100644 --- a/legacy/eobj/examples/evas/evas_obj.c +++ b/legacy/eobj/examples/evas/evas_obj.c @@ -145,5 +145,5 @@ evas_object_class_get(void) NULL }; - return _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL); + return _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL); } diff --git a/legacy/eobj/examples/function_overrides/simple.c b/legacy/eobj/examples/function_overrides/simple.c index 542db7cb83..48c9a55557 100644 --- a/legacy/eobj/examples/function_overrides/simple.c +++ b/legacy/eobj/examples/function_overrides/simple.c @@ -60,5 +60,5 @@ simple_class_get(void) NULL }; - return _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL); + return _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL); } diff --git a/legacy/eobj/examples/mixin/simple.c b/legacy/eobj/examples/mixin/simple.c index d4663da6c1..cc58a9ec04 100644 --- a/legacy/eobj/examples/mixin/simple.c +++ b/legacy/eobj/examples/mixin/simple.c @@ -76,5 +76,5 @@ simple_class_get(void) NULL }; - return _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, MIXIN_CLASS, NULL); + return _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, MIXIN_CLASS, NULL); } diff --git a/legacy/eobj/examples/signals/simple.c b/legacy/eobj/examples/signals/simple.c index d6ceb79a71..ad02e3fc1d 100644 --- a/legacy/eobj/examples/signals/simple.c +++ b/legacy/eobj/examples/signals/simple.c @@ -111,5 +111,5 @@ simple_class_get(void) NULL }; - return _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL); + return _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL); } diff --git a/legacy/eobj/lib/Eobj.h b/legacy/eobj/lib/Eobj.h index 38ee107325..255dae57ff 100644 --- a/legacy/eobj/lib/Eobj.h +++ b/legacy/eobj/lib/Eobj.h @@ -638,12 +638,12 @@ EAPI Eina_Bool eobj_event_callback_call(Eobj *obj, const Eobj_Event_Description */ /** - * @def EOBJ_CLASS_BASE + * @def EOBJ_BASE_CLASS * The class type for the Eobj base class. */ -#define EOBJ_CLASS_BASE eobj_base_class_get() +#define EOBJ_BASE_CLASS eobj_base_class_get() /** - * @brief Use #EOBJ_CLASS_BASE + * @brief Use #EOBJ_BASE_CLASS * @internal * */ EAPI const Eobj_Class *eobj_base_class_get(void) EINA_CONST; diff --git a/legacy/eobj/lib/eobj_base_class.c b/legacy/eobj/lib/eobj_base_class.c index 0b2b924451..0c57d44896 100644 --- a/legacy/eobj/lib/eobj_base_class.c +++ b/legacy/eobj/lib/eobj_base_class.c @@ -113,7 +113,7 @@ _data_del(Eobj *obj __UNUSED__, void *class_data, va_list *list) } } -/* EOBJ_CLASS_BASE stuff */ +/* EOBJ_BASE_CLASS stuff */ static const Eobj_Class *_my_class = NULL; /* FIXME: Set proper type descriptions. */ diff --git a/legacy/eobj/tests/class_simple.c b/legacy/eobj/tests/class_simple.c index a79b06b263..6e32ec5150 100644 --- a/legacy/eobj/tests/class_simple.c +++ b/legacy/eobj/tests/class_simple.c @@ -60,5 +60,5 @@ simple_class_get(void) NULL }; - return _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL); + return _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL); } diff --git a/legacy/eobj/tests/eobj_test_general.c b/legacy/eobj/tests/eobj_test_general.c index f57bfd08a7..f553d50e2c 100644 --- a/legacy/eobj/tests/eobj_test_general.c +++ b/legacy/eobj/tests/eobj_test_general.c @@ -12,7 +12,7 @@ START_TEST(eobj_simple) { eobj_init(); - Eobj *obj = eobj_add(EOBJ_CLASS_BASE, NULL); + Eobj *obj = eobj_add(EOBJ_BASE_CLASS, NULL); fail_if(obj); eobj_shutdown();