From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/SortedList.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/SortedList.c') diff --git a/src/SortedList.c b/src/SortedList.c index a858888..dbb0525 100644 --- a/src/SortedList.c +++ b/src/SortedList.c @@ -1,4 +1,4 @@ -/* SortedList.c generated by valac 0.34.4, the Vala compiler +/* SortedList.c generated by valac 0.34.7, the Vala compiler * generated from SortedList.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -230,7 +230,7 @@ SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFu #line 29 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->g_destroy_func = g_destroy_func; #line 30 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = gee_array_list_new (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, NULL, NULL, NULL); #line 30 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (self->priv->list); #line 30 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -501,7 +501,7 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co GeeList* _tmp27_ = NULL; gboolean _tmp28_ = FALSE; #line 83 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = gee_array_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, NULL, NULL, NULL); + _tmp24_ = gee_array_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, NULL, NULL, NULL); #line 83 "/home/jens/Source/shotwell/src/SortedList.vala" items = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_LIST, GeeList); #line 84 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -779,7 +779,7 @@ inline gint sorted_list_get_count (SortedList* self) { #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -833,7 +833,7 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G #line 165 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = self->priv->list; #line 165 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 165 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = _tmp2_; #line 165 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1074,7 +1074,7 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere #line 202 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = self->priv->list; #line 202 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 202 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = _tmp4_; #line 202 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1390,7 +1390,7 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i #line 275 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 275 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 275 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; #line 275 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1475,7 +1475,7 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i #line 287 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = self->priv->list; #line 287 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 287 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = _tmp16_; #line 287 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1487,7 +1487,7 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i #line 288 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = self->priv->list; #line 288 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 288 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp20_ = _tmp19_; #line 288 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1579,7 +1579,7 @@ SortedList* sorted_list_copy (SortedList* self) { #line 304 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0__target = self->priv->cmp_target; #line 304 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = sorted_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, _tmp0_, _tmp0__target); + _tmp1_ = sorted_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, _tmp0_, _tmp0__target); #line 304 "/home/jens/Source/shotwell/src/SortedList.vala" copy = _tmp1_; #line 306 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1640,7 +1640,7 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { #line 332 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = self->priv->list; #line 332 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 332 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = _tmp2_; #line 332 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2495,7 +2495,7 @@ static gboolean sorted_list_real_get_read_only (GeeCollection* base) { #line 39 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 39 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = gee_abstract_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = gee_abstract_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 39 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; #line 39 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2539,7 +2539,7 @@ static gint sorted_list_real_get_size (GeeCollection* base) { #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" -- cgit v1.2.3