From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/util/KeyValueMap.c | 226 +++++++++++++++++-------------------------------- 1 file changed, 78 insertions(+), 148 deletions(-) (limited to 'src/util/KeyValueMap.c') diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c index ff453c2..210929f 100644 --- a/src/util/KeyValueMap.c +++ b/src/util/KeyValueMap.c @@ -97,8 +97,6 @@ KeyValueMap* key_value_map_construct (GType object_type, const gchar* group) { KeyValueMap* self = NULL; const gchar* _tmp0_; gchar* _tmp1_; -#line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (group != NULL, NULL); #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" self = (KeyValueMap*) g_type_create_instance (object_type); #line 12 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -111,14 +109,14 @@ KeyValueMap* key_value_map_construct (GType object_type, const gchar* group) { self->priv->group = _tmp1_; #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return self; -#line 115 "KeyValueMap.c" +#line 113 "KeyValueMap.c" } KeyValueMap* key_value_map_new (const gchar* group) { #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return key_value_map_construct (TYPE_KEY_VALUE_MAP, group); -#line 122 "KeyValueMap.c" +#line 120 "KeyValueMap.c" } @@ -127,15 +125,13 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) { KeyValueMap* clone = NULL; const gchar* _tmp0_; KeyValueMap* _tmp1_; -#line 15 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL); #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->group; #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp1_ = key_value_map_new (_tmp0_); #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" clone = _tmp1_; -#line 139 "KeyValueMap.c" +#line 135 "KeyValueMap.c" { GeeIterator* _key_it = NULL; GeeHashMap* _tmp2_; @@ -162,7 +158,7 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) { _key_it = _tmp7_; #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" while (TRUE) { -#line 166 "KeyValueMap.c" +#line 162 "KeyValueMap.c" GeeIterator* _tmp8_; gboolean _tmp9_; gchar* key = NULL; @@ -183,7 +179,7 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) { if (!_tmp9_) { #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" break; -#line 187 "KeyValueMap.c" +#line 183 "KeyValueMap.c" } #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp10_ = _key_it; @@ -211,17 +207,17 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) { _g_free0 (_tmp18_); #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (key); -#line 215 "KeyValueMap.c" +#line 211 "KeyValueMap.c" } #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_object_unref0 (_key_it); -#line 219 "KeyValueMap.c" +#line 215 "KeyValueMap.c" } #line 20 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" result = clone; #line 20 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 225 "KeyValueMap.c" +#line 221 "KeyValueMap.c" } @@ -229,8 +225,6 @@ gchar* key_value_map_get_group (KeyValueMap* self) { gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; -#line 23 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL); #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->group; #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -239,7 +233,7 @@ gchar* key_value_map_get_group (KeyValueMap* self) { result = _tmp1_; #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 243 "KeyValueMap.c" +#line 237 "KeyValueMap.c" } @@ -248,8 +242,6 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) { GeeHashMap* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; -#line 27 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL); #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -260,7 +252,7 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) { result = _tmp2_; #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 264 "KeyValueMap.c" +#line 256 "KeyValueMap.c" } @@ -269,10 +261,6 @@ gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) { GeeHashMap* _tmp0_; const gchar* _tmp1_; gboolean _tmp2_; -#line 31 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (IS_KEY_VALUE_MAP (self), FALSE); -#line 31 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (key != NULL, FALSE); #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -283,7 +271,7 @@ gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) { result = _tmp2_; #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 287 "KeyValueMap.c" +#line 275 "KeyValueMap.c" } @@ -292,12 +280,6 @@ void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* GeeHashMap* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; -#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (IS_KEY_VALUE_MAP (self)); -#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (key != NULL); -#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (value != NULL); #line 36 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = key; #line 36 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -310,7 +292,7 @@ void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* _tmp3_ = value; #line 38 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp3_); -#line 314 "KeyValueMap.c" +#line 296 "KeyValueMap.c" } @@ -321,10 +303,6 @@ void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) { gint _tmp3_; gchar* _tmp4_; gchar* _tmp5_; -#line 41 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (IS_KEY_VALUE_MAP (self)); -#line 41 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (key != NULL); #line 42 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = key; #line 42 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -343,7 +321,7 @@ void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) { gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_); #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (_tmp5_); -#line 347 "KeyValueMap.c" +#line 325 "KeyValueMap.c" } @@ -373,7 +351,7 @@ static gchar* double_to_string (gdouble self) { result = _tmp4_; #line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 377 "KeyValueMap.c" +#line 355 "KeyValueMap.c" } @@ -384,10 +362,6 @@ void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble valu gdouble _tmp3_; gchar* _tmp4_; gchar* _tmp5_; -#line 47 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (IS_KEY_VALUE_MAP (self)); -#line 47 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (key != NULL); #line 48 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = key; #line 48 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -406,7 +380,7 @@ void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble valu gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_); #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (_tmp5_); -#line 410 "KeyValueMap.c" +#line 384 "KeyValueMap.c" } @@ -417,10 +391,6 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value) gfloat _tmp3_; gchar* _tmp4_; gchar* _tmp5_; -#line 53 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (IS_KEY_VALUE_MAP (self)); -#line 53 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (key != NULL); #line 54 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = key; #line 54 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -439,7 +409,7 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value) gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_); #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (_tmp5_); -#line 443 "KeyValueMap.c" +#line 413 "KeyValueMap.c" } @@ -447,7 +417,7 @@ static gchar* bool_to_string (gboolean self) { gchar* result = NULL; #line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (self) { -#line 451 "KeyValueMap.c" +#line 421 "KeyValueMap.c" gchar* _tmp0_; #line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup ("true"); @@ -455,7 +425,7 @@ static gchar* bool_to_string (gboolean self) { result = _tmp0_; #line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 459 "KeyValueMap.c" +#line 429 "KeyValueMap.c" } else { gchar* _tmp1_; #line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -464,7 +434,7 @@ static gchar* bool_to_string (gboolean self) { result = _tmp1_; #line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 468 "KeyValueMap.c" +#line 438 "KeyValueMap.c" } } @@ -476,10 +446,6 @@ void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value gboolean _tmp3_; gchar* _tmp4_; gchar* _tmp5_; -#line 59 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (IS_KEY_VALUE_MAP (self)); -#line 59 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (key != NULL); #line 60 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = key; #line 60 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -498,7 +464,7 @@ void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_); #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (_tmp5_); -#line 502 "KeyValueMap.c" +#line 468 "KeyValueMap.c" } @@ -511,10 +477,6 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha const gchar* _tmp3_ = NULL; const gchar* _tmp4_; gchar* _tmp7_; -#line 65 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL); -#line 65 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (key != NULL, NULL); #line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -527,20 +489,20 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha _tmp4_ = value; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (_tmp4_ != NULL) { -#line 531 "KeyValueMap.c" +#line 493 "KeyValueMap.c" const gchar* _tmp5_; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp5_ = value; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp3_ = _tmp5_; -#line 537 "KeyValueMap.c" +#line 499 "KeyValueMap.c" } else { const gchar* _tmp6_; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp6_ = def; #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp3_ = _tmp6_; -#line 544 "KeyValueMap.c" +#line 506 "KeyValueMap.c" } #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp7_ = g_strdup (_tmp3_); @@ -550,7 +512,7 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha _g_free0 (value); #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 554 "KeyValueMap.c" +#line 516 "KeyValueMap.c" } @@ -562,10 +524,6 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) { gpointer _tmp2_; gint _tmp3_ = 0; const gchar* _tmp4_; -#line 71 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0); -#line 71 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (key != NULL, 0); #line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -578,7 +536,7 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) { _tmp4_ = value; #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (_tmp4_ != NULL) { -#line 582 "KeyValueMap.c" +#line 540 "KeyValueMap.c" const gchar* _tmp5_; gint _tmp6_; #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -587,14 +545,14 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) { _tmp6_ = atoi (_tmp5_); #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp3_ = _tmp6_; -#line 591 "KeyValueMap.c" +#line 549 "KeyValueMap.c" } else { gint _tmp7_; #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp7_ = def; #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp3_ = _tmp7_; -#line 598 "KeyValueMap.c" +#line 556 "KeyValueMap.c" } #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" result = _tmp3_; @@ -602,7 +560,7 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) { _g_free0 (value); #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 606 "KeyValueMap.c" +#line 564 "KeyValueMap.c" } @@ -610,8 +568,6 @@ static gdouble double_parse (const gchar* str) { gdouble result = 0.0; const gchar* _tmp0_; gdouble _tmp1_; -#line 877 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (str != NULL, 0.0); #line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; #line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -620,7 +576,7 @@ static gdouble double_parse (const gchar* str) { result = _tmp1_; #line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 624 "KeyValueMap.c" +#line 580 "KeyValueMap.c" } @@ -632,10 +588,6 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d gpointer _tmp2_; gdouble _tmp3_ = 0.0; const gchar* _tmp4_; -#line 77 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0.0); -#line 77 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (key != NULL, 0.0); #line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -648,7 +600,7 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d _tmp4_ = value; #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (_tmp4_ != NULL) { -#line 652 "KeyValueMap.c" +#line 604 "KeyValueMap.c" const gchar* _tmp5_; gdouble _tmp6_; #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -657,14 +609,14 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d _tmp6_ = double_parse (_tmp5_); #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp3_ = _tmp6_; -#line 661 "KeyValueMap.c" +#line 613 "KeyValueMap.c" } else { gdouble _tmp7_; #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp7_ = def; #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp3_ = _tmp7_; -#line 668 "KeyValueMap.c" +#line 620 "KeyValueMap.c" } #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" result = _tmp3_; @@ -672,7 +624,7 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d _g_free0 (value); #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 676 "KeyValueMap.c" +#line 628 "KeyValueMap.c" } @@ -684,10 +636,6 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def) gpointer _tmp2_; gfloat _tmp3_ = 0.0F; const gchar* _tmp4_; -#line 83 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0.0F); -#line 83 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (key != NULL, 0.0F); #line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -700,7 +648,7 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def) _tmp4_ = value; #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (_tmp4_ != NULL) { -#line 704 "KeyValueMap.c" +#line 652 "KeyValueMap.c" const gchar* _tmp5_; gdouble _tmp6_; #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -709,14 +657,14 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def) _tmp6_ = double_parse (_tmp5_); #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp3_ = (gfloat) _tmp6_; -#line 713 "KeyValueMap.c" +#line 661 "KeyValueMap.c" } else { gfloat _tmp7_; #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp7_ = def; #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp3_ = _tmp7_; -#line 720 "KeyValueMap.c" +#line 668 "KeyValueMap.c" } #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" result = _tmp3_; @@ -724,15 +672,13 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def) _g_free0 (value); #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 728 "KeyValueMap.c" +#line 676 "KeyValueMap.c" } static gboolean bool_parse (const gchar* str) { gboolean result = FALSE; const gchar* _tmp0_; -#line 44 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (str != NULL, FALSE); #line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; #line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -741,13 +687,13 @@ static gboolean bool_parse (const gchar* str) { result = TRUE; #line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 745 "KeyValueMap.c" +#line 691 "KeyValueMap.c" } else { #line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = FALSE; #line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 751 "KeyValueMap.c" +#line 697 "KeyValueMap.c" } } @@ -760,10 +706,6 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d gpointer _tmp2_; gboolean _tmp3_ = FALSE; const gchar* _tmp4_; -#line 89 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (IS_KEY_VALUE_MAP (self), FALSE); -#line 89 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_val_if_fail (key != NULL, FALSE); #line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -776,7 +718,7 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d _tmp4_ = value; #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (_tmp4_ != NULL) { -#line 780 "KeyValueMap.c" +#line 722 "KeyValueMap.c" const gchar* _tmp5_; gboolean _tmp6_; #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -785,14 +727,14 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d _tmp6_ = bool_parse (_tmp5_); #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp3_ = _tmp6_; -#line 789 "KeyValueMap.c" +#line 731 "KeyValueMap.c" } else { gboolean _tmp7_; #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp7_ = def; #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp3_ = _tmp7_; -#line 796 "KeyValueMap.c" +#line 738 "KeyValueMap.c" } #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" result = _tmp3_; @@ -800,7 +742,7 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d _g_free0 (value); #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return result; -#line 804 "KeyValueMap.c" +#line 746 "KeyValueMap.c" } @@ -810,12 +752,6 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def const gchar* _tmp1_; gpointer _tmp2_; const gchar* _tmp3_; -#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (IS_KEY_VALUE_MAP (self)); -#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (key != NULL); -#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (def != NULL); #line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -828,7 +764,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def _tmp3_ = value; #line 103 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (_tmp3_ == NULL) { -#line 832 "KeyValueMap.c" +#line 768 "KeyValueMap.c" GdkPoint _tmp4_; #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp4_ = *def; @@ -838,7 +774,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def _g_free0 (value); #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return; -#line 842 "KeyValueMap.c" +#line 778 "KeyValueMap.c" } else { GdkPoint _result_ = {0}; GdkPoint _tmp5_ = {0}; @@ -860,7 +796,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def _g_free0 (value); #line 108 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return; -#line 864 "KeyValueMap.c" +#line 800 "KeyValueMap.c" } else { GdkPoint _tmp8_; #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -871,12 +807,12 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def _g_free0 (value); #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return; -#line 875 "KeyValueMap.c" +#line 811 "KeyValueMap.c" } } #line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (value); -#line 880 "KeyValueMap.c" +#line 816 "KeyValueMap.c" } @@ -889,12 +825,6 @@ void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* poi gint _tmp5_; gchar* _tmp6_; gchar* _tmp7_; -#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (IS_KEY_VALUE_MAP (self)); -#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (key != NULL); -#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" - g_return_if_fail (point != NULL); #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _tmp0_ = self->priv->map; #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -915,14 +845,14 @@ void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* poi gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp7_); #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_free0 (_tmp7_); -#line 919 "KeyValueMap.c" +#line 849 "KeyValueMap.c" } static void value_key_value_map_init (GValue* value) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = NULL; -#line 926 "KeyValueMap.c" +#line 856 "KeyValueMap.c" } @@ -931,7 +861,7 @@ static void value_key_value_map_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" key_value_map_unref (value->data[0].v_pointer); -#line 935 "KeyValueMap.c" +#line 865 "KeyValueMap.c" } } @@ -941,11 +871,11 @@ static void value_key_value_map_copy_value (const GValue* src_value, GValue* des if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" dest_value->data[0].v_pointer = key_value_map_ref (src_value->data[0].v_pointer); -#line 945 "KeyValueMap.c" +#line 875 "KeyValueMap.c" } else { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" dest_value->data[0].v_pointer = NULL; -#line 949 "KeyValueMap.c" +#line 879 "KeyValueMap.c" } } @@ -953,37 +883,37 @@ static void value_key_value_map_copy_value (const GValue* src_value, GValue* des static gpointer value_key_value_map_peek_pointer (const GValue* value) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return value->data[0].v_pointer; -#line 957 "KeyValueMap.c" +#line 887 "KeyValueMap.c" } static gchar* value_key_value_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (collect_values[0].v_pointer) { -#line 964 "KeyValueMap.c" +#line 894 "KeyValueMap.c" KeyValueMap * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 971 "KeyValueMap.c" +#line 901 "KeyValueMap.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 975 "KeyValueMap.c" +#line 905 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = key_value_map_ref (object); -#line 979 "KeyValueMap.c" +#line 909 "KeyValueMap.c" } else { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = NULL; -#line 983 "KeyValueMap.c" +#line 913 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return NULL; -#line 987 "KeyValueMap.c" +#line 917 "KeyValueMap.c" } @@ -994,25 +924,25 @@ static gchar* value_key_value_map_lcopy_value (const GValue* value, guint n_coll if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 998 "KeyValueMap.c" +#line 928 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" *object_p = NULL; -#line 1004 "KeyValueMap.c" +#line 934 "KeyValueMap.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" *object_p = value->data[0].v_pointer; -#line 1008 "KeyValueMap.c" +#line 938 "KeyValueMap.c" } else { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" *object_p = key_value_map_ref (value->data[0].v_pointer); -#line 1012 "KeyValueMap.c" +#line 942 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return NULL; -#line 1016 "KeyValueMap.c" +#line 946 "KeyValueMap.c" } @@ -1026,7 +956,7 @@ GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return G_PARAM_SPEC (spec); -#line 1030 "KeyValueMap.c" +#line 960 "KeyValueMap.c" } @@ -1035,7 +965,7 @@ gpointer value_get_key_value_map (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP), NULL); #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return value->data[0].v_pointer; -#line 1039 "KeyValueMap.c" +#line 969 "KeyValueMap.c" } @@ -1055,17 +985,17 @@ void value_set_key_value_map (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" key_value_map_ref (value->data[0].v_pointer); -#line 1059 "KeyValueMap.c" +#line 989 "KeyValueMap.c" } else { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = NULL; -#line 1063 "KeyValueMap.c" +#line 993 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" key_value_map_unref (old); -#line 1069 "KeyValueMap.c" +#line 999 "KeyValueMap.c" } } @@ -1084,17 +1014,17 @@ void value_take_key_value_map (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = v_object; -#line 1088 "KeyValueMap.c" +#line 1018 "KeyValueMap.c" } else { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" value->data[0].v_pointer = NULL; -#line 1092 "KeyValueMap.c" +#line 1022 "KeyValueMap.c" } #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" key_value_map_unref (old); -#line 1098 "KeyValueMap.c" +#line 1028 "KeyValueMap.c" } } @@ -1106,7 +1036,7 @@ static void key_value_map_class_init (KeyValueMapClass * klass) { ((KeyValueMapClass *) klass)->finalize = key_value_map_finalize; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" g_type_class_add_private (klass, sizeof (KeyValueMapPrivate)); -#line 1110 "KeyValueMap.c" +#line 1040 "KeyValueMap.c" } @@ -1120,7 +1050,7 @@ static void key_value_map_instance_init (KeyValueMap * self) { self->priv->map = _tmp0_; #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" self->ref_count = 1; -#line 1124 "KeyValueMap.c" +#line 1054 "KeyValueMap.c" } @@ -1134,7 +1064,7 @@ static void key_value_map_finalize (KeyValueMap * obj) { _g_free0 (self->priv->group); #line 9 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" _g_object_unref0 (self->priv->map); -#line 1138 "KeyValueMap.c" +#line 1068 "KeyValueMap.c" } @@ -1159,7 +1089,7 @@ gpointer key_value_map_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" return instance; -#line 1163 "KeyValueMap.c" +#line 1093 "KeyValueMap.c" } @@ -1172,7 +1102,7 @@ void key_value_map_unref (gpointer instance) { KEY_VALUE_MAP_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1176 "KeyValueMap.c" +#line 1106 "KeyValueMap.c" } } -- cgit v1.2.3