forked from enlightenment/efl
eo: migrate constructors sections to constructing methods
This commit is contained in:
parent
a65c531429
commit
77d148cec9
|
@ -3,26 +3,27 @@ class Colourable (Eo.Base)
|
||||||
/*@ Colourable class. */
|
/*@ Colourable class. */
|
||||||
legacy_prefix: legacy;
|
legacy_prefix: legacy;
|
||||||
data: Colourable_Data;
|
data: Colourable_Data;
|
||||||
constructors {
|
methods {
|
||||||
constructor {
|
constructor @constructor {
|
||||||
/*@ Default constructor. */
|
/*@ Default constructor. */
|
||||||
|
legacy: null;
|
||||||
}
|
}
|
||||||
rgb_composite_constructor {
|
rgb_composite_constructor @constructor {
|
||||||
/*@ Composite RGB Constructor. */
|
/*@ Composite RGB Constructor. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in int r; /*@ The red component. */
|
@in int r; /*@ The red component. */
|
||||||
@in int g; /*@ The green component. */
|
@in int g; /*@ The green component. */
|
||||||
@in int b; /*@ The blue component. */
|
@in int b; /*@ The blue component. */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rgb_24bits_constructor {
|
rgb_24bits_constructor @constructor {
|
||||||
/*@ RGB Constructor. */
|
/*@ RGB Constructor. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in int rgb; /*@ 24-bit RGB Component. */
|
@in int rgb; /*@ 24-bit RGB Component. */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
methods {
|
|
||||||
print_colour { /*@ Print the RGB colour. */ }
|
print_colour { /*@ Print the RGB colour. */ }
|
||||||
colour_mask {
|
colour_mask {
|
||||||
/*@ The masked RGB value. */
|
/*@ The masked RGB value. */
|
||||||
|
|
|
@ -2,14 +2,13 @@ class ColourableSquare (Colourable)
|
||||||
{
|
{
|
||||||
legacy_prefix: legacy;
|
legacy_prefix: legacy;
|
||||||
data: ColourableSquare_Data;
|
data: ColourableSquare_Data;
|
||||||
constructors {
|
properties {
|
||||||
size_constructor {
|
size_constructor @constructor {
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in int size;
|
@in int size;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
properties {
|
|
||||||
size {
|
size {
|
||||||
set {
|
set {
|
||||||
/*@ Sets size. */
|
/*@ Sets size. */
|
||||||
|
|
|
@ -1,17 +1,19 @@
|
||||||
class Ecore.Animator (Eo.Base)
|
class Ecore.Animator (Eo.Base)
|
||||||
{
|
{
|
||||||
eo_prefix: ecore_animator;
|
eo_prefix: ecore_animator;
|
||||||
constructors {
|
methods {
|
||||||
timeline_constructor {
|
timeline_constructor @constructor {
|
||||||
/*@ Contructor. */
|
/*@ Constructor. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in double runtime;
|
@in double runtime;
|
||||||
@in Ecore_Timeline_Cb func;
|
@in Ecore_Timeline_Cb func;
|
||||||
@in const(void)* data;
|
@in const(void)* data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
constructor {
|
constructor @constructor {
|
||||||
/*@ Contructor. */
|
/*@ Constructor. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in Ecore_Task_Cb func;
|
@in Ecore_Task_Cb func;
|
||||||
@in const(void)* data;
|
@in const(void)* data;
|
||||||
|
|
|
@ -1,16 +1,18 @@
|
||||||
class Ecore.Idle.Enterer (Eo.Base)
|
class Ecore.Idle.Enterer (Eo.Base)
|
||||||
{
|
{
|
||||||
eo_prefix: ecore_idle_enterer;
|
eo_prefix: ecore_idle_enterer;
|
||||||
constructors {
|
methods {
|
||||||
before_constructor {
|
before_constructor @constructor {
|
||||||
/*@ Contructor. Will insert the handler at the beginning of the list. */
|
/*@ Contructor. Will insert the handler at the beginning of the list. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in Ecore_Task_Cb func;
|
@in Ecore_Task_Cb func;
|
||||||
@in const(void)* data;
|
@in const(void)* data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
after_constructor {
|
after_constructor @constructor {
|
||||||
/*@ Contructor. Will insert the handler at the end of the list. */
|
/*@ Contructor. Will insert the handler at the end of the list. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in Ecore_Task_Cb func;
|
@in Ecore_Task_Cb func;
|
||||||
@in const(void)* data;
|
@in const(void)* data;
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
class Ecore.Idle.Exiter (Eo.Base)
|
class Ecore.Idle.Exiter (Eo.Base)
|
||||||
{
|
{
|
||||||
eo_prefix: ecore_idle_exiter;
|
eo_prefix: ecore_idle_exiter;
|
||||||
constructors {
|
methods {
|
||||||
constructor {
|
constructor @constructor {
|
||||||
/*@ Contructor. */
|
/*@ Constructor. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in Ecore_Task_Cb func;
|
@in Ecore_Task_Cb func;
|
||||||
@in const(void)* data;
|
@in const(void)* data;
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
class Ecore.Idler (Eo.Base)
|
class Ecore.Idler (Eo.Base)
|
||||||
{
|
{
|
||||||
eo_prefix: ecore_idler;
|
eo_prefix: ecore_idler;
|
||||||
constructors {
|
methods {
|
||||||
constructor {
|
constructor @constructor {
|
||||||
/*@ Contructor. */
|
/*@ Constructor. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in Ecore_Task_Cb func;
|
@in Ecore_Task_Cb func;
|
||||||
@in const(void)* data;
|
@in const(void)* data;
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
class Ecore.Job (Eo.Base)
|
class Ecore.Job (Eo.Base)
|
||||||
{
|
{
|
||||||
eo_prefix: ecore_job;
|
eo_prefix: ecore_job;
|
||||||
constructors {
|
methods {
|
||||||
constructor {
|
constructor @constructor {
|
||||||
/*@ Contructor. */
|
/*@ Constructor. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in Ecore_Cb func;
|
@in Ecore_Cb func;
|
||||||
@in const(void)* data;
|
@in const(void)* data;
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
class Ecore.Poller (Eo.Base)
|
class Ecore.Poller (Eo.Base)
|
||||||
{
|
{
|
||||||
constructors {
|
methods {
|
||||||
constructor {
|
constructor @constructor {
|
||||||
/*@ Contructor with parameters for Ecore Poller. */
|
/*@ Constructor with parameters for Ecore Poller. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in Ecore_Poller_Type type;
|
@in Ecore_Poller_Type type;
|
||||||
@in int interval;
|
@in int interval;
|
||||||
|
|
|
@ -8,24 +8,6 @@ class Ecore.Timer (Eo.Base)
|
||||||
* guarantee exact timing, but try to work on a "best effort basis.
|
* guarantee exact timing, but try to work on a "best effort basis.
|
||||||
*/
|
*/
|
||||||
eo_prefix: ecore_obj_timer;
|
eo_prefix: ecore_obj_timer;
|
||||||
constructors {
|
|
||||||
loop_constructor {
|
|
||||||
/*@ Create a timer to call in a given time from now */
|
|
||||||
params {
|
|
||||||
@in double in; /*@ The time, in seconds, from now when to go off */
|
|
||||||
@in Ecore_Task_Cb func; /*@ The callback function to call when the timer goes off */
|
|
||||||
@in const(void)* data; /*@ A pointer to pass to the callback function as its data pointer */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
constructor {
|
|
||||||
/*@ Create a timer to call in a given time from when the mainloop woke up from sleep */
|
|
||||||
params {
|
|
||||||
@in double in; /*@ The time, in seconds, from when the main loop woke up, to go off */
|
|
||||||
@in Ecore_Task_Cb func; /*@ The callback function to call when the timer goes off */
|
|
||||||
@in const(void)* data; /*@ A pointer to pass to the callback function as its data pointer */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
properties {
|
properties {
|
||||||
interval {
|
interval {
|
||||||
set {
|
set {
|
||||||
|
@ -48,6 +30,24 @@ class Ecore.Timer (Eo.Base)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
methods {
|
methods {
|
||||||
|
loop_constructor @constructor {
|
||||||
|
/*@ Create a timer to call in a given time from now */
|
||||||
|
legacy: null;
|
||||||
|
params {
|
||||||
|
@in double in; /*@ The time, in seconds, from now when to go off */
|
||||||
|
@in Ecore_Task_Cb func; /*@ The callback function to call when the timer goes off */
|
||||||
|
@in const(void)* data; /*@ A pointer to pass to the callback function as its data pointer */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
constructor @constructor {
|
||||||
|
/*@ Create a timer to call in a given time from when the mainloop woke up from sleep */
|
||||||
|
legacy: null;
|
||||||
|
params {
|
||||||
|
@in double in; /*@ The time, in seconds, from when the main loop woke up, to go off */
|
||||||
|
@in Ecore_Task_Cb func; /*@ The callback function to call when the timer goes off */
|
||||||
|
@in const(void)* data; /*@ A pointer to pass to the callback function as its data pointer */
|
||||||
|
}
|
||||||
|
}
|
||||||
reset {
|
reset {
|
||||||
/*@ Reset a timer to its full interval. This effectively makes
|
/*@ Reset a timer to its full interval. This effectively makes
|
||||||
* the timer start ticking off from zero now.
|
* the timer start ticking off from zero now.
|
||||||
|
|
|
@ -3,12 +3,6 @@ abstract Eo.Base ()
|
||||||
eo_prefix: eo;
|
eo_prefix: eo;
|
||||||
legacy_prefix: null;
|
legacy_prefix: null;
|
||||||
|
|
||||||
constructors {
|
|
||||||
constructor {
|
|
||||||
/*@ Call the object's constructor.
|
|
||||||
Should not be used with #eo_do. Only use it with #eo_do_super. */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
properties {
|
properties {
|
||||||
parent {
|
parent {
|
||||||
set {
|
set {
|
||||||
|
@ -42,6 +36,11 @@ Return event freeze count. */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
methods {
|
methods {
|
||||||
|
constructor @constructor {
|
||||||
|
/*@ Call the object's constructor.
|
||||||
|
Should not be used with #eo_do. Only use it with #eo_do_super. */
|
||||||
|
legacy: null;
|
||||||
|
}
|
||||||
event_callback_forwarder_del {
|
event_callback_forwarder_del {
|
||||||
/*@ Remove an event callback forwarder for an event and an object. */
|
/*@ Remove an event callback forwarder for an event and an object. */
|
||||||
params {
|
params {
|
||||||
|
|
|
@ -2,15 +2,14 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
|
||||||
{
|
{
|
||||||
legacy_prefix: null;
|
legacy_prefix: null;
|
||||||
data: Evas_3D_Node_Data;
|
data: Evas_3D_Node_Data;
|
||||||
constructors {
|
methods {
|
||||||
constructor {
|
constructor @constructor {
|
||||||
/*@ Contructor. */
|
/*@ Constructor. */
|
||||||
|
legacy: null;
|
||||||
params {
|
params {
|
||||||
@in Evas_3D_Node_Type type;
|
@in Evas_3D_Node_Type type;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
methods {
|
|
||||||
type_get @const {
|
type_get @const {
|
||||||
/*
|
/*
|
||||||
Get the type of the given node.
|
Get the type of the given node.
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
class Base {
|
class Base {
|
||||||
constructors {
|
|
||||||
constructor {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
methods {
|
methods {
|
||||||
|
constructor @constructor {
|
||||||
|
}
|
||||||
destructor {
|
destructor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
class Ctor_Dtor (Base) {
|
class Ctor_Dtor (Base) {
|
||||||
constructors {
|
methods {
|
||||||
custom_constructor_1 {
|
custom_constructor_1 @constructor {
|
||||||
params {
|
params {
|
||||||
@in int a;
|
@in int a;
|
||||||
@in char b;
|
@in char b;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
custom_constructor_2 {
|
custom_constructor_2 @constructor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
implements {
|
implements {
|
||||||
|
|
|
@ -1,14 +1,4 @@
|
||||||
class Object_Impl (Base) {
|
class Object_Impl (Base) {
|
||||||
constructors {
|
|
||||||
constructor_1 {
|
|
||||||
params {
|
|
||||||
@in int a;
|
|
||||||
@in char b;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
constructor_2 {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
properties {
|
properties {
|
||||||
a {
|
a {
|
||||||
set {
|
set {
|
||||||
|
@ -36,6 +26,14 @@ class Object_Impl (Base) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
methods {
|
methods {
|
||||||
|
constructor_1 @constructor {
|
||||||
|
params {
|
||||||
|
@in int a;
|
||||||
|
@in char b;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
constructor_2 @constructor {
|
||||||
|
}
|
||||||
foo1 {
|
foo1 {
|
||||||
/*@ comment foo */
|
/*@ comment foo */
|
||||||
params {
|
params {
|
||||||
|
|
|
@ -2,24 +2,22 @@ class Callback (Eo.Base)
|
||||||
{
|
{
|
||||||
legacy_prefix: null;
|
legacy_prefix: null;
|
||||||
data: Callback_Data;
|
data: Callback_Data;
|
||||||
constructors {
|
methods {
|
||||||
default_constructor {
|
default_constructor @constructor {
|
||||||
}
|
}
|
||||||
constructor {
|
constructor @constructor {
|
||||||
params {
|
params {
|
||||||
@in Ecore_Cb cb;
|
@in Ecore_Cb cb;
|
||||||
@in void* data;
|
@in void* data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
constructor2 {
|
constructor2 @constructor {
|
||||||
params {
|
params {
|
||||||
@in Ecore_Cb cb;
|
@in Ecore_Cb cb;
|
||||||
@in void* data;
|
@in void* data;
|
||||||
@in Ecore_Cb cb2;
|
@in Ecore_Cb cb2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
methods {
|
|
||||||
onecallback {
|
onecallback {
|
||||||
params {
|
params {
|
||||||
@in Ecore_Cb cb;
|
@in Ecore_Cb cb;
|
||||||
|
@ -38,4 +36,3 @@ class Callback (Eo.Base)
|
||||||
call_on_add;
|
call_on_add;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue