gergely
/
swe-glib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a GError parameter to gswe_timestamp_calculate_gregorian()

This commit is contained in:
Gergely Polonkai 2013-09-16 16:14:08 +02:00
parent 2f63859c0b
commit fbc29dbb2e
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/gswe-timestamp.c
View File

@ -84,7 +84,7 @@ static void gswe_timestamp_finalize(GObject *gobject);
static void gswe_timestamp_set_property(GObject *gobject, guint prop_id, const GValue *value, GParamSpec *pspec); static void gswe_timestamp_set_property(GObject *gobject, guint prop_id, const GValue *value, GParamSpec *pspec);
static void gswe_timestamp_get_property(GObject *gobject, guint prop_id, GValue *value, GParamSpec *pspec); static void gswe_timestamp_get_property(GObject *gobject, guint prop_id, GValue *value, GParamSpec *pspec);
static void gswe_timestamp_calculate_all(GsweTimestamp *timestamp, GError **err); static void gswe_timestamp_calculate_all(GsweTimestamp *timestamp, GError **err);
static void gswe_timestamp_calculate_gregorian(GsweTimestamp *timestamp); static void gswe_timestamp_calculate_gregorian(GsweTimestamp *timestamp, GError **err);
static void gswe_timestamp_calculate_julian(GsweTimestamp *timestamp, GError **err); static void gswe_timestamp_calculate_julian(GsweTimestamp *timestamp, GError **err);
G_DEFINE_TYPE(GsweTimestamp, gswe_timestamp, G_TYPE_OBJECT); G_DEFINE_TYPE(GsweTimestamp, gswe_timestamp, G_TYPE_OBJECT);
@ -297,43 +297,43 @@ gswe_timestamp_get_property(GObject *object, guint prop_id, GValue *value, GPara
break; break;
case PROP_GREGORIAN_YEAR: case PROP_GREGORIAN_YEAR:
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, NULL);
g_value_set_int(value, timestamp->priv->gregorian_year); g_value_set_int(value, timestamp->priv->gregorian_year);
break; break;
case PROP_GREGORIAN_MONTH: case PROP_GREGORIAN_MONTH:
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, NULL);
g_value_set_int(value, timestamp->priv->gregorian_month); g_value_set_int(value, timestamp->priv->gregorian_month);
break; break;
case PROP_GREGORIAN_DAY: case PROP_GREGORIAN_DAY:
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, NULL);
g_value_set_int(value, timestamp->priv->gregorian_day); g_value_set_int(value, timestamp->priv->gregorian_day);
break; break;
case PROP_GREGORIAN_HOUR: case PROP_GREGORIAN_HOUR:
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, NULL);
g_value_set_int(value, timestamp->priv->gregorian_hour); g_value_set_int(value, timestamp->priv->gregorian_hour);
break; break;
case PROP_GREGORIAN_MINUTE: case PROP_GREGORIAN_MINUTE:
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, NULL);
g_value_set_int(value, timestamp->priv->gregorian_minute); g_value_set_int(value, timestamp->priv->gregorian_minute);
break; break;
case PROP_GREGORIAN_SECOND: case PROP_GREGORIAN_SECOND:
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, NULL);
g_value_set_int(value, timestamp->priv->gregorian_second); g_value_set_int(value, timestamp->priv->gregorian_second);
break; break;
case PROP_GREGORIAN_MICROSECOND: case PROP_GREGORIAN_MICROSECOND:
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, NULL);
g_value_set_int(value, timestamp->priv->gregorian_microsecond); g_value_set_int(value, timestamp->priv->gregorian_microsecond);
break; break;
@ -363,12 +363,12 @@ gswe_timestamp_calculate_all(GsweTimestamp *timestamp, GError **err)
} }
if ((timestamp->priv->valid_dates & VALID_GREGORIAN) != VALID_GREGORIAN) { if ((timestamp->priv->valid_dates & VALID_GREGORIAN) != VALID_GREGORIAN) {
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, err);
} }
} }
static void static void
gswe_timestamp_calculate_gregorian(GsweTimestamp *timestamp) gswe_timestamp_calculate_gregorian(GsweTimestamp *timestamp, GError **err)
{ {
if ((timestamp->priv->valid_dates & VALID_GREGORIAN) == VALID_GREGORIAN) { if ((timestamp->priv->valid_dates & VALID_GREGORIAN) == VALID_GREGORIAN) {
return; return;
@ -479,15 +479,16 @@ gswe_timestamp_set_gregorian_year(GsweTimestamp *timestamp, gint gregorian_year,
/** /**
* gswe_timestamp_get_gregorian_year: * gswe_timestamp_get_gregorian_year:
* @timestamp: a GsweTimestamp * @timestamp: a GsweTimestamp
* @err: a #GError
* *
* Returns the Gregorian year of @timestamp. * Returns the Gregorian year of @timestamp.
* *
* Returns: the year part of @timestamp's Gregorian Date value. * Returns: the year part of @timestamp's Gregorian Date value.
*/ */
gint gint
gswe_timestamp_get_gregorian_year(GsweTimestamp *timestamp) gswe_timestamp_get_gregorian_year(GsweTimestamp *timestamp, GError **err)
{ {
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, err);
return timestamp->priv->gregorian_year; return timestamp->priv->gregorian_year;
} }
@ -519,15 +520,16 @@ gswe_timestamp_set_gregorian_month(GsweTimestamp *timestamp, gint gregorian_mont
/** /**
* gswe_timestamp_get_gregorian_month: * gswe_timestamp_get_gregorian_month:
* @timestamp: a GsweTimestamp * @timestamp: a GsweTimestamp
* @err: a #GError
* *
* Returns the Gregorian month of @timestamp. * Returns the Gregorian month of @timestamp.
* *
* Returns: the month part of @timestamp's Gregorian Date value. * Returns: the month part of @timestamp's Gregorian Date value.
*/ */
gint gint
gswe_timestamp_get_gregorian_month(GsweTimestamp *timestamp) gswe_timestamp_get_gregorian_month(GsweTimestamp *timestamp, GError **err)
{ {
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, err);
return timestamp->priv->gregorian_month; return timestamp->priv->gregorian_month;
} }
@ -559,15 +561,16 @@ gswe_timestamp_set_gregorian_day(GsweTimestamp *timestamp, gint gregorian_day, G
/** /**
* gswe_timestamp_get_gregorian_day: * gswe_timestamp_get_gregorian_day:
* @timestamp: a GsweTimestamp * @timestamp: a GsweTimestamp
* @err: a #GError
* *
* Returns the Gregorian day of @timestamp. * Returns the Gregorian day of @timestamp.
* *
* Returns: the day part of @timestamp's Gregorian Date value. * Returns: the day part of @timestamp's Gregorian Date value.
*/ */
gint gint
gswe_timestamp_get_gregorian_day(GsweTimestamp *timestamp) gswe_timestamp_get_gregorian_day(GsweTimestamp *timestamp, GError **err)
{ {
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, err);
return timestamp->priv->gregorian_day; return timestamp->priv->gregorian_day;
} }
@ -599,15 +602,16 @@ gswe_timestamp_set_gregorian_hour(GsweTimestamp *timestamp, gint gregorian_hour,
/** /**
* gswe_timestamp_get_gregorian_hour: * gswe_timestamp_get_gregorian_hour:
* @timestamp: a GsweTimestamp * @timestamp: a GsweTimestamp
* @err: a #GError
* *
* Returns the hour of @timestamp. * Returns the hour of @timestamp.
* *
* Returns: the hour part of @timestamp's Gregorian Date value. * Returns: the hour part of @timestamp's Gregorian Date value.
*/ */
gint gint
gswe_timestamp_get_gregorian_hour(GsweTimestamp *timestamp) gswe_timestamp_get_gregorian_hour(GsweTimestamp *timestamp, GError **err)
{ {
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, err);
return timestamp->priv->gregorian_hour; return timestamp->priv->gregorian_hour;
} }
@ -639,15 +643,16 @@ gswe_timestamp_set_gregorian_minute(GsweTimestamp *timestamp, gint gregorian_min
/** /**
* gswe_timestamp_get_gregorian_minute: * gswe_timestamp_get_gregorian_minute:
* @timestamp: a GsweTimestamp * @timestamp: a GsweTimestamp
* @err: a #GError
* *
* Returns the minute of @timestamp. * Returns the minute of @timestamp.
* *
* Returns: the minute part of @timestamp's Gregorian Date value. * Returns: the minute part of @timestamp's Gregorian Date value.
*/ */
gint gint
gswe_timestamp_get_gregorian_minute(GsweTimestamp *timestamp) gswe_timestamp_get_gregorian_minute(GsweTimestamp *timestamp, GError **err)
{ {
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, err);
return timestamp->priv->gregorian_minute; return timestamp->priv->gregorian_minute;
} }
@ -679,15 +684,16 @@ gswe_timestamp_set_gregorian_second(GsweTimestamp *timestamp, gint gregorian_sec
/** /**
* gswe_timestamp_get_gregorian_second: * gswe_timestamp_get_gregorian_second:
* @timestamp: a GsweTimestamp * @timestamp: a GsweTimestamp
* @err: a #GError
* *
* Returns the second of @timestamp. * Returns the second of @timestamp.
* *
* Returns: the second part of @timestamp's Gregorian Date value. * Returns: the second part of @timestamp's Gregorian Date value.
*/ */
gint gint
gswe_timestamp_get_gregorian_second(GsweTimestamp *timestamp) gswe_timestamp_get_gregorian_second(GsweTimestamp *timestamp, GError **err)
{ {
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, err);
return timestamp->priv->gregorian_second; return timestamp->priv->gregorian_second;
} }
@ -719,15 +725,16 @@ gswe_timestamp_set_gregorian_microsecond(GsweTimestamp *timestamp, gint gregoria
/** /**
* gswe_timestamp_get_gregorian_microsecond: * gswe_timestamp_get_gregorian_microsecond:
* @timestamp: a GsweTimestamp * @timestamp: a GsweTimestamp
* @err: a #GError
* *
* Returns the microsecond of @timestamp. * Returns the microsecond of @timestamp.
* *
* Returns: the microsecond part of @timestamp's Gregorian Date value. * Returns: the microsecond part of @timestamp's Gregorian Date value.
*/ */
gint gint
gswe_timestamp_get_gregorian_microsecond(GsweTimestamp *timestamp) gswe_timestamp_get_gregorian_microsecond(GsweTimestamp *timestamp, GError **err)
{ {
gswe_timestamp_calculate_gregorian(timestamp); gswe_timestamp_calculate_gregorian(timestamp, err);
return timestamp->priv->gregorian_microsecond; return timestamp->priv->gregorian_microsecond;
} }

14
src/gswe-timestamp.h
View File

@ -125,19 +125,19 @@ void gswe_timestamp_set_gregorian_full(GsweTimestamp *timestamp, gint year, gint
void gswe_timestamp_set_instant_recalc(GsweTimestamp *timestamp, gboolean instant_recalc, GError **err); void gswe_timestamp_set_instant_recalc(GsweTimestamp *timestamp, gboolean instant_recalc, GError **err);
gboolean gswe_timestamp_get_instant_recalc(GsweTimestamp *timestamp); gboolean gswe_timestamp_get_instant_recalc(GsweTimestamp *timestamp);
void gswe_timestamp_set_gregorian_year(GsweTimestamp *timestamp, gint gregorian_year, GError **err); void gswe_timestamp_set_gregorian_year(GsweTimestamp *timestamp, gint gregorian_year, GError **err);
gint gswe_timestamp_get_gregorian_year(GsweTimestamp *timestamp); gint gswe_timestamp_get_gregorian_year(GsweTimestamp *timestamp, GError **err);
void gswe_timestamp_set_gregorian_month(GsweTimestamp *timestamp, gint gregorian_month, GError **err); void gswe_timestamp_set_gregorian_month(GsweTimestamp *timestamp, gint gregorian_month, GError **err);
gint gswe_timestamp_get_gregorian_month(GsweTimestamp *timestamp); gint gswe_timestamp_get_gregorian_month(GsweTimestamp *timestamp, GError **err);
void gswe_timestamp_set_gregorian_day(GsweTimestamp *timestamp, gint gregorian_day, GError **err); void gswe_timestamp_set_gregorian_day(GsweTimestamp *timestamp, gint gregorian_day, GError **err);
gint gswe_timestamp_get_gregorian_day(GsweTimestamp *timestamp); gint gswe_timestamp_get_gregorian_day(GsweTimestamp *timestamp, GError **err);
void gswe_timestamp_set_gregorian_hour(GsweTimestamp *timestamp, gint gregorian_hour, GError **err); void gswe_timestamp_set_gregorian_hour(GsweTimestamp *timestamp, gint gregorian_hour, GError **err);
gint gswe_timestamp_get_gregorian_hour(GsweTimestamp *timestamp); gint gswe_timestamp_get_gregorian_hour(GsweTimestamp *timestamp, GError **err);
void gswe_timestamp_set_gregorian_minute(GsweTimestamp *timestamp, gint gregorian_minute, GError **err); void gswe_timestamp_set_gregorian_minute(GsweTimestamp *timestamp, gint gregorian_minute, GError **err);
gint gswe_timestamp_get_gregorian_minute(GsweTimestamp *timestamp); gint gswe_timestamp_get_gregorian_minute(GsweTimestamp *timestamp, GError **err);
void gswe_timestamp_set_gregorian_second(GsweTimestamp *timestamp, gint gregorian_second, GError **err); void gswe_timestamp_set_gregorian_second(GsweTimestamp *timestamp, gint gregorian_second, GError **err);
gint gswe_timestamp_get_gregorian_second(GsweTimestamp *timestamp); gint gswe_timestamp_get_gregorian_second(GsweTimestamp *timestamp, GError **err);
void gswe_timestamp_set_gregorian_microsecond(GsweTimestamp *timestamp, gint gregorian_microsecond, GError **err); void gswe_timestamp_set_gregorian_microsecond(GsweTimestamp *timestamp, gint gregorian_microsecond, GError **err);
gint gswe_timestamp_get_gregorian_microsecond(GsweTimestamp *timestamp); gint gswe_timestamp_get_gregorian_microsecond(GsweTimestamp *timestamp, GError **err);
void gswe_timestamp_set_gregorian_timezone(GsweTimestamp *timestamp, gdouble gregorian_timezone_offset, GError **err); void gswe_timestamp_set_gregorian_timezone(GsweTimestamp *timestamp, gdouble gregorian_timezone_offset, GError **err);
gdouble gswe_timestamp_get_gregorian_timezone(GsweTimestamp *timestamp); gdouble gswe_timestamp_get_gregorian_timezone(GsweTimestamp *timestamp);
void gswe_timestamp_set_julian_day(GsweTimestamp *timestamp, gdouble julian_day); void gswe_timestamp_set_julian_day(GsweTimestamp *timestamp, gdouble julian_day);