diff options
Diffstat (limited to 'src/util/KeyValueMap.c')
| -rw-r--r-- | src/util/KeyValueMap.c | 314 | 
1 files changed, 157 insertions, 157 deletions
diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c index 1c584c3..ff453c2 100644 --- a/src/util/KeyValueMap.c +++ b/src/util/KeyValueMap.c @@ -1,4 +1,4 @@ -/* KeyValueMap.c generated by valac 0.34.7, the Vala compiler +/* KeyValueMap.c generated by valac 0.36.6, the Vala compiler   * generated from KeyValueMap.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. @@ -90,13 +90,13 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)  gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def);  void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result);  void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point); -static void key_value_map_finalize (KeyValueMap* obj); +static void key_value_map_finalize (KeyValueMap * obj);  KeyValueMap* key_value_map_construct (GType object_type, const gchar* group) {  	KeyValueMap* self = NULL; -	const gchar* _tmp0_ = NULL; -	gchar* _tmp1_ = 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" @@ -125,8 +125,8 @@ KeyValueMap* key_value_map_new (const gchar* group) {  KeyValueMap* key_value_map_copy (KeyValueMap* self) {  	KeyValueMap* result = NULL;  	KeyValueMap* clone = NULL; -	const gchar* _tmp0_ = NULL; -	KeyValueMap* _tmp1_ = 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" @@ -138,12 +138,12 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {  #line 139 "KeyValueMap.c"  	{  		GeeIterator* _key_it = NULL; -		GeeHashMap* _tmp2_ = NULL; -		GeeSet* _tmp3_ = NULL; -		GeeSet* _tmp4_ = NULL; -		GeeSet* _tmp5_ = NULL; -		GeeIterator* _tmp6_ = NULL; -		GeeIterator* _tmp7_ = NULL; +		GeeHashMap* _tmp2_; +		GeeSet* _tmp3_; +		GeeSet* _tmp4_; +		GeeSet* _tmp5_; +		GeeIterator* _tmp6_; +		GeeIterator* _tmp7_;  #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp2_ = self->priv->map;  #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -163,18 +163,18 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {  #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		while (TRUE) {  #line 166 "KeyValueMap.c" -			GeeIterator* _tmp8_ = NULL; -			gboolean _tmp9_ = FALSE; +			GeeIterator* _tmp8_; +			gboolean _tmp9_;  			gchar* key = NULL; -			GeeIterator* _tmp10_ = NULL; -			gpointer _tmp11_ = NULL; -			KeyValueMap* _tmp12_ = NULL; -			GeeHashMap* _tmp13_ = NULL; -			const gchar* _tmp14_ = NULL; -			GeeHashMap* _tmp15_ = NULL; -			const gchar* _tmp16_ = NULL; -			gpointer _tmp17_ = NULL; -			gchar* _tmp18_ = NULL; +			GeeIterator* _tmp10_; +			gpointer _tmp11_; +			KeyValueMap* _tmp12_; +			GeeHashMap* _tmp13_; +			const gchar* _tmp14_; +			GeeHashMap* _tmp15_; +			const gchar* _tmp16_; +			gpointer _tmp17_; +			gchar* _tmp18_;  #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  			_tmp8_ = _key_it;  #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -227,8 +227,8 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {  gchar* key_value_map_get_group (KeyValueMap* self) {  	gchar* result = NULL; -	const gchar* _tmp0_ = NULL; -	gchar* _tmp1_ = 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" @@ -245,9 +245,9 @@ gchar* key_value_map_get_group (KeyValueMap* self) {  GeeSet* key_value_map_get_keys (KeyValueMap* self) {  	GeeSet* result = NULL; -	GeeHashMap* _tmp0_ = NULL; -	GeeSet* _tmp1_ = NULL; -	GeeSet* _tmp2_ = NULL; +	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" @@ -266,9 +266,9 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) {  gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) {  	gboolean result = FALSE; -	GeeHashMap* _tmp0_ = NULL; -	const gchar* _tmp1_ = NULL; -	gboolean _tmp2_ = FALSE; +	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" @@ -288,10 +288,10 @@ gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) {  void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value) { -	const gchar* _tmp0_ = NULL; -	GeeHashMap* _tmp1_ = NULL; -	const gchar* _tmp2_ = NULL; -	const gchar* _tmp3_ = NULL; +	const gchar* _tmp0_; +	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" @@ -315,12 +315,12 @@ void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar*  void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) { -	const gchar* _tmp0_ = NULL; -	GeeHashMap* _tmp1_ = NULL; -	const gchar* _tmp2_ = NULL; -	gint _tmp3_ = 0; -	gchar* _tmp4_ = NULL; -	gchar* _tmp5_ = NULL; +	const gchar* _tmp0_; +	GeeHashMap* _tmp1_; +	const gchar* _tmp2_; +	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" @@ -349,41 +349,41 @@ void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) {  static gchar* double_to_string (gdouble self) {  	gchar* result = NULL; -	gchar* _tmp0_ = NULL; -	gchar* _tmp1_ = NULL; -	gint _tmp1__length1 = 0; -	const gchar* _tmp2_ = NULL; -	gchar* _tmp3_ = NULL; -	gchar* _tmp4_ = NULL; -#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +	gchar* _tmp0_; +	gchar* _tmp1_; +	gint _tmp1__length1; +	const gchar* _tmp2_; +	gchar* _tmp3_; +	gchar* _tmp4_; +#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	_tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE); -#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	_tmp1_ = _tmp0_; -#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	_tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE; -#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	_tmp2_ = g_ascii_dtostr (_tmp1_, G_ASCII_DTOSTR_BUF_SIZE, self); -#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	_tmp3_ = g_strdup (_tmp2_); -#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	_tmp4_ = _tmp3_; -#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	_tmp1_ = (g_free (_tmp1_), NULL); -#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	result = _tmp4_; -#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	return result;  #line 377 "KeyValueMap.c"  }  void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value) { -	const gchar* _tmp0_ = NULL; -	GeeHashMap* _tmp1_ = NULL; -	const gchar* _tmp2_ = NULL; -	gdouble _tmp3_ = 0.0; -	gchar* _tmp4_ = NULL; -	gchar* _tmp5_ = NULL; +	const gchar* _tmp0_; +	GeeHashMap* _tmp1_; +	const gchar* _tmp2_; +	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" @@ -411,12 +411,12 @@ void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble valu  void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value) { -	const gchar* _tmp0_ = NULL; -	GeeHashMap* _tmp1_ = NULL; -	const gchar* _tmp2_ = NULL; -	gfloat _tmp3_ = 0.0F; -	gchar* _tmp4_ = NULL; -	gchar* _tmp5_ = NULL; +	const gchar* _tmp0_; +	GeeHashMap* _tmp1_; +	const gchar* _tmp2_; +	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" @@ -445,24 +445,24 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value)  static gchar* bool_to_string (gboolean self) {  	gchar* result = NULL; -#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	if (self) {  #line 451 "KeyValueMap.c" -		gchar* _tmp0_ = NULL; -#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +		gchar* _tmp0_; +#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  		_tmp0_ = g_strdup ("true"); -#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  		result = _tmp0_; -#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  		return result;  #line 459 "KeyValueMap.c"  	} else { -		gchar* _tmp1_ = NULL; -#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +		gchar* _tmp1_; +#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  		_tmp1_ = g_strdup ("false"); -#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  		result = _tmp1_; -#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  		return result;  #line 468 "KeyValueMap.c"  	} @@ -470,12 +470,12 @@ static gchar* bool_to_string (gboolean self) {  void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value) { -	const gchar* _tmp0_ = NULL; -	GeeHashMap* _tmp1_ = NULL; -	const gchar* _tmp2_ = NULL; -	gboolean _tmp3_ = FALSE; -	gchar* _tmp4_ = NULL; -	gchar* _tmp5_ = NULL; +	const gchar* _tmp0_; +	GeeHashMap* _tmp1_; +	const gchar* _tmp2_; +	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" @@ -505,12 +505,12 @@ void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value  gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def) {  	gchar* result = NULL;  	gchar* value = NULL; -	GeeHashMap* _tmp0_ = NULL; -	const gchar* _tmp1_ = NULL; -	gpointer _tmp2_ = NULL; +	GeeHashMap* _tmp0_; +	const gchar* _tmp1_; +	gpointer _tmp2_;  	const gchar* _tmp3_ = NULL; -	const gchar* _tmp4_ = NULL; -	gchar* _tmp7_ = 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" @@ -528,14 +528,14 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha  #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	if (_tmp4_ != NULL) {  #line 531 "KeyValueMap.c" -		const gchar* _tmp5_ = NULL; +		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"  	} else { -		const gchar* _tmp6_ = NULL; +		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" @@ -557,11 +557,11 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha  gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {  	gint result = 0;  	gchar* value = NULL; -	GeeHashMap* _tmp0_ = NULL; -	const gchar* _tmp1_ = NULL; -	gpointer _tmp2_ = NULL; +	GeeHashMap* _tmp0_; +	const gchar* _tmp1_; +	gpointer _tmp2_;  	gint _tmp3_ = 0; -	const gchar* _tmp4_ = NULL; +	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" @@ -579,8 +579,8 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {  #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	if (_tmp4_ != NULL) {  #line 582 "KeyValueMap.c" -		const gchar* _tmp5_ = NULL; -		gint _tmp6_ = 0; +		const gchar* _tmp5_; +		gint _tmp6_;  #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp5_ = value;  #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -589,7 +589,7 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {  		_tmp3_ = _tmp6_;  #line 591 "KeyValueMap.c"  	} else { -		gint _tmp7_ = 0; +		gint _tmp7_;  #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp7_ = def;  #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -608,17 +608,17 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {  static gdouble double_parse (const gchar* str) {  	gdouble result = 0.0; -	const gchar* _tmp0_ = NULL; -	gdouble _tmp1_ = 0.0; -#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +	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 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	_tmp0_ = str; -#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	_tmp1_ = g_ascii_strtod (_tmp0_, NULL); -#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	result = _tmp1_; -#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	return result;  #line 624 "KeyValueMap.c"  } @@ -627,11 +627,11 @@ static gdouble double_parse (const gchar* str) {  gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def) {  	gdouble result = 0.0;  	gchar* value = NULL; -	GeeHashMap* _tmp0_ = NULL; -	const gchar* _tmp1_ = NULL; -	gpointer _tmp2_ = NULL; +	GeeHashMap* _tmp0_; +	const gchar* _tmp1_; +	gpointer _tmp2_;  	gdouble _tmp3_ = 0.0; -	const gchar* _tmp4_ = NULL; +	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" @@ -649,8 +649,8 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d  #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	if (_tmp4_ != NULL) {  #line 652 "KeyValueMap.c" -		const gchar* _tmp5_ = NULL; -		gdouble _tmp6_ = 0.0; +		const gchar* _tmp5_; +		gdouble _tmp6_;  #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp5_ = value;  #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -659,7 +659,7 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d  		_tmp3_ = _tmp6_;  #line 661 "KeyValueMap.c"  	} else { -		gdouble _tmp7_ = 0.0; +		gdouble _tmp7_;  #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp7_ = def;  #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -679,11 +679,11 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d  gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def) {  	gfloat result = 0.0F;  	gchar* value = NULL; -	GeeHashMap* _tmp0_ = NULL; -	const gchar* _tmp1_ = NULL; -	gpointer _tmp2_ = NULL; +	GeeHashMap* _tmp0_; +	const gchar* _tmp1_; +	gpointer _tmp2_;  	gfloat _tmp3_ = 0.0F; -	const gchar* _tmp4_ = NULL; +	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" @@ -701,8 +701,8 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)  #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	if (_tmp4_ != NULL) {  #line 704 "KeyValueMap.c" -		const gchar* _tmp5_ = NULL; -		gdouble _tmp6_ = 0.0; +		const gchar* _tmp5_; +		gdouble _tmp6_;  #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp5_ = value;  #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -711,7 +711,7 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)  		_tmp3_ = (gfloat) _tmp6_;  #line 713 "KeyValueMap.c"  	} else { -		gfloat _tmp7_ = 0.0F; +		gfloat _tmp7_;  #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp7_ = def;  #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -730,22 +730,22 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)  static gboolean bool_parse (const gchar* str) {  	gboolean result = FALSE; -	const gchar* _tmp0_ = NULL; -#line 44 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +	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.34/vapi/glib-2.0.vapi" +#line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	_tmp0_ = str; -#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  	if (g_strcmp0 (_tmp0_, "true") == 0) { -#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  		result = TRUE; -#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  		return result;  #line 745 "KeyValueMap.c"  	} else { -#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  		result = FALSE; -#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"  		return result;  #line 751 "KeyValueMap.c"  	} @@ -755,11 +755,11 @@ static gboolean bool_parse (const gchar* str) {  gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def) {  	gboolean result = FALSE;  	gchar* value = NULL; -	GeeHashMap* _tmp0_ = NULL; -	const gchar* _tmp1_ = NULL; -	gpointer _tmp2_ = NULL; +	GeeHashMap* _tmp0_; +	const gchar* _tmp1_; +	gpointer _tmp2_;  	gboolean _tmp3_ = FALSE; -	const gchar* _tmp4_ = NULL; +	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" @@ -777,8 +777,8 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d  #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	if (_tmp4_ != NULL) {  #line 780 "KeyValueMap.c" -		const gchar* _tmp5_ = NULL; -		gboolean _tmp6_ = FALSE; +		const gchar* _tmp5_; +		gboolean _tmp6_;  #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp5_ = value;  #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -787,7 +787,7 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d  		_tmp3_ = _tmp6_;  #line 789 "KeyValueMap.c"  	} else { -		gboolean _tmp7_ = FALSE; +		gboolean _tmp7_;  #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp7_ = def;  #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -806,10 +806,10 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d  void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result) {  	gchar* value = NULL; -	GeeHashMap* _tmp0_ = NULL; -	const gchar* _tmp1_ = NULL; -	gpointer _tmp2_ = NULL; -	const gchar* _tmp3_ = NULL; +	GeeHashMap* _tmp0_; +	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" @@ -829,7 +829,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def  #line 103 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	if (_tmp3_ == NULL) {  #line 832 "KeyValueMap.c" -		GdkPoint _tmp4_ = {0}; +		GdkPoint _tmp4_;  #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp4_ = *def;  #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -842,8 +842,8 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def  	} else {  		GdkPoint _result_ = {0};  		GdkPoint _tmp5_ = {0}; -		const gchar* _tmp6_ = NULL; -		gint _tmp7_ = 0; +		const gchar* _tmp6_; +		gint _tmp7_;  #line 106 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  		_tmp5_.x = 0;  #line 106 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -862,7 +862,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def  			return;  #line 864 "KeyValueMap.c"  		} else { -			GdkPoint _tmp8_ = {0}; +			GdkPoint _tmp8_;  #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  			_tmp8_ = *def;  #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -881,14 +881,14 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def  void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point) { -	GeeHashMap* _tmp0_ = NULL; -	const gchar* _tmp1_ = NULL; -	GdkPoint _tmp2_ = {0}; -	gint _tmp3_ = 0; -	GdkPoint _tmp4_ = {0}; -	gint _tmp5_ = 0; -	gchar* _tmp6_ = NULL; -	gchar* _tmp7_ = NULL; +	GeeHashMap* _tmp0_; +	const gchar* _tmp1_; +	GdkPoint _tmp2_; +	gint _tmp3_; +	GdkPoint _tmp4_; +	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" @@ -961,7 +961,7 @@ static gchar* value_key_value_map_collect_value (GValue* value, guint n_collect_  #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	if (collect_values[0].v_pointer) {  #line 964 "KeyValueMap.c" -		KeyValueMap* object; +		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) { @@ -988,7 +988,7 @@ static gchar* value_key_value_map_collect_value (GValue* value, guint n_collect_  static gchar* value_key_value_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -	KeyValueMap** object_p; +	KeyValueMap ** object_p;  	object_p = collect_values[0].v_pointer;  #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	if (!object_p) { @@ -1040,7 +1040,7 @@ gpointer value_get_key_value_map (const GValue* value) {  void value_set_key_value_map (GValue* value, gpointer v_object) { -	KeyValueMap* old; +	KeyValueMap * old;  #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP));  #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -1071,7 +1071,7 @@ void value_set_key_value_map (GValue* value, gpointer v_object) {  void value_take_key_value_map (GValue* value, gpointer v_object) { -	KeyValueMap* old; +	KeyValueMap * old;  #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP));  #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -1111,7 +1111,7 @@ static void key_value_map_class_init (KeyValueMapClass * klass) {  static void key_value_map_instance_init (KeyValueMap * self) { -	GeeHashMap* _tmp0_ = NULL; +	GeeHashMap* _tmp0_;  #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	self->priv = KEY_VALUE_MAP_GET_PRIVATE (self);  #line 9 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala" @@ -1124,7 +1124,7 @@ static void key_value_map_instance_init (KeyValueMap * self) {  } -static void key_value_map_finalize (KeyValueMap* obj) { +static void key_value_map_finalize (KeyValueMap * obj) {  	KeyValueMap * self;  #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEY_VALUE_MAP, KeyValueMap); @@ -1153,7 +1153,7 @@ GType key_value_map_get_type (void) {  gpointer key_value_map_ref (gpointer instance) { -	KeyValueMap* self; +	KeyValueMap * self;  	self = instance;  #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	g_atomic_int_inc (&self->ref_count); @@ -1164,7 +1164,7 @@ gpointer key_value_map_ref (gpointer instance) {  void key_value_map_unref (gpointer instance) { -	KeyValueMap* self; +	KeyValueMap * self;  	self = instance;  #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"  	if (g_atomic_int_dec_and_test (&self->ref_count)) {  | 
