From 0658591a4d99d45f33c9fc5b8f6b60c28eb7069b Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 20 Jun 2014 12:56:29 +0100 Subject: [PATCH] Efl eolian: Adjust according to eolian syntax changes. --- src/lib/ecore/ecore_mainloop.eo | 2 +- src/lib/efl/interfaces/efl_interface_color.eo | 2 +- src/lib/efl/interfaces/efl_interface_file.eo | 10 +++++----- src/lib/efl/interfaces/efl_interface_part.eo | 2 +- src/lib/efl/interfaces/efl_interface_text.eo | 6 +----- .../efl/interfaces/efl_interface_text_properties.eo | 5 +---- 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/lib/ecore/ecore_mainloop.eo b/src/lib/ecore/ecore_mainloop.eo index c33568f7b1..bc38a540c2 100644 --- a/src/lib/ecore/ecore_mainloop.eo +++ b/src/lib/ecore/ecore_mainloop.eo @@ -1,4 +1,4 @@ -class Ecore_Mainloop (Eo_Base) +class Ecore_Mainloop (Eo.Base) { legacy_prefix: null; data: null; diff --git a/src/lib/efl/interfaces/efl_interface_color.eo b/src/lib/efl/interfaces/efl_interface_color.eo index 2afedb66b4..d7a0cfb553 100644 --- a/src/lib/efl/interfaces/efl_interface_color.eo +++ b/src/lib/efl/interfaces/efl_interface_color.eo @@ -19,7 +19,7 @@ interface Efl_Interface_Color { get { } keys { - const Efl_Interface_Part *part; + const(Efl_Interface_Part) *part; } values { int r; /*@ The red component of the given color. */ diff --git a/src/lib/efl/interfaces/efl_interface_file.eo b/src/lib/efl/interfaces/efl_interface_file.eo index 464b7fa48e..b5faf0096f 100644 --- a/src/lib/efl/interfaces/efl_interface_file.eo +++ b/src/lib/efl/interfaces/efl_interface_file.eo @@ -8,8 +8,8 @@ interface Efl_Interface_File { get { } values { - const char *file; /*@ The path to the file to load @p from */ - const char *group; /*@ The name of the group, in @p file */ + const(char) *file; /*@ The path to the file to load @p from */ + const(char) *group; /*@ The name of the group, in @p file */ } } } @@ -18,11 +18,11 @@ interface Efl_Interface_File { const; return Eina_Bool; params { - @in const char *file @nonull; /*@ The filename to be used to save the data (extension + @in const(char) *file @nonull; /*@ The filename to be used to save the data (extension obligatory). */ - @in const char *key; /*@ The image key in the file (if an Eet one), or @c NULL, + @in const(char) *key; /*@ The image key in the file (if an Eet one), or @c NULL, otherwise. */ - @in const char *flags; /*@ String containing the flags to be used (@c NULL for + @in const(char) *flags; /*@ String containing the flags to be used (@c NULL for none). */ } } diff --git a/src/lib/efl/interfaces/efl_interface_part.eo b/src/lib/efl/interfaces/efl_interface_part.eo index 03d8a404ae..90d3c6e82c 100644 --- a/src/lib/efl/interfaces/efl_interface_part.eo +++ b/src/lib/efl/interfaces/efl_interface_part.eo @@ -8,7 +8,7 @@ interface Efl_Interface_Part { get { } keys { - const char *name; /*@ part name. */ + const(char) *name; /*@ part name. */ } values { Eo *pobj; /*@ the object that populates the part. */ diff --git a/src/lib/efl/interfaces/efl_interface_text.eo b/src/lib/efl/interfaces/efl_interface_text.eo index 587799d4a1..f7a8002178 100644 --- a/src/lib/efl/interfaces/efl_interface_text.eo +++ b/src/lib/efl/interfaces/efl_interface_text.eo @@ -17,7 +17,7 @@ interface Efl_Interface_Text { @return the markup text of the object. */ } values { - const char *text; /*@ the markup text to use. */ + const(char) *text; /*@ the markup text to use. */ } } cursor { @@ -30,8 +30,4 @@ interface Efl_Interface_Text { } } } - implements { - virtual::text_markup; - virtual::cursor::get; - } } diff --git a/src/lib/efl/interfaces/efl_interface_text_properties.eo b/src/lib/efl/interfaces/efl_interface_text_properties.eo index 120012912a..31c6088079 100644 --- a/src/lib/efl/interfaces/efl_interface_text_properties.eo +++ b/src/lib/efl/interfaces/efl_interface_text_properties.eo @@ -27,12 +27,9 @@ interface Efl_Interface_Text_Properties { @see evas_object_text_font_set() */ } values { - const char* font; /*@ The font family name or filename. */ + const(char) *font; /*@ The font family name or filename. */ Evas_Font_Size size; /*@ The font size, in points. */ } } } - implements { - virtual::font; - } }