summaryrefslogtreecommitdiff
path: root/src/examples/eolian_cxx
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-10 15:23:04 +0100
committerTom Hacohen <tom@stosb.com>2016-08-11 17:04:43 +0100
commitc662934be8bcbaba60d1688e77533acbea5d09b9 (patch)
tree8e12b5ffd083024f09b7ec7fa9f979113056fb9d /src/examples/eolian_cxx
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/examples/eolian_cxx')
-rw-r--r--src/examples/eolian_cxx/colourable.c8
-rw-r--r--src/examples/eolian_cxx/colourable_stub.h4
-rw-r--r--src/examples/eolian_cxx/ns_colourable.eo6
3 files changed, 9 insertions, 9 deletions
diff --git a/src/examples/eolian_cxx/colourable.c b/src/examples/eolian_cxx/colourable.c
index 04c233a..3dcaf36 100644
--- a/src/examples/eolian_cxx/colourable.c
+++ b/src/examples/eolian_cxx/colourable.c
@@ -27,7 +27,7 @@ struct _Colourable_Data
27typedef struct _Colourable_Data Colourable_Data; 27typedef struct _Colourable_Data Colourable_Data;
28 28
29Eo * 29Eo *
30_ns_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED) 30_ns_colourable_efl_object_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
31{ 31{
32 if(!_ns_colourable_impl_logdomain) 32 if(!_ns_colourable_impl_logdomain)
33 { 33 {
@@ -35,11 +35,11 @@ _ns_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
35 = eina_log_domain_register("colourable", EINA_COLOR_BLUE); 35 = eina_log_domain_register("colourable", EINA_COLOR_BLUE);
36 } 36 }
37 DBG("_ns_colourable_constructor(%p, %p)\n", obj, MY_CLASS); 37 DBG("_ns_colourable_constructor(%p, %p)\n", obj, MY_CLASS);
38 return eo_constructor(eo_super(obj, MY_CLASS)); 38 return efl_constructor(eo_super(obj, MY_CLASS));
39} 39}
40 40
41void 41void
42_ns_colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED) 42_ns_colourable_efl_object_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
43{ 43{
44 if(_ns_colourable_impl_logdomain) 44 if(_ns_colourable_impl_logdomain)
45 { 45 {
@@ -47,7 +47,7 @@ _ns_colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
47 _ns_colourable_impl_logdomain = 0; 47 _ns_colourable_impl_logdomain = 0;
48 } 48 }
49 DBG("_ns_colourable_destructor()\n"); 49 DBG("_ns_colourable_destructor()\n");
50 eo_destructor(eo_super(obj, MY_CLASS)); 50 efl_destructor(eo_super(obj, MY_CLASS));
51} 51}
52 52
53void 53void
diff --git a/src/examples/eolian_cxx/colourable_stub.h b/src/examples/eolian_cxx/colourable_stub.h
index 26b44b1..e57d7f0 100644
--- a/src/examples/eolian_cxx/colourable_stub.h
+++ b/src/examples/eolian_cxx/colourable_stub.h
@@ -13,8 +13,8 @@ struct _Colourable_Data
13}; 13};
14typedef struct _Colourable_Data Colourable_Data; 14typedef struct _Colourable_Data Colourable_Data;
15 15
16Eo *_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self); 16Eo *_colourable_efl_object_constructor(Eo *obj, Colourable_Data *self);
17void _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self); 17void _colourable_efl_object_destructor(Eo *obj, Colourable_Data *self);
18void _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int rgb); 18void _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int rgb);
19void _colourable_print_colour(Eo *obj, Colourable_Data *self); 19void _colourable_print_colour(Eo *obj, Colourable_Data *self);
20void _colourable_print_colour(Eo *obj, Colourable_Data *self); 20void _colourable_print_colour(Eo *obj, Colourable_Data *self);
diff --git a/src/examples/eolian_cxx/ns_colourable.eo b/src/examples/eolian_cxx/ns_colourable.eo
index 21af926..bfb08b2 100644
--- a/src/examples/eolian_cxx/ns_colourable.eo
+++ b/src/examples/eolian_cxx/ns_colourable.eo
@@ -1,4 +1,4 @@
1class Ns.Colourable (Eo.Base) 1class Ns.Colourable (Efl.Object)
2{ 2{
3 [[Colourable class.]] 3 [[Colourable class.]]
4 data: Colourable_Data; 4 data: Colourable_Data;
@@ -44,8 +44,8 @@ class Ns.Colourable (Eo.Base)
44 } 44 }
45 } 45 }
46 implements { 46 implements {
47 Eo.Base.constructor; 47 Efl.Object.constructor;
48 Eo.Base.destructor; 48 Efl.Object.destructor;
49 } 49 }
50 constructors { 50 constructors {
51 .rgb_24bits_constructor; 51 .rgb_24bits_constructor;