summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2015-05-12 16:25:13 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2015-05-12 16:27:09 +0100
commit77b3eed82e008ade867b8e1ffd8055ffa5d112f0 (patch)
tree631427aea7ac9c03c49e7cdf6fff33b145b037a2
parentfb4608d9dae9123f451dd1ebc4c10c2b2c996884 (diff)
eo: sync with latest Eolian changes and introduce a harmless temporary hack
-rw-r--r--src/lib/elm_calendar.eo8
-rw-r--r--src/lib/elm_calendar_common.h3
-rw-r--r--src/lib/elm_datetime.eo12
-rw-r--r--src/lib/elm_datetime_common.h3
-rw-r--r--src/lib/elm_win.eo2
5 files changed, 17 insertions, 11 deletions
diff --git a/src/lib/elm_calendar.eo b/src/lib/elm_calendar.eo
index 0d4fdd85e..59b7a2bd1 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)
263 @ingroup Calendar */ 263 @ingroup Calendar */
264 264
265 params { 265 params {
266 @in struct tm *selected_time; /*@ A @b tm struct to represent the selected date. */ 266 @in Elm_Calendar_Time *selected_time; /*@ A @b tm struct to represent the selected date. */
267 } 267 }
268 } 268 }
269 selected_time_get @const { 269 selected_time_get @const {
@@ -285,7 +285,7 @@ class Elm.Calendar (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
285 @ingroup Calendar */ 285 @ingroup Calendar */
286 return: bool; 286 return: bool;
287 params { 287 params {
288 @inout struct tm selected_time; /*@ A @b tm struct to point to selected date */ 288 @inout Elm_Calendar_Time selected_time; /*@ A @b tm struct to point to selected date */
289 } 289 }
290 } 290 }
291 mark_add { 291 mark_add {
@@ -334,7 +334,7 @@ class Elm.Calendar (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
334 @in const(char)* mark_type; /*@ A string used to define the type of mark. It will be 334 @in const(char)* mark_type; /*@ A string used to define the type of mark. It will be
335 emitted to the theme, that should display a related modification on these 335 emitted to the theme, that should display a related modification on these
336 days representation. */ 336 days representation. */
337 @in struct tm *mark_time; /*@ A time struct to represent the date of inclusion of the 337 @in Elm_Calendar_Time *mark_time; /*@ A time struct to represent the date of inclusion of the
338 mark. For marks that repeats it will just be displayed after the inclusion 338 mark. For marks that repeats it will just be displayed after the inclusion
339 date in the calendar. */ 339 date in the calendar. */
340 @in Elm_Calendar_Mark_Repeat_Type repeat; /*@ Repeat the event following this periodicity. Can be a unique 340 @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)
383 @since 1.8 */ 383 @since 1.8 */
384 return: bool; 384 return: bool;
385 params { 385 params {
386 @inout struct tm displayed_time; /*@ A @b tm struct to point to displayed date */ 386 @inout Elm_Calendar_Time displayed_time; /*@ A @b tm struct to point to displayed date */
387 } 387 }
388 } 388 }
389 } 389 }
diff --git a/src/lib/elm_calendar_common.h b/src/lib/elm_calendar_common.h
index 556a16178..d8747531c 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
133 */ 133 */
134EAPI void elm_calendar_mark_del(Elm_Calendar_Mark *mark); 134EAPI void elm_calendar_mark_del(Elm_Calendar_Mark *mark);
135 135
136/* temporary until better solution is found: is here because of eolian */
137typedef struct tm Elm_Calendar_Time;
138
136/** 139/**
137 * @} 140 * @}
138 */ 141 */
diff --git a/src/lib/elm_datetime.eo b/src/lib/elm_datetime.eo
index 97e628cf8..0c5175c8e 100644
--- a/src/lib/elm_datetime.eo
+++ b/src/lib/elm_datetime.eo
@@ -146,7 +146,7 @@ class Elm.Datetime (Elm.Layout)
146 146
147 return: bool; 147 return: bool;
148 params { 148 params {
149 @in const(struct tm)* mintime; /*@ Time structure containing the minimum time value. */ 149 @in const(Elm_Datetime_Time)* mintime; /*@ Time structure containing the minimum time value. */
150 } 150 }
151 } 151 }
152 value_min_get @const { 152 value_min_get @const {
@@ -170,7 +170,7 @@ class Elm.Datetime (Elm.Layout)
170 @ingroup Datepicker */ 170 @ingroup Datepicker */
171 return: bool; 171 return: bool;
172 params { 172 params {
173 @inout struct tm mintime; /*@ Time structure. */ 173 @inout Elm_Datetime_Time mintime; /*@ Time structure. */
174 } 174 }
175 } 175 }
176 value_set { 176 value_set {
@@ -195,7 +195,7 @@ class Elm.Datetime (Elm.Layout)
195 195
196 return: bool; 196 return: bool;
197 params { 197 params {
198 @in const(struct tm)* newtime; /*@ Time structure filled with values to be set. */ 198 @in const(Elm_Datetime_Time)* newtime; /*@ Time structure filled with values to be set. */
199 } 199 }
200 } 200 }
201 value_get @const { 201 value_get @const {
@@ -219,7 +219,7 @@ class Elm.Datetime (Elm.Layout)
219 @ingroup Datetime */ 219 @ingroup Datetime */
220 return: bool; 220 return: bool;
221 params { 221 params {
222 @inout struct tm currtime; /*@ Time structure. */ 222 @inout Elm_Datetime_Time currtime; /*@ Time structure. */
223 } 223 }
224 } 224 }
225 field_visible_set { 225 field_visible_set {
@@ -277,7 +277,7 @@ class Elm.Datetime (Elm.Layout)
277 277
278 return: bool; 278 return: bool;
279 params { 279 params {
280 @in const(struct tm)* maxtime; /*@ Time structure containing the maximum time value. */ 280 @in const(Elm_Datetime_Time)* maxtime; /*@ Time structure containing the maximum time value. */
281 } 281 }
282 } 282 }
283 value_max_get @const { 283 value_max_get @const {
@@ -301,7 +301,7 @@ class Elm.Datetime (Elm.Layout)
301 @ingroup Datetime */ 301 @ingroup Datetime */
302 return: bool; 302 return: bool;
303 params { 303 params {
304 @inout struct tm maxtime; /*@ Time structure containing the maximum time value. */ 304 @inout Elm_Datetime_Time maxtime; /*@ Time structure containing the maximum time value. */
305 } 305 }
306 } 306 }
307 } 307 }
diff --git a/src/lib/elm_datetime_common.h b/src/lib/elm_datetime_common.h
index f6499d2c3..9244b105c 100644
--- a/src/lib/elm_datetime_common.h
+++ b/src/lib/elm_datetime_common.h
@@ -18,6 +18,9 @@ typedef enum
18 ELM_DATETIME_AMPM = 5, /**< Indicates AM/PM field */ 18 ELM_DATETIME_AMPM = 5, /**< Indicates AM/PM field */
19} Elm_Datetime_Field_Type; 19} Elm_Datetime_Field_Type;
20 20
21/* temporary until better solution is found: is here because of eolian */
22typedef struct tm Elm_Datetime_Time;
23
21/** 24/**
22 * @} 25 * @}
23 */ 26 */
diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo
index d6e070646..4d5d5163d 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,
1350 @ingroup Win */ 1350 @ingroup Win */
1351 } 1351 }
1352 values { 1352 values {
1353 Elm.Win.Type type(enum Elm.Win.Type.unknown); 1353 Elm.Win.Type type(Elm.Win.Type.unknown);
1354 } 1354 }
1355 } 1355 }
1356 @property noblank { 1356 @property noblank {