From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/SortedList.c | 948 +++++++++++++++++++++++++++---------------------------- 1 file changed, 474 insertions(+), 474 deletions(-) (limited to 'src/SortedList.c') diff --git a/src/SortedList.c b/src/SortedList.c index dbb0525..e616365 100644 --- a/src/SortedList.c +++ b/src/SortedList.c @@ -1,4 +1,4 @@ -/* SortedList.c generated by valac 0.34.7, the Vala compiler +/* SortedList.c generated by valac 0.36.6, the Vala compiler * generated from SortedList.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -53,9 +53,9 @@ struct _SortedListPrivate { static gpointer sorted_list_parent_class = NULL; -static GeeTraversableIface* sorted_list_gee_traversable_parent_iface = NULL; -static GeeIterableIface* sorted_list_gee_iterable_parent_iface = NULL; -static GeeCollectionIface* sorted_list_gee_collection_parent_iface = NULL; +static GeeTraversableIface * sorted_list_gee_traversable_parent_iface = NULL; +static GeeIterableIface * sorted_list_gee_iterable_parent_iface = NULL; +static GeeCollectionIface * sorted_list_gee_collection_parent_iface = NULL; gchar* g_utf8_collate_key_for_filename (const gchar* str, gssize len); gint64 file_comparator (void* a, void* b); @@ -66,12 +66,12 @@ enum { SORTED_LIST_G_TYPE, SORTED_LIST_G_DUP_FUNC, SORTED_LIST_G_DESTROY_FUNC, - SORTED_LIST_ELEMENT_TYPE, - SORTED_LIST_READ_ONLY, - SORTED_LIST_IS_EMPTY, - SORTED_LIST_SIZE, - SORTED_LIST_READ_ONLY_VIEW, - SORTED_LIST_READ_ONLY_VIEW_AS_LIST + SORTED_LIST_ELEMENT_TYPE_PROPERTY, + SORTED_LIST_READ_ONLY_PROPERTY, + SORTED_LIST_IS_EMPTY_PROPERTY, + SORTED_LIST_SIZE_PROPERTY, + SORTED_LIST_READ_ONLY_VIEW_PROPERTY, + SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY }; SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); @@ -101,7 +101,7 @@ SortedList* sorted_list_copy (SortedList* self); static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint end_index); static void sorted_list_merge (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint middle_index, gint end_index); GeeList* sorted_list_get_read_only_view_as_list (SortedList* self); -static void sorted_list_finalize (GObject* obj); +static void sorted_list_finalize (GObject * obj); static void _vala_sorted_list_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_sorted_list_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -111,22 +111,22 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify gint64 file_comparator (void* a, void* b) { gint64 result = 0LL; gchar* path_a = NULL; - void* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + void* _tmp0_; + gchar* _tmp1_; gchar* path_b = NULL; - void* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp7_ = NULL; - GCompareFunc _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gint _tmp15_ = 0; - gint64 _tmp16_ = 0LL; + void* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp7_; + GCompareFunc _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gint _tmp15_; + gint64 _tmp16_; #line 12 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = a; #line 12 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -145,7 +145,7 @@ gint64 file_comparator (void* a, void* b) { if (_tmp4_ == NULL) { #line 147 "SortedList.c" gint _tmp5_ = 0; - const gchar* _tmp6_ = NULL; + const gchar* _tmp6_; #line 17 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = path_b; #line 17 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -218,9 +218,9 @@ gint64 file_comparator (void* a, void* b) { SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target) { SortedList * self = NULL; - GeeArrayList* _tmp0_ = NULL; - Comparator _tmp1_ = NULL; - void* _tmp1__target = NULL; + GeeArrayList* _tmp0_; + Comparator _tmp1_; + void* _tmp1__target; #line 29 "/home/jens/Source/shotwell/src/SortedList.vala" self = (SortedList*) g_object_new (object_type, NULL); #line 29 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -259,8 +259,8 @@ SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNo static GeeIterator* sorted_list_real_iterator (GeeIterable* base) { SortedList * self; GeeIterator* result = NULL; - GeeArrayList* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeArrayList* _tmp0_; + GeeIterator* _tmp1_; #line 42 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 43 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -278,10 +278,10 @@ static GeeIterator* sorted_list_real_iterator (GeeIterable* base) { static gboolean sorted_list_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target) { SortedList * self; gboolean result = FALSE; - GeeArrayList* _tmp0_ = NULL; - GeeForallFunc _tmp1_ = NULL; - void* _tmp1__target = NULL; - gboolean _tmp2_ = FALSE; + GeeArrayList* _tmp0_; + GeeForallFunc _tmp1_; + void* _tmp1__target; + gboolean _tmp2_; #line 46 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 47 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -303,8 +303,8 @@ static gboolean sorted_list_real_foreach (GeeTraversable* base, GeeForallFunc f, static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) { SortedList * self; gboolean result = FALSE; - Comparator _tmp0_ = NULL; - void* _tmp0__target = NULL; + Comparator _tmp0_; + void* _tmp0__target; #line 50 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 51 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -314,8 +314,8 @@ static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) { #line 51 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp0_ == NULL) { #line 317 "SortedList.c" - GeeArrayList* _tmp1_ = NULL; - gconstpointer _tmp2_ = NULL; + GeeArrayList* _tmp1_; + gconstpointer _tmp2_; #line 52 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = self->priv->list; #line 52 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -324,10 +324,10 @@ static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) { gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); #line 326 "SortedList.c" } else { - GeeArrayList* _tmp3_ = NULL; - gconstpointer _tmp4_ = NULL; - gint _tmp5_ = 0; - gconstpointer _tmp6_ = NULL; + GeeArrayList* _tmp3_; + gconstpointer _tmp4_; + gint _tmp5_; + gconstpointer _tmp6_; #line 54 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = self->priv->list; #line 54 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -358,19 +358,19 @@ static gpointer _g_object_ref0 (gpointer self) { static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* collection) { SortedList * self; gboolean result = FALSE; - GeeCollection* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeCollection* _tmp0_; + gint _tmp1_; + gint _tmp2_; GeeList* as_list = NULL; - GeeCollection* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; - GeeList* _tmp5_ = NULL; - Comparator _tmp8_ = NULL; - void* _tmp8__target = NULL; + GeeCollection* _tmp3_; + GeeList* _tmp4_; + GeeList* _tmp5_; + Comparator _tmp8_; + void* _tmp8__target; gboolean changed = FALSE; - GeeCollection* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + GeeCollection* _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 63 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 63 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -400,8 +400,8 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co #line 68 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp5_ != NULL) { #line 403 "SortedList.c" - GeeList* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeList* _tmp6_; + gboolean _tmp7_; #line 69 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = as_list; #line 69 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -421,9 +421,9 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co #line 71 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp8_ == NULL) { #line 424 "SortedList.c" - GeeArrayList* _tmp9_ = NULL; - GeeCollection* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + GeeArrayList* _tmp9_; + GeeCollection* _tmp10_; + gboolean _tmp11_; #line 72 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp9_ = self->priv->list; #line 72 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -450,16 +450,16 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co if (_tmp14_ == 1) { #line 452 "SortedList.c" GeeIterator* iter = NULL; - GeeCollection* _tmp15_ = NULL; - GeeIterator* _tmp16_ = NULL; - GeeIterator* _tmp17_ = NULL; + GeeCollection* _tmp15_; + GeeIterator* _tmp16_; + GeeIterator* _tmp17_; gpointer item = NULL; - GeeIterator* _tmp18_ = NULL; - gpointer _tmp19_ = NULL; - GeeArrayList* _tmp20_ = NULL; - gconstpointer _tmp21_ = NULL; - gint _tmp22_ = 0; - gconstpointer _tmp23_ = NULL; + GeeIterator* _tmp18_; + gpointer _tmp19_; + GeeArrayList* _tmp20_; + gconstpointer _tmp21_; + gint _tmp22_; + gconstpointer _tmp23_; #line 76 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = collection; #line 76 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -495,11 +495,11 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co #line 496 "SortedList.c" } else { GeeList* items = NULL; - GeeArrayList* _tmp24_ = NULL; - GeeList* _tmp25_ = NULL; - GeeCollection* _tmp26_ = NULL; - GeeList* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; + GeeArrayList* _tmp24_; + GeeList* _tmp25_; + GeeCollection* _tmp26_; + GeeList* _tmp27_; + gboolean _tmp28_; #line 83 "/home/jens/Source/shotwell/src/SortedList.vala" _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" @@ -533,9 +533,9 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co gboolean sorted_list_add_list (SortedList* self, GeeList* items) { gboolean result = FALSE; gboolean added = FALSE; - GeeList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeList* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 95 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), FALSE); #line 95 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -552,8 +552,8 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) { if (_tmp2_ == 0) { #line 554 "SortedList.c" } else { - Comparator _tmp3_ = NULL; - void* _tmp3__target = NULL; + Comparator _tmp3_; + void* _tmp3__target; #line 99 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = self->priv->cmp; #line 99 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -561,9 +561,9 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) { #line 99 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp3_ != NULL) { #line 564 "SortedList.c" - GeeList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + GeeList* _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 102 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = items; #line 102 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -573,14 +573,14 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) { #line 102 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp6_ == 1) { #line 576 "SortedList.c" - GeeArrayList* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - gpointer _tmp10_ = NULL; - gint _tmp11_ = 0; - GeeList* _tmp12_ = NULL; - gpointer _tmp13_ = NULL; - gpointer _tmp14_ = NULL; + GeeArrayList* _tmp7_; + GeeList* _tmp8_; + gpointer _tmp9_; + gpointer _tmp10_; + gint _tmp11_; + GeeList* _tmp12_; + gpointer _tmp13_; + gpointer _tmp14_; #line 103 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = self->priv->list; #line 103 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -607,8 +607,8 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) { added = TRUE; #line 609 "SortedList.c" } else { - GeeList* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeList* _tmp15_; + gboolean _tmp16_; #line 106 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = items; #line 106 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -618,9 +618,9 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) { #line 619 "SortedList.c" } } else { - GeeArrayList* _tmp17_ = NULL; - GeeList* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; + GeeArrayList* _tmp17_; + GeeList* _tmp18_; + gboolean _tmp19_; #line 109 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = self->priv->list; #line 109 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -642,7 +642,7 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) { static void sorted_list_real_clear (GeeCollection* base) { SortedList * self; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; #line 119 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 120 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -656,9 +656,9 @@ static void sorted_list_real_clear (GeeCollection* base) { static gboolean sorted_list_real_contains (GeeCollection* base, gconstpointer item) { SortedList * self; gboolean result = FALSE; - GeeArrayList* _tmp0_ = NULL; - gconstpointer _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeArrayList* _tmp0_; + gconstpointer _tmp1_; + gboolean _tmp2_; #line 123 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 124 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -678,9 +678,9 @@ static gboolean sorted_list_real_contains (GeeCollection* base, gconstpointer it static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollection* collection) { SortedList * self; gboolean result = FALSE; - GeeArrayList* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeArrayList* _tmp0_; + GeeCollection* _tmp1_; + gboolean _tmp2_; #line 127 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 127 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -702,9 +702,9 @@ static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollectio static gboolean sorted_list_real_remove (GeeCollection* base, gconstpointer item) { SortedList * self; gboolean result = FALSE; - GeeArrayList* _tmp0_ = NULL; - gconstpointer _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeArrayList* _tmp0_; + gconstpointer _tmp1_; + gboolean _tmp2_; #line 137 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 138 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -724,9 +724,9 @@ static gboolean sorted_list_real_remove (GeeCollection* base, gconstpointer item static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection* collection) { SortedList * self; gboolean result = FALSE; - GeeArrayList* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeArrayList* _tmp0_; + GeeCollection* _tmp1_; + gboolean _tmp2_; #line 141 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 141 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -748,9 +748,9 @@ static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection* static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection* collection) { SortedList * self; gboolean result = FALSE; - GeeArrayList* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeArrayList* _tmp0_; + GeeCollection* _tmp1_; + gboolean _tmp2_; #line 145 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 145 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -771,9 +771,9 @@ static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection* inline gint sorted_list_get_count (SortedList* self) { gint result = 0; - GeeArrayList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeArrayList* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 153 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), 0); #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -792,9 +792,9 @@ inline gint sorted_list_get_count (SortedList* self) { gpointer sorted_list_get_at (SortedList* self, gint index) { gpointer result = NULL; - GeeArrayList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gpointer _tmp2_ = NULL; + GeeArrayList* _tmp0_; + gint _tmp1_; + gpointer _tmp2_; #line 157 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), NULL); #line 158 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -813,13 +813,13 @@ gpointer sorted_list_get_at (SortedList* self, gint index) { static gint sorted_list_binary_search (SortedList* self, gconstpointer search, GEqualFunc equal_func) { gint result = 0; - Comparator _tmp0_ = NULL; - void* _tmp0__target = NULL; + Comparator _tmp0_; + void* _tmp0__target; gint min = 0; gint max = 0; - GeeArrayList* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + GeeArrayList* _tmp1_; + gint _tmp2_; + gint _tmp3_; #line 161 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), 0); #line 162 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -847,24 +847,24 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G while (TRUE) { #line 849 "SortedList.c" gint mid = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; gpointer item = NULL; - GeeArrayList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gpointer _tmp10_ = NULL; + GeeArrayList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; gboolean _tmp11_ = FALSE; - GEqualFunc _tmp12_ = NULL; + GEqualFunc _tmp12_; gint64 compare = 0LL; - Comparator _tmp17_ = NULL; - void* _tmp17__target = NULL; - gconstpointer _tmp18_ = NULL; - gconstpointer _tmp19_ = NULL; - gint64 _tmp20_ = 0LL; - gint64 _tmp21_ = 0LL; - gint _tmp25_ = 0; - gint _tmp26_ = 0; + Comparator _tmp17_; + void* _tmp17__target; + gconstpointer _tmp18_; + gconstpointer _tmp19_; + gint64 _tmp20_; + gint64 _tmp21_; + gint _tmp25_; + gint _tmp26_; #line 166 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp4_) { #line 871 "SortedList.c" @@ -892,10 +892,10 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G #line 170 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp12_ != NULL) { #line 895 "SortedList.c" - GEqualFunc _tmp13_ = NULL; - gconstpointer _tmp14_ = NULL; - gconstpointer _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GEqualFunc _tmp13_; + gconstpointer _tmp14_; + gconstpointer _tmp15_; + gboolean _tmp16_; #line 170 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = equal_func; #line 170 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -946,20 +946,20 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G return result; #line 948 "SortedList.c" } else { - gint64 _tmp22_ = 0LL; + gint64 _tmp22_; #line 176 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp22_ = compare; #line 176 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp22_ > ((gint64) 0)) { #line 955 "SortedList.c" - gint _tmp23_ = 0; + gint _tmp23_; #line 177 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23_ = mid; #line 177 "/home/jens/Source/shotwell/src/SortedList.vala" max = _tmp23_ - 1; #line 961 "SortedList.c" } else { - gint _tmp24_ = 0; + gint _tmp24_; #line 179 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp24_ = mid; #line 179 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -995,8 +995,8 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G gint sorted_list_index_of (SortedList* self, gconstpointer search) { gint result = 0; gint _tmp0_ = 0; - Comparator _tmp1_ = NULL; - void* _tmp1__target = NULL; + Comparator _tmp1_; + void* _tmp1__target; #line 195 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), 0); #line 196 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1006,8 +1006,8 @@ gint sorted_list_index_of (SortedList* self, gconstpointer search) { #line 196 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp1_ != NULL) { #line 1009 "SortedList.c" - gconstpointer _tmp2_ = NULL; - gint _tmp3_ = 0; + gconstpointer _tmp2_; + gint _tmp3_; #line 196 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = search; #line 196 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1016,9 +1016,9 @@ gint sorted_list_index_of (SortedList* self, gconstpointer search) { _tmp0_ = _tmp3_; #line 1018 "SortedList.c" } else { - gconstpointer _tmp4_ = NULL; - GEqualFunc _tmp5_ = NULL; - gint _tmp6_ = 0; + gconstpointer _tmp4_; + GEqualFunc _tmp5_; + gint _tmp6_; #line 196 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = search; #line 196 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1040,11 +1040,11 @@ gint sorted_list_index_of (SortedList* self, gconstpointer search) { gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altered, GEqualFunc equal_func) { gint result = 0; gboolean _tmp0_ = FALSE; - Comparator _tmp1_ = NULL; - void* _tmp1__target = NULL; - gconstpointer _tmp18_ = NULL; - GEqualFunc _tmp19_ = NULL; - gint _tmp20_ = 0; + Comparator _tmp1_; + void* _tmp1__target; + gconstpointer _tmp18_; + GEqualFunc _tmp19_; + gint _tmp20_; #line 200 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), 0); #line 201 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1057,7 +1057,7 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere _tmp0_ = TRUE; #line 1059 "SortedList.c" } else { - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; #line 201 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = altered; #line 201 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1068,9 +1068,9 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere if (_tmp0_) { #line 1070 "SortedList.c" gint count = 0; - GeeArrayList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + GeeArrayList* _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 202 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = self->priv->list; #line 202 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1092,20 +1092,20 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere #line 203 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { #line 1095 "SortedList.c" - gint _tmp8_ = 0; - gint _tmp9_ = 0; - GEqualFunc _tmp10_ = NULL; - GeeArrayList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gpointer _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - gconstpointer _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; - gboolean _tmp17_ = FALSE; + gint _tmp8_; + gint _tmp9_; + GEqualFunc _tmp10_; + GeeArrayList* _tmp11_; + gint _tmp12_; + gpointer _tmp13_; + gpointer _tmp14_; + gconstpointer _tmp15_; + gboolean _tmp16_; + gboolean _tmp17_; #line 203 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp6_) { #line 1108 "SortedList.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 203 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = ctr; #line 203 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1175,9 +1175,9 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere gpointer sorted_list_remove_at (SortedList* self, gint index) { gpointer result = NULL; - GeeArrayList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gpointer _tmp2_ = NULL; + GeeArrayList* _tmp0_; + gint _tmp1_; + gpointer _tmp2_; #line 226 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), NULL); #line 227 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1197,11 +1197,11 @@ gpointer sorted_list_remove_at (SortedList* self, gint index) { static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_length1) { SortedList * self; gpointer* result = NULL; - GeeArrayList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gpointer* _tmp2_ = NULL; - gpointer* _tmp3_ = NULL; - gint _tmp3__length1 = 0; + GeeArrayList* _tmp0_; + gint _tmp1_; + gpointer* _tmp2_; + gpointer* _tmp3_; + gint _tmp3__length1; #line 230 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 231 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1227,8 +1227,8 @@ static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_len void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_target) { - Comparator _tmp0_ = NULL; - void* _tmp0__target = NULL; + Comparator _tmp0_; + void* _tmp0__target; #line 234 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); #line 235 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1248,17 +1248,17 @@ void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_tar gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) { gboolean result = FALSE; gint index = 0; - gconstpointer _tmp0_ = NULL; - GEqualFunc _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + gconstpointer _tmp0_; + GEqualFunc _tmp1_; + gint _tmp2_; + gint _tmp3_; gint new_index = 0; - gconstpointer _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + gconstpointer _tmp4_; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 245 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), FALSE); #line 246 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1298,15 +1298,15 @@ gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) { #line 256 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp8_ > _tmp9_) { #line 1301 "SortedList.c" - GeeArrayList* _tmp10_ = NULL; - gint _tmp11_ = 0; - gconstpointer _tmp12_ = NULL; + GeeArrayList* _tmp10_; + gint _tmp11_; + gconstpointer _tmp12_; gpointer removed_item = NULL; - GeeArrayList* _tmp13_ = NULL; - gint _tmp14_ = 0; - gpointer _tmp15_ = NULL; - gconstpointer _tmp16_ = NULL; - gconstpointer _tmp17_ = NULL; + GeeArrayList* _tmp13_; + gint _tmp14_; + gpointer _tmp15_; + gconstpointer _tmp16_; + gconstpointer _tmp17_; #line 257 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = self->priv->list; #line 257 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1334,14 +1334,14 @@ gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) { #line 1335 "SortedList.c" } else { gpointer removed_item = NULL; - GeeArrayList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gpointer _tmp20_ = NULL; - gconstpointer _tmp21_ = NULL; - gconstpointer _tmp22_ = NULL; - GeeArrayList* _tmp23_ = NULL; - gint _tmp24_ = 0; - gconstpointer _tmp25_ = NULL; + GeeArrayList* _tmp18_; + gint _tmp19_; + gpointer _tmp20_; + gconstpointer _tmp21_; + gconstpointer _tmp22_; + GeeArrayList* _tmp23_; + gint _tmp24_; + gconstpointer _tmp25_; #line 261 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = self->priv->list; #line 261 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1380,9 +1380,9 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i gint result = 0; gint low = 0; gint high = 0; - GeeArrayList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeArrayList* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 273 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), 0); #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1403,25 +1403,25 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i #line 276 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { #line 1406 "SortedList.c" - gint _tmp4_ = 0; - gint _tmp5_ = 0; + gint _tmp4_; + gint _tmp5_; gint mid = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; gpointer cmp_item = NULL; - GeeArrayList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gpointer _tmp11_ = NULL; - gconstpointer _tmp12_ = NULL; - gconstpointer _tmp13_ = NULL; + GeeArrayList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + gconstpointer _tmp12_; + gconstpointer _tmp13_; gint64 _result_ = 0LL; - Comparator _tmp24_ = NULL; - void* _tmp24__target = NULL; - gconstpointer _tmp25_ = NULL; - gconstpointer _tmp26_ = NULL; - gint64 _tmp27_ = 0LL; - gint64 _tmp28_ = 0LL; + Comparator _tmp24_; + void* _tmp24__target; + gconstpointer _tmp25_; + gconstpointer _tmp26_; + gint64 _tmp27_; + gint64 _tmp28_; #line 276 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp3_) { #line 1428 "SortedList.c" @@ -1463,13 +1463,13 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i #line 285 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp12_ == _tmp13_) { #line 1466 "SortedList.c" - gint _tmp14_ = 0; - GeeArrayList* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - GeeArrayList* _tmp21_ = NULL; - gint _tmp22_ = 0; - gpointer _tmp23_ = NULL; + gint _tmp14_; + GeeArrayList* _tmp15_; + gint _tmp16_; + gint _tmp17_; + GeeArrayList* _tmp21_; + gint _tmp22_; + gpointer _tmp23_; #line 287 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = mid; #line 287 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1481,9 +1481,9 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i #line 287 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp14_ >= (_tmp17_ - 1)) { #line 1484 "SortedList.c" - GeeArrayList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; + GeeArrayList* _tmp18_; + gint _tmp19_; + gint _tmp20_; #line 288 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = self->priv->list; #line 288 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1527,20 +1527,20 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i #line 294 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp28_ < ((gint64) 0)) { #line 1530 "SortedList.c" - gint _tmp29_ = 0; + gint _tmp29_; #line 295 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp29_ = mid; #line 295 "/home/jens/Source/shotwell/src/SortedList.vala" high = _tmp29_; #line 1536 "SortedList.c" } else { - gint64 _tmp30_ = 0LL; + gint64 _tmp30_; #line 296 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp30_ = _result_; #line 296 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp30_ > ((gint64) 0)) { #line 1543 "SortedList.c" - gint _tmp31_ = 0; + gint _tmp31_; #line 297 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp31_ = mid; #line 297 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1567,11 +1567,11 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i SortedList* sorted_list_copy (SortedList* self) { SortedList* result = NULL; SortedList* copy = NULL; - Comparator _tmp0_ = NULL; - void* _tmp0__target = NULL; - SortedList* _tmp1_ = NULL; - GeeArrayList* _tmp2_ = NULL; - GeeArrayList* _tmp3_ = NULL; + Comparator _tmp0_; + void* _tmp0__target; + SortedList* _tmp1_; + GeeArrayList* _tmp2_; + GeeArrayList* _tmp3_; #line 303 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), NULL); #line 304 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1598,35 +1598,35 @@ SortedList* sorted_list_copy (SortedList* self) { static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { gboolean result = FALSE; - Comparator _tmp0_ = NULL; - void* _tmp0__target = NULL; + Comparator _tmp0_; + void* _tmp0__target; gint list_count = 0; - GeeArrayList* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + GeeArrayList* _tmp1_; + gint _tmp2_; + gint _tmp3_; gint _tmp4_ = 0; - GeeList* _tmp5_ = NULL; + GeeList* _tmp5_; gint add_count = 0; gint count = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; gpointer* array = NULL; - gint _tmp12_ = 0; - gpointer* _tmp13_ = NULL; - gint array_length1 = 0; - gint _array_size_ = 0; + gint _tmp12_; + gpointer* _tmp13_; + gint array_length1; + gint _array_size_; gint offset = 0; - GeeList* _tmp23_ = NULL; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gpointer* _tmp35_ = NULL; - gint _tmp35__length1 = 0; - gint _tmp36_ = 0; - gpointer* _tmp37_ = NULL; - gpointer* _tmp38_ = NULL; - gint _tmp38__length1 = 0; - gint _tmp39_ = 0; + GeeList* _tmp23_; + gint _tmp33_; + gint _tmp34_; + gpointer* _tmp35_; + gint _tmp35__length1; + gint _tmp36_; + gpointer* _tmp37_; + gpointer* _tmp38_; + gint _tmp38__length1; + gint _tmp39_; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), FALSE); #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1650,9 +1650,9 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { #line 333 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp5_ != NULL) { #line 1653 "SortedList.c" - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 333 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = add; #line 333 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1700,16 +1700,16 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { #line 344 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { #line 1703 "SortedList.c" - gint _tmp14_ = 0; - gint _tmp15_ = 0; - gpointer* _tmp16_ = NULL; - gint _tmp16__length1 = 0; - gint _tmp17_ = 0; - GeeArrayList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gpointer _tmp20_ = NULL; - gpointer _tmp21_ = NULL; - gint _tmp22_ = 0; + gint _tmp14_; + gint _tmp15_; + gpointer* _tmp16_; + gint _tmp16__length1; + gint _tmp17_; + GeeArrayList* _tmp18_; + gint _tmp19_; + gpointer _tmp20_; + gpointer _tmp21_; + gint _tmp22_; #line 344 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = offset; #line 344 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1755,16 +1755,16 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { #line 1758 "SortedList.c" - gint _tmp24_ = 0; - gint _tmp25_ = 0; - gpointer* _tmp26_ = NULL; - gint _tmp26__length1 = 0; - gint _tmp27_ = 0; - GeeList* _tmp28_ = NULL; - gint _tmp29_ = 0; - gpointer _tmp30_ = NULL; - gpointer _tmp31_ = NULL; - gint _tmp32_ = 0; + gint _tmp24_; + gint _tmp25_; + gpointer* _tmp26_; + gint _tmp26__length1; + gint _tmp27_; + GeeList* _tmp28_; + gint _tmp29_; + gpointer _tmp30_; + gpointer _tmp31_; + gint _tmp32_; #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp24_ = offset; #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1831,15 +1831,15 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { #line 362 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { #line 1834 "SortedList.c" - gint _tmp40_ = 0; - gint _tmp41_ = 0; - GeeArrayList* _tmp42_ = NULL; - gint _tmp43_ = 0; - gpointer* _tmp44_ = NULL; - gint _tmp44__length1 = 0; - gint _tmp45_ = 0; - gconstpointer _tmp46_ = NULL; - gint _tmp47_ = 0; + gint _tmp40_; + gint _tmp41_; + GeeArrayList* _tmp42_; + gint _tmp43_; + gpointer* _tmp44_; + gint _tmp44__length1; + gint _tmp45_; + gconstpointer _tmp46_; + gint _tmp47_; #line 362 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp40_ = offset; #line 362 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1873,15 +1873,15 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { #line 367 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { #line 1876 "SortedList.c" - gint _tmp48_ = 0; - gint _tmp49_ = 0; - GeeArrayList* _tmp50_ = NULL; - gint _tmp51_ = 0; - gpointer* _tmp52_ = NULL; - gint _tmp52__length1 = 0; - gint _tmp53_ = 0; - gconstpointer _tmp54_ = NULL; - gint _tmp55_ = 0; + gint _tmp48_; + gint _tmp49_; + GeeArrayList* _tmp50_; + gint _tmp51_; + gpointer* _tmp52_; + gint _tmp52__length1; + gint _tmp53_; + gconstpointer _tmp54_; + gint _tmp55_; #line 367 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp48_ = offset; #line 367 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1923,38 +1923,38 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint end_index) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; gint count = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; gint middle_index = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gpointer* _tmp7_ = NULL; - gint _tmp7__length1 = 0; - gpointer* _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gpointer* _tmp11_ = NULL; - gint _tmp11__length1 = 0; - gpointer* _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - Comparator _tmp15_ = NULL; - void* _tmp15__target = NULL; - gpointer* _tmp16_ = NULL; - gint _tmp16__length1 = 0; - gint _tmp17_ = 0; - gconstpointer _tmp18_ = NULL; - gpointer* _tmp19_ = NULL; - gint _tmp19__length1 = 0; - gint _tmp20_ = 0; - gconstpointer _tmp21_ = NULL; - gint64 _tmp22_ = 0LL; + gint _tmp5_; + gint _tmp6_; + gpointer* _tmp7_; + gint _tmp7__length1; + gpointer* _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + gint _tmp10_; + gpointer* _tmp11_; + gint _tmp11__length1; + gpointer* _tmp12_; + gint _tmp12__length1; + gint _tmp13_; + gint _tmp14_; + Comparator _tmp15_; + void* _tmp15__target; + gpointer* _tmp16_; + gint _tmp16__length1; + gint _tmp17_; + gconstpointer _tmp18_; + gpointer* _tmp19_; + gint _tmp19__length1; + gint _tmp20_; + gconstpointer _tmp21_; + gint64 _tmp22_; #line 375 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); #line 376 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2036,13 +2036,13 @@ static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int arra #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp22_ > ((gint64) 0)) { #line 2039 "SortedList.c" - gpointer* _tmp23_ = NULL; - gint _tmp23__length1 = 0; - gpointer* _tmp24_ = NULL; - gint _tmp24__length1 = 0; - gint _tmp25_ = 0; - gint _tmp26_ = 0; - gint _tmp27_ = 0; + gpointer* _tmp23_; + gint _tmp23__length1; + gpointer* _tmp24_; + gint _tmp24__length1; + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; #line 388 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23_ = array; #line 388 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2065,25 +2065,25 @@ static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int arra static void sorted_list_merge (SortedList* self, gpointer* array, int array_length1, gpointer* scratch, int scratch_length1, gint start_index, gint middle_index, gint end_index) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; gint count = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + gint _tmp2_; + gint _tmp3_; gint left_start = 0; - gint _tmp4_ = 0; + gint _tmp4_; gint left_end = 0; - gint _tmp5_ = 0; + gint _tmp5_; gint right_start = 0; - gint _tmp6_ = 0; + gint _tmp6_; gint right_end = 0; - gint _tmp7_ = 0; - gpointer* _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; + gint _tmp7_; + gpointer* _tmp8_; + gint _tmp8__length1; + gint _tmp9_; gint scratch_index = 0; - gint _tmp57_ = 0; - gint _tmp58_ = 0; + gint _tmp57_; + gint _tmp58_; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2128,25 +2128,25 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng while (TRUE) { #line 2130 "SortedList.c" gboolean _tmp10_ = FALSE; - gint _tmp11_ = 0; - gint _tmp12_ = 0; + gint _tmp11_; + gint _tmp12_; gpointer left = NULL; - gpointer* _tmp15_ = NULL; - gint _tmp15__length1 = 0; - gint _tmp16_ = 0; - gconstpointer _tmp17_ = NULL; - gpointer _tmp18_ = NULL; + gpointer* _tmp15_; + gint _tmp15__length1; + gint _tmp16_; + gconstpointer _tmp17_; + gpointer _tmp18_; gpointer right = NULL; - gpointer* _tmp19_ = NULL; - gint _tmp19__length1 = 0; - gint _tmp20_ = 0; - gconstpointer _tmp21_ = NULL; - gpointer _tmp22_ = NULL; - Comparator _tmp23_ = NULL; - void* _tmp23__target = NULL; - gconstpointer _tmp24_ = NULL; - gconstpointer _tmp25_ = NULL; - gint64 _tmp26_ = 0LL; + gpointer* _tmp19_; + gint _tmp19__length1; + gint _tmp20_; + gconstpointer _tmp21_; + gpointer _tmp22_; + Comparator _tmp23_; + void* _tmp23__target; + gconstpointer _tmp24_; + gconstpointer _tmp25_; + gint64 _tmp26_; #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = left_start; #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2154,8 +2154,8 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp11_ <= _tmp12_) { #line 2157 "SortedList.c" - gint _tmp13_ = 0; - gint _tmp14_ = 0; + gint _tmp13_; + gint _tmp14_; #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = right_start; #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2211,13 +2211,13 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng #line 407 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp26_ <= ((gint64) 0)) { #line 2214 "SortedList.c" - gpointer* _tmp27_ = NULL; - gint _tmp27__length1 = 0; - gint _tmp28_ = 0; - gconstpointer _tmp29_ = NULL; - gpointer _tmp30_ = NULL; - gpointer _tmp31_ = NULL; - gint _tmp32_ = 0; + gpointer* _tmp27_; + gint _tmp27__length1; + gint _tmp28_; + gconstpointer _tmp29_; + gpointer _tmp30_; + gpointer _tmp31_; + gint _tmp32_; #line 408 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp27_ = scratch; #line 408 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2242,13 +2242,13 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng left_start = _tmp32_ + 1; #line 2244 "SortedList.c" } else { - gpointer* _tmp33_ = NULL; - gint _tmp33__length1 = 0; - gint _tmp34_ = 0; - gconstpointer _tmp35_ = NULL; - gpointer _tmp36_ = NULL; - gpointer _tmp37_ = NULL; - gint _tmp38_ = 0; + gpointer* _tmp33_; + gint _tmp33__length1; + gint _tmp34_; + gconstpointer _tmp35_; + gpointer _tmp36_; + gpointer _tmp37_; + gint _tmp38_; #line 411 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp33_ = scratch; #line 411 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2282,17 +2282,17 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng #line 416 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { #line 2285 "SortedList.c" - gint _tmp39_ = 0; - gint _tmp40_ = 0; - gpointer* _tmp41_ = NULL; - gint _tmp41__length1 = 0; - gint _tmp42_ = 0; - gpointer* _tmp43_ = NULL; - gint _tmp43__length1 = 0; - gint _tmp44_ = 0; - gconstpointer _tmp45_ = NULL; - gpointer _tmp46_ = NULL; - gpointer _tmp47_ = NULL; + gint _tmp39_; + gint _tmp40_; + gpointer* _tmp41_; + gint _tmp41__length1; + gint _tmp42_; + gpointer* _tmp43_; + gint _tmp43__length1; + gint _tmp44_; + gconstpointer _tmp45_; + gpointer _tmp46_; + gpointer _tmp47_; #line 416 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp39_ = left_start; #line 416 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2334,17 +2334,17 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng #line 419 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { #line 2337 "SortedList.c" - gint _tmp48_ = 0; - gint _tmp49_ = 0; - gpointer* _tmp50_ = NULL; - gint _tmp50__length1 = 0; - gint _tmp51_ = 0; - gpointer* _tmp52_ = NULL; - gint _tmp52__length1 = 0; - gint _tmp53_ = 0; - gconstpointer _tmp54_ = NULL; - gpointer _tmp55_ = NULL; - gpointer _tmp56_ = NULL; + gint _tmp48_; + gint _tmp49_; + gpointer* _tmp50_; + gint _tmp50__length1; + gint _tmp51_; + gpointer* _tmp52_; + gint _tmp52__length1; + gint _tmp53_; + gconstpointer _tmp54_; + gpointer _tmp55_; + gpointer _tmp56_; #line 419 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp48_ = right_start; #line 419 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2394,7 +2394,7 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng #line 2395 "SortedList.c" { gint list_index = 0; - gint _tmp59_ = 0; + gint _tmp59_; #line 425 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp59_ = start_index; #line 425 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2407,21 +2407,21 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng #line 425 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { #line 2410 "SortedList.c" - gint _tmp62_ = 0; - gint _tmp63_ = 0; - gpointer* _tmp64_ = NULL; - gint _tmp64__length1 = 0; - gint _tmp65_ = 0; - gpointer* _tmp66_ = NULL; - gint _tmp66__length1 = 0; - gint _tmp67_ = 0; - gconstpointer _tmp68_ = NULL; - gpointer _tmp69_ = NULL; - gpointer _tmp70_ = NULL; + gint _tmp62_; + gint _tmp63_; + gpointer* _tmp64_; + gint _tmp64__length1; + gint _tmp65_; + gpointer* _tmp66_; + gint _tmp66__length1; + gint _tmp67_; + gconstpointer _tmp68_; + gpointer _tmp69_; + gpointer _tmp70_; #line 425 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp60_) { #line 2424 "SortedList.c" - gint _tmp61_ = 0; + gint _tmp61_; #line 425 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp61_ = list_index; #line 425 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2487,9 +2487,9 @@ static GType sorted_list_real_get_element_type (GeeTraversable* base) { static gboolean sorted_list_real_get_read_only (GeeCollection* base) { gboolean result; SortedList* self; - GeeArrayList* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + GeeArrayList* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; #line 39 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 39 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2509,9 +2509,9 @@ static gboolean sorted_list_real_get_read_only (GeeCollection* base) { static gboolean sorted_list_real_get_is_empty (GeeCollection* base) { gboolean result; SortedList* self; - GeeArrayList* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + GeeArrayList* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; #line 132 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 133 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2531,9 +2531,9 @@ static gboolean sorted_list_real_get_is_empty (GeeCollection* base) { static gint sorted_list_real_get_size (GeeCollection* base) { gint result; SortedList* self; - GeeArrayList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeArrayList* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2553,9 +2553,9 @@ static gint sorted_list_real_get_size (GeeCollection* base) { static GeeCollection* sorted_list_real_get_read_only_view (GeeCollection* base) { GeeCollection* result; SortedList* self; - GeeArrayList* _tmp0_ = NULL; - GeeBidirList* _tmp1_ = NULL; - GeeBidirList* _tmp2_ = NULL; + GeeArrayList* _tmp0_; + GeeBidirList* _tmp1_; + GeeBidirList* _tmp2_; #line 215 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 216 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2574,9 +2574,9 @@ static GeeCollection* sorted_list_real_get_read_only_view (GeeCollection* base) GeeList* sorted_list_get_read_only_view_as_list (SortedList* self) { GeeList* result; - GeeArrayList* _tmp0_ = NULL; - GeeBidirList* _tmp1_ = NULL; - GeeBidirList* _tmp2_ = NULL; + GeeArrayList* _tmp0_; + GeeBidirList* _tmp1_; + GeeBidirList* _tmp2_; #line 221 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), NULL); #line 222 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2611,17 +2611,17 @@ static void sorted_list_class_init (SortedListClass * klass) { #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_ELEMENT_TYPE, g_param_spec_gtype ("element-type", "element-type", "element-type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_ELEMENT_TYPE_PROPERTY, g_param_spec_gtype ("element-type", "element-type", "element-type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_IS_EMPTY, g_param_spec_boolean ("is-empty", "is-empty", "is-empty", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_IS_EMPTY_PROPERTY, g_param_spec_boolean ("is-empty", "is-empty", "is-empty", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_SIZE, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_SIZE_PROPERTY, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW, g_param_spec_object ("read-only-view", "read-only-view", "read-only-view", GEE_TYPE_COLLECTION, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_PROPERTY, g_param_spec_object ("read-only-view", "read-only-view", "read-only-view", GEE_TYPE_COLLECTION, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_AS_LIST, g_param_spec_object ("read-only-view-as-list", "read-only-view-as-list", "read-only-view-as-list", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY, g_param_spec_object ("read-only-view-as-list", "read-only-view-as-list", "read-only-view-as-list", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 2626 "SortedList.c" } @@ -2651,13 +2651,13 @@ static void sorted_list_gee_traversable_interface_init (GeeTraversableIface * if #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_gee_traversable_parent_iface = g_type_interface_peek_parent (iface); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->foreach = (gboolean (*)(GeeTraversable*, GeeForallFunc, void*)) sorted_list_real_foreach; + iface->foreach = (gboolean (*) (GeeTraversable *, GeeForallFunc, void*)) sorted_list_real_foreach; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->get_g_type = (GType(*)(GeeTraversable*)) sorted_list_gee_traversable_get_g_type; + iface->get_g_type = (GType (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_type; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->get_g_dup_func = (GBoxedCopyFunc(*)(GeeTraversable*)) sorted_list_gee_traversable_get_g_dup_func; + iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_dup_func; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->get_g_destroy_func = (GDestroyNotify(*)(GeeTraversable*)) sorted_list_gee_traversable_get_g_destroy_func; + iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_destroy_func; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_element_type = sorted_list_real_get_element_type; #line 2664 "SortedList.c" @@ -2689,13 +2689,13 @@ static void sorted_list_gee_iterable_interface_init (GeeIterableIface * iface) { #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_gee_iterable_parent_iface = g_type_interface_peek_parent (iface); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->iterator = (GeeIterator* (*)(GeeIterable*)) sorted_list_real_iterator; + iface->iterator = (GeeIterator* (*) (GeeIterable *)) sorted_list_real_iterator; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->get_g_type = (GType(*)(GeeIterable*)) sorted_list_gee_iterable_get_g_type; + iface->get_g_type = (GType (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_type; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->get_g_dup_func = (GBoxedCopyFunc(*)(GeeIterable*)) sorted_list_gee_iterable_get_g_dup_func; + iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_dup_func; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->get_g_destroy_func = (GDestroyNotify(*)(GeeIterable*)) sorted_list_gee_iterable_get_g_destroy_func; + iface->get_g_destroy_func = (GDestroyNotify (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_destroy_func; #line 2700 "SortedList.c" } @@ -2725,29 +2725,29 @@ static void sorted_list_gee_collection_interface_init (GeeCollectionIface * ifac #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_gee_collection_parent_iface = g_type_interface_peek_parent (iface); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->add = (gboolean (*)(GeeCollection*, gconstpointer)) sorted_list_real_add; + iface->add = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_add; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->add_all = (gboolean (*)(GeeCollection*, GeeCollection*)) sorted_list_real_add_all; + iface->add_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_add_all; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->clear = (void (*)(GeeCollection*)) sorted_list_real_clear; + iface->clear = (void (*) (GeeCollection *)) sorted_list_real_clear; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->contains = (gboolean (*)(GeeCollection*, gconstpointer)) sorted_list_real_contains; + iface->contains = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_contains; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->contains_all = (gboolean (*)(GeeCollection*, GeeCollection*)) sorted_list_real_contains_all; + iface->contains_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_contains_all; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->remove = (gboolean (*)(GeeCollection*, gconstpointer)) sorted_list_real_remove; + iface->remove = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_remove; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->remove_all = (gboolean (*)(GeeCollection*, GeeCollection*)) sorted_list_real_remove_all; + iface->remove_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_remove_all; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->retain_all = (gboolean (*)(GeeCollection*, GeeCollection*)) sorted_list_real_retain_all; + iface->retain_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_retain_all; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->to_array = (gpointer* (*)(GeeCollection*, int*)) sorted_list_real_to_array; + iface->to_array = (gpointer* (*) (GeeCollection *, int*)) sorted_list_real_to_array; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->get_g_type = (GType(*)(GeeCollection*)) sorted_list_gee_collection_get_g_type; + iface->get_g_type = (GType (*) (GeeCollection *)) sorted_list_gee_collection_get_g_type; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->get_g_dup_func = (GBoxedCopyFunc(*)(GeeCollection*)) sorted_list_gee_collection_get_g_dup_func; + iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeCollection *)) sorted_list_gee_collection_get_g_dup_func; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - iface->get_g_destroy_func = (GDestroyNotify(*)(GeeCollection*)) sorted_list_gee_collection_get_g_destroy_func; + iface->get_g_destroy_func = (GDestroyNotify (*) (GeeCollection *)) sorted_list_gee_collection_get_g_destroy_func; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_read_only = sorted_list_real_get_read_only; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2767,7 +2767,7 @@ static void sorted_list_instance_init (SortedList * self) { } -static void sorted_list_finalize (GObject* obj) { +static void sorted_list_finalize (GObject * obj) { SortedList * self; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SORTED_LIST, SortedList); @@ -2803,37 +2803,37 @@ static void _vala_sorted_list_get_property (GObject * object, guint property_id, #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" switch (property_id) { #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - case SORTED_LIST_ELEMENT_TYPE: + case SORTED_LIST_ELEMENT_TYPE_PROPERTY: #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" g_value_set_gtype (value, gee_traversable_get_element_type (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_TRAVERSABLE, GeeTraversable))); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" break; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - case SORTED_LIST_READ_ONLY: + case SORTED_LIST_READ_ONLY_PROPERTY: #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" g_value_set_boolean (value, gee_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection))); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" break; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - case SORTED_LIST_IS_EMPTY: + case SORTED_LIST_IS_EMPTY_PROPERTY: #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" g_value_set_boolean (value, gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection))); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" break; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - case SORTED_LIST_SIZE: + case SORTED_LIST_SIZE_PROPERTY: #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" g_value_set_int (value, gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection))); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" break; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - case SORTED_LIST_READ_ONLY_VIEW: + case SORTED_LIST_READ_ONLY_VIEW_PROPERTY: #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" g_value_take_object (value, gee_collection_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection))); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" break; #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" - case SORTED_LIST_READ_ONLY_VIEW_AS_LIST: + case SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY: #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" g_value_take_object (value, sorted_list_get_read_only_view_as_list (self)); #line 25 "/home/jens/Source/shotwell/src/SortedList.vala" -- cgit v1.2.3