hermet pushed a commit to branch enventor-0.6.
http://git.enlightenment.org/tools/enventor.git/commit/?id=7cf5c822ce7e2dcf161ada6473dccf2842204630
commit 7cf5c822ce7e2dcf161ada6473dccf2842204630
Author: ChunEon Park <her...@hermet.pe.kr>
Date: Wed Jun 24 15:59:45 2015 +0900
Revert "eo: sync with eolian syntax changes."
This reverts commit a81a0d23ee29f37338e142de6acc755a1542fd97.
---
src/lib/enventor_object.eo | 98 +++++++++++++++++++++++-----------------------
src/lib/enventor_smart.c | 6 +--
2 files changed, 51 insertions(+), 53 deletions(-)
diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo
index e059a7b..060ee96 100644
--- a/src/lib/enventor_object.eo
+++ b/src/lib/enventor_object.eo
@@ -18,7 +18,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
- part_highlight: bool; /*@ ... */
+ Eina_Bool part_highlight; /*@ ... */
}
}
@property live_view_scale {
@@ -38,7 +38,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
- scale: double; /*@ ... */
+ double scale; /*@ ... */
}
}
@property dummy_swallow {
@@ -58,7 +58,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
- dummy_swallow: bool; /*@ ... */
+ Eina_Bool dummy_swallow; /*@ ... */
}
}
@property auto_complete {
@@ -78,7 +78,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
- auto_complete: bool; /*@ ... */
+ Eina_Bool auto_complete; /*@ ... */
}
}
@property auto_indent {
@@ -98,7 +98,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
- auto_indent: bool; /*@ ... */
+ Eina_Bool auto_indent; /*@ ... */
}
}
@property ctxpopup {
@@ -118,9 +118,9 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
- ctxpopup: bool; /*@ ... */
+ Eina_Bool ctxpopup; /*@ ... */
}
- }
+ }
@property focus {
set {
/*@
@@ -138,7 +138,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
- focus: bool; /*@ ... */
+ Eina_Bool focus; /*@ ... */
}
}
@property modified {
@@ -158,7 +158,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
- modified: bool; /*@ ... */
+ Eina_Bool modified; /*@ ... */
}
}
@property font_scale {
@@ -178,7 +178,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
- font_scale: double; /*@ ... */
+ double font_scale; /*@ ... */
}
}
@property linenumber {
@@ -198,7 +198,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
- linenumber: bool; /*@ ... */
+ bool linenumber; /*@ ... */
}
}
path_set {
@@ -210,8 +210,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
return: Eina_Bool;
params {
- @in type: Enventor_Path_Type; /*@ ... */
- @in pathes: const(Eina_List) *; /*@ ... */
+ @in Enventor_Path_Type type; /*@ ... */
+ @in const(Eina_List) *pathes; /*@ ... */
}
}
path_get {
@@ -223,7 +223,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
return: const(Eina_List) *;
params {
- @in type: Enventor_Path_Type; /*@ ... */
+ @in Enventor_Path_Type type; /*@ ... */
}
}
max_line_get {
@@ -251,7 +251,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in text: const(char) *; /*@ ... */
+ @in const(char) *text; /*@ ... */
}
}
selection_get {
@@ -280,7 +280,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in position: int; /*@ ... */
+ @in int position; /*@ ... */
}
}
select_none {
@@ -297,8 +297,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in start: int; /*@ ... */
- @in end: int; /*@ ... */
+ @in int start; /*@ ... */
+ @in int end; /*@ ... */
}
}
line_delete {
@@ -315,9 +315,9 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@warning
@see
@ingroup Enventor */
- return: bool;
+ return: Eina_Bool;
params {
- @in file: const(char) *; /*@ ... */
+ @in const(char) *file; /*@ ... */
}
}
live_view_get {
@@ -335,7 +335,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in line: int; /*@ ... */
+ @in int line; /*@ ... */
}
}
syntax_color_set {
@@ -345,8 +345,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in color_type: Enventor_Syntax_Color_Type; /*@ ... */
- @in val: const(char) *; /*@ ... */
+ @in Enventor_Syntax_Color_Type color_type; /*@ ... */
+ @in const(char) *val; /*@ ... */
}
}
syntax_color_get {
@@ -358,7 +358,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
return: const(char) *;
params {
- @in color_type: Enventor_Syntax_Color_Type; /*@ ... */
+ @in Enventor_Syntax_Color_Type color_type; /*@ ... */
}
}
syntax_color_full_apply {
@@ -368,7 +368,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in force: bool; /*@ ... */
+ @in Eina_Bool force; /*@ ... */
}
}
syntax_color_partial_apply {
@@ -378,7 +378,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in interval: double; /*@ ... */
+ @in double interval; /*@ ... */
}
}
template_insert {
@@ -390,9 +390,9 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
return: Eina_Bool;
params {
- @in insert_type: Enventor_Template_Insert_Type; /*@ ... */
- @in syntax: char *; /*@ ... */
- @in n: size_t;
+ @in Enventor_Template_Insert_Type insert_type; /*@ ... */
+ @in char *syntax; /*@ ... */
+ @in size_t n;
}
}
template_part_insert {
@@ -404,14 +404,14 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
return: Eina_Bool;
params {
- @in type: Edje_Part_Type; /*@ ... */
- @in insert_type: Enventor_Template_Insert_Type; /*@ ... */
- @in rel1_x: float; /*@ ... */
- @in rel1_y: float; /*@ ... */
- @in rel2_x: float; /*@ ... */
- @in rel2_y: float; /*@ ... */
- @in syntax: char *; /*@ ... */
- @in n: size_t;
+ @in Edje_Part_Type type; /*@ ... */
+ @in Enventor_Template_Insert_Type insert_type; /*@ ... */
+ @in float rel1_x; /*@ ... */
+ @in float rel1_y; /*@ ... */
+ @in float rel2_x; /*@ ... */
+ @in float rel2_y; /*@ ... */
+ @in char *syntax; /*@ ... */
+ @in size_t n;
}
}
ctxpopup_visible_get {
@@ -420,7 +420,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@warning
@see
@ingroup Enventor */
- return: bool;
+ return: Eina_Bool;
}
ctxpopup_dismiss {
/*@
@@ -436,7 +436,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in disabled: bool; /*@ ... */
+ @in Eina_Bool disabled; /*@ ... */
}
}
live_view_size_set {
@@ -446,8 +446,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in w: Evas_Coord; /*@ ... */
- @in h: Evas_Coord; /*@ ... */
+ @in Evas_Coord w; /*@ ... */
+ @in Evas_Coord h; /*@ ... */
}
}
live_view_size_get {
@@ -457,8 +457,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in w: Evas_Coord *; /*@ ... */
- @in h: Evas_Coord *; /*@ ... */
+ @in Evas_Coord *w; /*@ ... */
+ @in Evas_Coord *h; /*@ ... */
}
}
redo {
@@ -468,7 +468,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@warning
@see
@ingroup Enventor */
- return: bool;
+ return: Eina_Bool;
}
undo {
/*@
@@ -477,7 +477,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@warning
@see
@ingroup Enventor */
- return: bool;
+ return: Eina_Bool;
}
font_set {
/*@
@@ -486,8 +486,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in font_name: const(char) *; /*@ ... */
- @in font_style: const(char) *; /*@ ... */
+ @in const(char) *font_name; /*@ ... */
+ @in const(char) *font_style; /*@ ... */
}
}
font_get {
@@ -497,8 +497,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
- @in font_name: const(char) **; /*@ ... */
- @in font_style: const(char) **; /*@ ... */
+ @in const(char) **font_name; /*@ ... */
+ @in const(char) **font_style; /*@ ... */
}
}
auto_complete_list_show {
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 6a08915..11e7bf6 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -223,16 +223,14 @@ _enventor_object_evas_object_smart_clip_unset(Evas_Object
*obj EINA_UNUSED, Enve
evas_object_clip_unset(o);
}
-EOLIAN static Eo *
+EOLIAN static void
_enventor_object_eo_base_constructor(Eo *obj,
Enventor_Object_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ eo_do_super(obj, MY_CLASS, eo_constructor());
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
-
- return obj;
}
EOLIAN static Eina_Bool
--
