[EGIT] [core/efl] master 18/29: eolian-cxx: Update examples syntax and fix implementation accordingly.

[Savio Sena]

savio pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=1eb8967deea3962c893a0734bd9fcd50b2da7037

commit 1eb8967deea3962c893a0734bd9fcd50b2da7037
Author: Savio Sena <sa...@expertisesolutions.com.br>
Date:   Fri Sep 12 16:12:04 2014 -0300

    eolian-cxx: Update examples syntax and fix implementation accordingly.
---
 src/examples/eolian_cxx/colourable.c        |  4 ++--
 src/examples/eolian_cxx/colourable.eo       |  9 ++++-----
 src/examples/eolian_cxx/colourable_cxx.cc   |  4 ++--
 src/examples/eolian_cxx/colourable_stub.h   |  3 ++-
 src/examples/eolian_cxx/colourablesquare.eo | 12 ++++++------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/examples/eolian_cxx/colourable.c 
b/src/examples/eolian_cxx/colourable.c
index 5b33566..a677f64 100644
--- a/src/examples/eolian_cxx/colourable.c
+++ b/src/examples/eolian_cxx/colourable.c
@@ -27,7 +27,7 @@ struct _Colourable_Data
 typedef struct _Colourable_Data  Colourable_Data;
 
 void
-_colourable_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
+_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
 {
    if(!_colourable_impl_logdomain)
      {
@@ -39,7 +39,7 @@ _colourable_constructor(Eo *obj, Colourable_Data *self 
EINA_UNUSED)
 }
 
 void
-_colourable_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
+_colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
 {
    if(_colourable_impl_logdomain)
      {
diff --git a/src/examples/eolian_cxx/colourable.eo 
b/src/examples/eolian_cxx/colourable.eo
index a262387..e0b011b 100644
--- a/src/examples/eolian_cxx/colourable.eo
+++ b/src/examples/eolian_cxx/colourable.eo
@@ -4,10 +4,6 @@ class Colourable (Eo.Base)
     legacy_prefix: legacy;
     data: Colourable_Data;
     methods {
-        constructor {
-            /*@ Default constructor. */
-            legacy: null;
-        }
         rgb_composite_constructor {
             /*@ Composite RGB Constructor. */
             legacy: null;
@@ -59,8 +55,11 @@ class Colourable (Eo.Base)
             }
         }
     }
+    implements {
+        Eo.Base.constructor;
+        Eo.Base.destructor;
+    }
     constructors {
-        .constructor;
         .rgb_composite_constructor;
         .rgb_24bits_constructor;
     }
diff --git a/src/examples/eolian_cxx/colourable_cxx.cc 
b/src/examples/eolian_cxx/colourable_cxx.cc
index 8de02aa..4d9ef78 100644
--- a/src/examples/eolian_cxx/colourable_cxx.cc
+++ b/src/examples/eolian_cxx/colourable_cxx.cc
@@ -20,7 +20,7 @@ extern "C"
 static efl::eina::log_domain domain("colourable");
 
 void
-_colourable_constructor(Eo *obj, Colourable_Data *self)
+_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self)
 {
    EINA_CXX_DOM_LOG_DBG(domain) << __func__ << std::endl;
    self->r = self->g = self->b = 0;
@@ -28,7 +28,7 @@ _colourable_constructor(Eo *obj, Colourable_Data *self)
 }
 
 void
-_colourable_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
+_colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
 {
    EINA_CXX_DOM_LOG_DBG(domain) << __func__ << std::endl;
    eo_do_super(obj, MY_CLASS, eo_destructor());
diff --git a/src/examples/eolian_cxx/colourable_stub.h 
b/src/examples/eolian_cxx/colourable_stub.h
index fbf913f..ae3ac94 100644
--- a/src/examples/eolian_cxx/colourable_stub.h
+++ b/src/examples/eolian_cxx/colourable_stub.h
@@ -13,7 +13,8 @@ struct _Colourable_Data
 };
 typedef struct _Colourable_Data  Colourable_Data;
 
-void _colourable_constructor(Eo *obj, Colourable_Data *self);
+void _colourable_eo_base_constructor(Eo *obj, Colourable_Data *self);
+void _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self);
 void _colourable_rgb_composite_constructor(Eo *obj, Colourable_Data *self, int 
r, int g, int b);
 void _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int 
rgb);
 void _colourable_print_colour(Eo *obj, Colourable_Data *self);
diff --git a/src/examples/eolian_cxx/colourablesquare.eo 
b/src/examples/eolian_cxx/colourablesquare.eo
index f21f7b4..1ee4e47 100644
--- a/src/examples/eolian_cxx/colourablesquare.eo
+++ b/src/examples/eolian_cxx/colourablesquare.eo
@@ -3,12 +3,6 @@ class ColourableSquare (Colourable)
     legacy_prefix: legacy;
     data: ColourableSquare_Data;
     properties {
-       size_constructor {
-           legacy: null;
-           params {
-              @in int size;
-           }
-       }
         size {
             set {
                 /*@ Sets size. */
@@ -22,6 +16,12 @@ class ColourableSquare (Colourable)
         }
     }
     methods {
+      size_constructor {
+           legacy: null;
+           params {
+              @in int size;
+           }
+       }
         size_print { /*@ Show the square. */ }
     }
     constructors {

--