q66 pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=77b3eed82e008ade867b8e1ffd8055ffa5d112f0

commit 77b3eed82e008ade867b8e1ffd8055ffa5d112f0
Author: Daniel Kolesa <d.kol...@osg.samsung.com>
Date:   Tue May 12 16:25:13 2015 +0100

    eo: sync with latest Eolian changes and introduce a harmless temporary hack
---
 src/lib/elm_calendar.eo       |  8 ++++----
 src/lib/elm_calendar_common.h |  3 +++
 src/lib/elm_datetime.eo       | 12 ++++++------
 src/lib/elm_datetime_common.h |  3 +++
 src/lib/elm_win.eo            |  2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/lib/elm_calendar.eo b/src/lib/elm_calendar.eo
index 0d4fdd8..59b7a2b 100644
--- a/src/lib/elm_calendar.eo
+++ b/src/lib/elm_calendar.eo
@@ -263,7 +263,7 @@ class Elm.Calendar (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
          @ingroup Calendar */
 
          params {
-            @in struct tm *selected_time; /*@ A @b tm struct to represent the 
selected date. */
+            @in Elm_Calendar_Time *selected_time; /*@ A @b tm struct to 
represent the selected date. */
          }
       }
       selected_time_get @const {
@@ -285,7 +285,7 @@ class Elm.Calendar (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
          @ingroup Calendar */
          return: bool;
          params {
-            @inout struct tm selected_time; /*@ A @b tm struct to point to 
selected date */
+            @inout Elm_Calendar_Time selected_time; /*@ A @b tm struct to 
point to selected date */
          }
       }
       mark_add {
@@ -334,7 +334,7 @@ class Elm.Calendar (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
             @in const(char)* mark_type; /*@ A string used to define the type 
of mark. It will be
             emitted to the theme, that should display a related modification 
on these
             days representation. */
-            @in struct tm *mark_time; /*@ A time struct to represent the date 
of inclusion of the
+            @in Elm_Calendar_Time *mark_time; /*@ A time struct to represent 
the date of inclusion of the
             mark. For marks that repeats it will just be displayed after the 
inclusion
             date in the calendar. */
             @in Elm_Calendar_Mark_Repeat_Type repeat; /*@ Repeat the event 
following this periodicity. Can be a unique
@@ -383,7 +383,7 @@ class Elm.Calendar (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
          @since 1.8 */
          return: bool;
          params {
-            @inout struct tm displayed_time; /*@ A @b tm struct to point to 
displayed date */
+            @inout Elm_Calendar_Time displayed_time; /*@ A @b tm struct to 
point to displayed date */
          }
       }
    }
diff --git a/src/lib/elm_calendar_common.h b/src/lib/elm_calendar_common.h
index 556a161..d874753 100644
--- a/src/lib/elm_calendar_common.h
+++ b/src/lib/elm_calendar_common.h
@@ -133,6 +133,9 @@ EAPI void                 
elm_calendar_weekdays_names_set(Evas_Object *obj, cons
  */
 EAPI void                 elm_calendar_mark_del(Elm_Calendar_Mark *mark);
 
+/* temporary until better solution is found: is here because of eolian */
+typedef struct tm Elm_Calendar_Time;
+
 /**
  * @}
  */
diff --git a/src/lib/elm_datetime.eo b/src/lib/elm_datetime.eo
index 97e628c..0c5175c 100644
--- a/src/lib/elm_datetime.eo
+++ b/src/lib/elm_datetime.eo
@@ -146,7 +146,7 @@ class Elm.Datetime (Elm.Layout)
 
          return: bool;
          params {
-            @in const(struct tm)* mintime; /*@ Time structure containing the 
minimum time value. */
+            @in const(Elm_Datetime_Time)* mintime; /*@ Time structure 
containing the minimum time value. */
          }
       }
       value_min_get @const {
@@ -170,7 +170,7 @@ class Elm.Datetime (Elm.Layout)
          @ingroup Datepicker */
          return: bool;
          params {
-            @inout struct tm mintime; /*@ Time structure. */
+            @inout Elm_Datetime_Time mintime; /*@ Time structure. */
          }
       }
       value_set {
@@ -195,7 +195,7 @@ class Elm.Datetime (Elm.Layout)
 
          return: bool;
          params {
-            @in const(struct tm)* newtime; /*@ Time structure filled with 
values to be set. */
+            @in const(Elm_Datetime_Time)* newtime; /*@ Time structure filled 
with values to be set. */
          }
       }
       value_get @const {
@@ -219,7 +219,7 @@ class Elm.Datetime (Elm.Layout)
          @ingroup Datetime */
          return: bool;
          params {
-            @inout struct tm currtime; /*@ Time structure. */
+            @inout Elm_Datetime_Time currtime; /*@ Time structure. */
          }
       }
       field_visible_set {
@@ -277,7 +277,7 @@ class Elm.Datetime (Elm.Layout)
 
          return: bool;
          params {
-            @in const(struct tm)* maxtime; /*@ Time structure containing the 
maximum time value. */
+            @in const(Elm_Datetime_Time)* maxtime; /*@ Time structure 
containing the maximum time value. */
          }
       }
       value_max_get @const {
@@ -301,7 +301,7 @@ class Elm.Datetime (Elm.Layout)
          @ingroup Datetime */
          return: bool;
          params {
-            @inout struct tm maxtime; /*@ Time structure containing the 
maximum time value. */
+            @inout Elm_Datetime_Time maxtime; /*@ Time structure containing 
the maximum time value. */
          }
       }
    }
diff --git a/src/lib/elm_datetime_common.h b/src/lib/elm_datetime_common.h
index f6499d2..9244b10 100644
--- a/src/lib/elm_datetime_common.h
+++ b/src/lib/elm_datetime_common.h
@@ -18,6 +18,9 @@ typedef enum
    ELM_DATETIME_AMPM    = 5, /**< Indicates AM/PM field */
 } Elm_Datetime_Field_Type;
 
+/* temporary until better solution is found: is here because of eolian */
+typedef struct tm Elm_Datetime_Time;
+
 /**
  * @}
  */
diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo
index d6e0706..4d5d516 100644
--- a/src/lib/elm_win.eo
+++ b/src/lib/elm_win.eo
@@ -1350,7 +1350,7 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
             @ingroup Win */
          }
          values {
-            Elm.Win.Type type(enum Elm.Win.Type.unknown);
+            Elm.Win.Type type(Elm.Win.Type.unknown);
          }
       }
       @property noblank {

-- 


Reply via email to