From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/SortedList.c | 2114 ++++++++++++++++++++++++++---------------------------- 1 file changed, 1000 insertions(+), 1114 deletions(-) (limited to 'src/SortedList.c') diff --git a/src/SortedList.c b/src/SortedList.c index e616365..f5bd10e 100644 --- a/src/SortedList.c +++ b/src/SortedList.c @@ -9,12 +9,8 @@ #include #include -#include -#include -#include #include -#define _g_free0(var) (var = (g_free (var), NULL)) #define TYPE_SORTED_LIST (sorted_list_get_type ()) #define SORTED_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SORTED_LIST, SortedList)) @@ -57,8 +53,6 @@ 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); GType sorted_list_get_type (void) G_GNUC_CONST; #define SORTED_LIST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SORTED_LIST, SortedListPrivate)) enum { @@ -108,151 +102,43 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -gint64 file_comparator (void* a, void* b) { - gint64 result = 0LL; - gchar* path_a = NULL; - void* _tmp0_; - gchar* _tmp1_; - gchar* path_b = NULL; - 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" - _tmp1_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp0_, g_file_get_type (), GFile)); -#line 12 "/home/jens/Source/shotwell/src/SortedList.vala" - path_a = _tmp1_; -#line 13 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = b; -#line 13 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp2_, g_file_get_type (), GFile)); -#line 13 "/home/jens/Source/shotwell/src/SortedList.vala" - path_b = _tmp3_; -#line 16 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = path_a; -#line 16 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp4_ == NULL) { -#line 147 "SortedList.c" - gint _tmp5_ = 0; - const gchar* _tmp6_; -#line 17 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = path_b; -#line 17 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp6_ == NULL) { -#line 17 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = 0; -#line 156 "SortedList.c" - } else { -#line 17 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = 1; -#line 160 "SortedList.c" - } -#line 17 "/home/jens/Source/shotwell/src/SortedList.vala" - result = (gint64) _tmp5_; -#line 17 "/home/jens/Source/shotwell/src/SortedList.vala" - _g_free0 (path_b); -#line 17 "/home/jens/Source/shotwell/src/SortedList.vala" - _g_free0 (path_a); -#line 17 "/home/jens/Source/shotwell/src/SortedList.vala" - return result; -#line 170 "SortedList.c" - } -#line 19 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = path_b; -#line 19 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp7_ == NULL) { -#line 20 "/home/jens/Source/shotwell/src/SortedList.vala" - result = (gint64) -1; -#line 20 "/home/jens/Source/shotwell/src/SortedList.vala" - _g_free0 (path_b); -#line 20 "/home/jens/Source/shotwell/src/SortedList.vala" - _g_free0 (path_a); -#line 20 "/home/jens/Source/shotwell/src/SortedList.vala" - return result; -#line 184 "SortedList.c" - } -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = g_strcmp0; -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = path_a; -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = g_utf8_collate_key_for_filename (_tmp9_, (gssize) -1); -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = _tmp10_; -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = path_b; -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = g_utf8_collate_key_for_filename (_tmp12_, (gssize) -1); -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = _tmp13_; -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = _tmp8_ (_tmp11_, _tmp14_); -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = (gint64) _tmp15_; -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _g_free0 (_tmp14_); -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _g_free0 (_tmp11_); -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp16_; -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _g_free0 (path_b); -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - _g_free0 (path_a); -#line 22 "/home/jens/Source/shotwell/src/SortedList.vala" - return result; -#line 216 "SortedList.c" -} - - 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_; Comparator _tmp1_; void* _tmp1__target; -#line 29 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 13 "/home/jens/Source/shotwell/src/SortedList.vala" self = (SortedList*) g_object_new (object_type, NULL); -#line 29 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 13 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->g_type = g_type; -#line 29 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 13 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->g_dup_func = g_dup_func; -#line 29 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 13 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->g_destroy_func = g_destroy_func; -#line 30 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 14 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 14 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (self->priv->list); -#line 30 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 14 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->list = _tmp0_; -#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 15 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = cmp; -#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 15 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1__target = cmp_target; -#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 15 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->cmp = _tmp1_; -#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 15 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->cmp_target = _tmp1__target; -#line 29 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 13 "/home/jens/Source/shotwell/src/SortedList.vala" return self; -#line 249 "SortedList.c" +#line 135 "SortedList.c" } SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target) { -#line 29 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 13 "/home/jens/Source/shotwell/src/SortedList.vala" return sorted_list_construct (TYPE_SORTED_LIST, g_type, g_dup_func, g_destroy_func, cmp, cmp_target); -#line 256 "SortedList.c" +#line 142 "SortedList.c" } @@ -261,17 +147,17 @@ static GeeIterator* sorted_list_real_iterator (GeeIterable* base) { GeeIterator* result = NULL; GeeArrayList* _tmp0_; GeeIterator* _tmp1_; -#line 42 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 26 "/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" +#line 27 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 43 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 27 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 43 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 27 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp1_; -#line 43 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 27 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 275 "SortedList.c" +#line 161 "SortedList.c" } @@ -282,21 +168,21 @@ static gboolean sorted_list_real_foreach (GeeTraversable* base, GeeForallFunc f, GeeForallFunc _tmp1_; void* _tmp1__target; gboolean _tmp2_; -#line 46 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 30 "/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" +#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 47 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = f; -#line 47 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1__target = f_target; -#line 47 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = gee_abstract_collection_foreach (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_, _tmp1__target); -#line 47 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 47 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 300 "SortedList.c" +#line 186 "SortedList.c" } @@ -305,53 +191,53 @@ static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) { gboolean result = FALSE; Comparator _tmp0_; void* _tmp0__target; -#line 50 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 34 "/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" +#line 35 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->cmp; -#line 51 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 35 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0__target = self->priv->cmp_target; -#line 51 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 35 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp0_ == NULL) { -#line 317 "SortedList.c" +#line 203 "SortedList.c" GeeArrayList* _tmp1_; gconstpointer _tmp2_; -#line 52 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 36 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = self->priv->list; -#line 52 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 36 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = item; -#line 52 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 36 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 326 "SortedList.c" +#line 212 "SortedList.c" } else { GeeArrayList* _tmp3_; gconstpointer _tmp4_; gint _tmp5_; gconstpointer _tmp6_; -#line 54 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = self->priv->list; -#line 54 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = item; -#line 54 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = sorted_list_get_sorted_insert_pos (self, _tmp4_); -#line 54 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = item; -#line 54 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp5_, _tmp6_); -#line 342 "SortedList.c" +#line 228 "SortedList.c" } -#line 60 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 44 "/home/jens/Source/shotwell/src/SortedList.vala" result = TRUE; -#line 60 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 44 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 348 "SortedList.c" +#line 234 "SortedList.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 67 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 51 "/home/jens/Source/shotwell/src/SortedList.vala" return self ? g_object_ref (self) : NULL; -#line 355 "SortedList.c" +#line 241 "SortedList.c" } @@ -371,84 +257,84 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co GeeCollection* _tmp12_; gint _tmp13_; gint _tmp14_; -#line 63 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 47 "/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" +#line 47 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (GEE_IS_COLLECTION (collection), FALSE); -#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 48 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = collection; -#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 48 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = gee_collection_get_size (_tmp0_); -#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 48 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; -#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 48 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp2_ == 0) { -#line 65 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 49 "/home/jens/Source/shotwell/src/SortedList.vala" result = FALSE; -#line 65 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 49 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 391 "SortedList.c" +#line 277 "SortedList.c" } -#line 67 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 51 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = collection; -#line 67 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 51 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, GEE_TYPE_LIST) ? ((GeeList*) _tmp3_) : NULL); -#line 67 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 51 "/home/jens/Source/shotwell/src/SortedList.vala" as_list = _tmp4_; -#line 68 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 52 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = as_list; -#line 68 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 52 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp5_ != NULL) { -#line 403 "SortedList.c" +#line 289 "SortedList.c" GeeList* _tmp6_; gboolean _tmp7_; -#line 69 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 53 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = as_list; -#line 69 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 53 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = sorted_list_add_list (self, _tmp6_); -#line 69 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 53 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp7_; -#line 69 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 53 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (as_list); -#line 69 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 53 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 416 "SortedList.c" +#line 302 "SortedList.c" } -#line 71 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 55 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8_ = self->priv->cmp; -#line 71 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 55 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8__target = self->priv->cmp_target; -#line 71 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 55 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp8_ == NULL) { -#line 424 "SortedList.c" +#line 310 "SortedList.c" GeeArrayList* _tmp9_; GeeCollection* _tmp10_; gboolean _tmp11_; -#line 72 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 56 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp9_ = self->priv->list; -#line 72 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 56 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = collection; -#line 72 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 56 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = gee_array_list_add_all (_tmp9_, _tmp10_); -#line 72 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 56 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp11_; -#line 72 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 56 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (as_list); -#line 72 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 56 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 440 "SortedList.c" +#line 326 "SortedList.c" } -#line 74 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 58 "/home/jens/Source/shotwell/src/SortedList.vala" changed = FALSE; -#line 75 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 59 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp12_ = collection; -#line 75 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 59 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = gee_collection_get_size (_tmp12_); -#line 75 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 59 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = _tmp13_; -#line 75 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 59 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp14_ == 1) { -#line 452 "SortedList.c" +#line 338 "SortedList.c" GeeIterator* iter = NULL; GeeCollection* _tmp15_; GeeIterator* _tmp16_; @@ -460,39 +346,39 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co gconstpointer _tmp21_; gint _tmp22_; gconstpointer _tmp23_; -#line 76 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 60 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = collection; -#line 76 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 60 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 76 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 60 "/home/jens/Source/shotwell/src/SortedList.vala" iter = _tmp16_; -#line 77 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 61 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = iter; -#line 77 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 61 "/home/jens/Source/shotwell/src/SortedList.vala" gee_iterator_next (_tmp17_); -#line 78 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 62 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = iter; -#line 78 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 62 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp19_ = gee_iterator_get (_tmp18_); -#line 78 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 62 "/home/jens/Source/shotwell/src/SortedList.vala" item = _tmp19_; -#line 80 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp20_ = self->priv->list; -#line 80 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp21_ = item; -#line 80 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp22_ = sorted_list_get_sorted_insert_pos (self, _tmp21_); -#line 80 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23_ = item; -#line 80 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_, _tmp23_); -#line 81 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 65 "/home/jens/Source/shotwell/src/SortedList.vala" changed = TRUE; -#line 75 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 59 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); -#line 75 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 59 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (iter); -#line 496 "SortedList.c" +#line 382 "SortedList.c" } else { GeeList* items = NULL; GeeArrayList* _tmp24_; @@ -500,33 +386,33 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co GeeCollection* _tmp26_; GeeList* _tmp27_; gboolean _tmp28_; -#line 83 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 67 "/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" +#line 67 "/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" +#line 68 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp25_ = items; -#line 84 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 68 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp26_ = collection; -#line 84 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 68 "/home/jens/Source/shotwell/src/SortedList.vala" gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_); -#line 86 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 70 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp27_ = items; -#line 86 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 70 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp28_ = sorted_list_merge_sort (self, _tmp27_); -#line 86 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 70 "/home/jens/Source/shotwell/src/SortedList.vala" changed = _tmp28_; -#line 75 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 59 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (items); -#line 522 "SortedList.c" +#line 408 "SortedList.c" } -#line 92 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 76 "/home/jens/Source/shotwell/src/SortedList.vala" result = changed; -#line 92 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 76 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (as_list); -#line 92 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 76 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 530 "SortedList.c" +#line 416 "SortedList.c" } @@ -536,43 +422,43 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) { GeeList* _tmp0_; gint _tmp1_; gint _tmp2_; -#line 95 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 79 "/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" +#line 79 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (GEE_IS_LIST (items), FALSE); -#line 96 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 80 "/home/jens/Source/shotwell/src/SortedList.vala" added = FALSE; -#line 97 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 81 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = items; -#line 97 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 81 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 97 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 81 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; -#line 97 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 81 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp2_ == 0) { -#line 554 "SortedList.c" +#line 440 "SortedList.c" } else { Comparator _tmp3_; void* _tmp3__target; -#line 99 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 83 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = self->priv->cmp; -#line 99 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 83 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3__target = self->priv->cmp_target; -#line 99 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 83 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp3_ != NULL) { -#line 564 "SortedList.c" +#line 450 "SortedList.c" GeeList* _tmp4_; gint _tmp5_; gint _tmp6_; -#line 102 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 86 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = items; -#line 102 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 86 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 102 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 86 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = _tmp5_; -#line 102 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 86 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp6_ == 1) { -#line 576 "SortedList.c" +#line 462 "SortedList.c" GeeArrayList* _tmp7_; GeeList* _tmp8_; gpointer _tmp9_; @@ -581,75 +467,75 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) { GeeList* _tmp12_; gpointer _tmp13_; gpointer _tmp14_; -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = self->priv->list; -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8_ = items; -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp9_ = gee_list_get (_tmp8_, 0); -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = _tmp9_; -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = sorted_list_get_sorted_insert_pos (self, _tmp10_); -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp12_ = items; -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = gee_list_get (_tmp12_, 0); -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = _tmp13_; -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_, _tmp14_); -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" ((_tmp14_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp14_ = (self->priv->g_destroy_func (_tmp14_), NULL)); -#line 103 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" ((_tmp10_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp10_ = (self->priv->g_destroy_func (_tmp10_), NULL)); -#line 104 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 88 "/home/jens/Source/shotwell/src/SortedList.vala" added = TRUE; -#line 609 "SortedList.c" +#line 495 "SortedList.c" } else { GeeList* _tmp15_; gboolean _tmp16_; -#line 106 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 90 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = items; -#line 106 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 90 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16_ = sorted_list_merge_sort (self, _tmp15_); -#line 106 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 90 "/home/jens/Source/shotwell/src/SortedList.vala" added = _tmp16_; -#line 619 "SortedList.c" +#line 505 "SortedList.c" } } else { GeeArrayList* _tmp17_; GeeList* _tmp18_; gboolean _tmp19_; -#line 109 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 93 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = self->priv->list; -#line 109 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 93 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = items; -#line 109 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 93 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp19_ = gee_array_list_add_all (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 109 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 93 "/home/jens/Source/shotwell/src/SortedList.vala" added = _tmp19_; -#line 633 "SortedList.c" +#line 519 "SortedList.c" } } -#line 116 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 100 "/home/jens/Source/shotwell/src/SortedList.vala" result = added; -#line 116 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 100 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 640 "SortedList.c" +#line 526 "SortedList.c" } static void sorted_list_real_clear (GeeCollection* base) { SortedList * self; GeeArrayList* _tmp0_; -#line 119 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 103 "/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" +#line 104 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 120 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 104 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 653 "SortedList.c" +#line 539 "SortedList.c" } @@ -659,19 +545,19 @@ static gboolean sorted_list_real_contains (GeeCollection* base, gconstpointer it GeeArrayList* _tmp0_; gconstpointer _tmp1_; gboolean _tmp2_; -#line 123 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 107 "/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" +#line 108 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 124 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 108 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = item; -#line 124 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 108 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 124 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 108 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 124 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 108 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 675 "SortedList.c" +#line 561 "SortedList.c" } @@ -681,21 +567,21 @@ static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollectio GeeArrayList* _tmp0_; GeeCollection* _tmp1_; gboolean _tmp2_; -#line 127 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 111 "/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" +#line 111 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (GEE_IS_COLLECTION (collection), FALSE); -#line 128 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 112 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 128 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 112 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = collection; -#line 128 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 112 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 128 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 112 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 128 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 112 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 699 "SortedList.c" +#line 585 "SortedList.c" } @@ -705,19 +591,19 @@ static gboolean sorted_list_real_remove (GeeCollection* base, gconstpointer item GeeArrayList* _tmp0_; gconstpointer _tmp1_; gboolean _tmp2_; -#line 137 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 121 "/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" +#line 122 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 138 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 122 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = item; -#line 138 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 122 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 138 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 122 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 138 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 122 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 721 "SortedList.c" +#line 607 "SortedList.c" } @@ -727,21 +613,21 @@ static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection* GeeArrayList* _tmp0_; GeeCollection* _tmp1_; gboolean _tmp2_; -#line 141 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 125 "/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" +#line 125 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (GEE_IS_COLLECTION (collection), FALSE); -#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 126 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 126 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = collection; -#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 126 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 126 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 126 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 745 "SortedList.c" +#line 631 "SortedList.c" } @@ -751,21 +637,21 @@ static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection* GeeArrayList* _tmp0_; GeeCollection* _tmp1_; gboolean _tmp2_; -#line 145 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 129 "/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" +#line 129 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (GEE_IS_COLLECTION (collection), FALSE); -#line 146 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 130 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 146 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 130 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = collection; -#line 146 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 130 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = gee_collection_retain_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 146 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 130 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 146 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 130 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 769 "SortedList.c" +#line 655 "SortedList.c" } @@ -774,19 +660,19 @@ inline gint sorted_list_get_count (SortedList* self) { GeeArrayList* _tmp0_; gint _tmp1_; gint _tmp2_; -#line 153 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 137 "/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" +#line 138 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 138 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 138 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 138 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 138 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 790 "SortedList.c" +#line 676 "SortedList.c" } @@ -795,19 +681,19 @@ gpointer sorted_list_get_at (SortedList* self, gint index) { GeeArrayList* _tmp0_; gint _tmp1_; gpointer _tmp2_; -#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 141 "/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" +#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 158 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = index; -#line 158 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp1_); -#line 158 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 158 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 811 "SortedList.c" +#line 697 "SortedList.c" } @@ -820,32 +706,32 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G GeeArrayList* _tmp1_; gint _tmp2_; gint _tmp3_; -#line 161 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 145 "/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" +#line 146 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->cmp; -#line 162 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 146 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0__target = self->priv->cmp_target; -#line 162 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 146 "/home/jens/Source/shotwell/src/SortedList.vala" _vala_assert (_tmp0_ != NULL, "cmp != null"); -#line 164 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 148 "/home/jens/Source/shotwell/src/SortedList.vala" min = 0; -#line 165 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 149 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = self->priv->list; -#line 165 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 149 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 149 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = _tmp2_; -#line 165 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 149 "/home/jens/Source/shotwell/src/SortedList.vala" max = _tmp3_; -#line 842 "SortedList.c" +#line 728 "SortedList.c" { gboolean _tmp4_ = FALSE; -#line 166 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 150 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = TRUE; -#line 166 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 150 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 849 "SortedList.c" +#line 735 "SortedList.c" gint mid = 0; gint _tmp5_; gint _tmp6_; @@ -865,130 +751,130 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G gint64 _tmp21_; gint _tmp25_; gint _tmp26_; -#line 166 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 150 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp4_) { -#line 871 "SortedList.c" +#line 757 "SortedList.c" } -#line 166 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 150 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = FALSE; -#line 167 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 151 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = min; -#line 167 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 151 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = max; -#line 167 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 151 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = min; -#line 167 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 151 "/home/jens/Source/shotwell/src/SortedList.vala" mid = _tmp5_ + ((_tmp6_ - _tmp7_) / 2); -#line 168 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 152 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8_ = self->priv->list; -#line 168 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 152 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp9_ = mid; -#line 168 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 152 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_); -#line 168 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 152 "/home/jens/Source/shotwell/src/SortedList.vala" item = _tmp10_; -#line 170 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp12_ = equal_func; -#line 170 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp12_ != NULL) { -#line 895 "SortedList.c" +#line 781 "SortedList.c" GEqualFunc _tmp13_; gconstpointer _tmp14_; gconstpointer _tmp15_; gboolean _tmp16_; -#line 170 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = equal_func; -#line 170 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = item; -#line 170 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = search; -#line 170 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16_ = _tmp13_ (_tmp14_, _tmp15_); -#line 170 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = _tmp16_; -#line 910 "SortedList.c" +#line 796 "SortedList.c" } else { -#line 170 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = FALSE; -#line 914 "SortedList.c" +#line 800 "SortedList.c" } -#line 170 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp11_) { -#line 171 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 155 "/home/jens/Source/shotwell/src/SortedList.vala" result = mid; -#line 171 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 155 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); -#line 171 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 155 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 924 "SortedList.c" +#line 810 "SortedList.c" } -#line 173 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = self->priv->cmp; -#line 173 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17__target = self->priv->cmp_target; -#line 173 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = item; -#line 173 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp19_ = search; -#line 173 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp20_ = _tmp17_ (_tmp18_, _tmp19_, _tmp17__target); -#line 173 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" compare = _tmp20_; -#line 174 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 158 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp21_ = compare; -#line 174 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 158 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp21_ == ((gint64) 0)) { -#line 175 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 159 "/home/jens/Source/shotwell/src/SortedList.vala" result = mid; -#line 175 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 159 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); -#line 175 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 159 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 948 "SortedList.c" +#line 834 "SortedList.c" } else { gint64 _tmp22_; -#line 176 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 160 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp22_ = compare; -#line 176 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 160 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp22_ > ((gint64) 0)) { -#line 955 "SortedList.c" +#line 841 "SortedList.c" gint _tmp23_; -#line 177 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 161 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23_ = mid; -#line 177 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 161 "/home/jens/Source/shotwell/src/SortedList.vala" max = _tmp23_ - 1; -#line 961 "SortedList.c" +#line 847 "SortedList.c" } else { gint _tmp24_; -#line 179 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 163 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp24_ = mid; -#line 179 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 163 "/home/jens/Source/shotwell/src/SortedList.vala" min = _tmp24_ + 1; -#line 968 "SortedList.c" +#line 854 "SortedList.c" } } -#line 181 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 165 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp25_ = min; -#line 181 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 165 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp26_ = max; -#line 181 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 165 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp25_ > _tmp26_) { -#line 182 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 166 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); -#line 182 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 166 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 981 "SortedList.c" +#line 867 "SortedList.c" } -#line 166 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 150 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); -#line 985 "SortedList.c" +#line 871 "SortedList.c" } } -#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 169 "/home/jens/Source/shotwell/src/SortedList.vala" result = -1; -#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 169 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 992 "SortedList.c" +#line 878 "SortedList.c" } @@ -997,43 +883,43 @@ gint sorted_list_index_of (SortedList* self, gconstpointer search) { gint _tmp0_ = 0; Comparator _tmp1_; void* _tmp1__target; -#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 179 "/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" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = self->priv->cmp; -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1__target = self->priv->cmp_target; -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp1_ != NULL) { -#line 1009 "SortedList.c" +#line 895 "SortedList.c" gconstpointer _tmp2_; gint _tmp3_; -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = search; -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = sorted_list_binary_search (self, _tmp2_, NULL); -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = _tmp3_; -#line 1018 "SortedList.c" +#line 904 "SortedList.c" } else { gconstpointer _tmp4_; GEqualFunc _tmp5_; gint _tmp6_; -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = search; -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = g_direct_equal; -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = sorted_list_locate (self, _tmp4_, FALSE, _tmp5_); -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = _tmp6_; -#line 1031 "SortedList.c" +#line 917 "SortedList.c" } -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp0_; -#line 196 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1037 "SortedList.c" +#line 923 "SortedList.c" } @@ -1045,53 +931,53 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere gconstpointer _tmp18_; GEqualFunc _tmp19_; gint _tmp20_; -#line 200 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 184 "/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" +#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = self->priv->cmp; -#line 201 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1__target = self->priv->cmp_target; -#line 201 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp1_ == NULL) { -#line 201 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = TRUE; -#line 1059 "SortedList.c" +#line 945 "SortedList.c" } else { gboolean _tmp2_; -#line 201 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = altered; -#line 201 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = _tmp2_; -#line 1066 "SortedList.c" +#line 952 "SortedList.c" } -#line 201 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp0_) { -#line 1070 "SortedList.c" +#line 956 "SortedList.c" gint count = 0; GeeArrayList* _tmp3_; gint _tmp4_; gint _tmp5_; -#line 202 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 186 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = self->priv->list; -#line 202 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 186 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 186 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = _tmp4_; -#line 202 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 186 "/home/jens/Source/shotwell/src/SortedList.vala" count = _tmp5_; -#line 1083 "SortedList.c" +#line 969 "SortedList.c" { gint ctr = 0; -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" ctr = 0; -#line 1088 "SortedList.c" +#line 974 "SortedList.c" { gboolean _tmp6_ = FALSE; -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = TRUE; -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1095 "SortedList.c" +#line 981 "SortedList.c" gint _tmp8_; gint _tmp9_; GEqualFunc _tmp10_; @@ -1102,74 +988,74 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere gconstpointer _tmp15_; gboolean _tmp16_; gboolean _tmp17_; -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp6_) { -#line 1108 "SortedList.c" +#line 994 "SortedList.c" gint _tmp7_; -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = ctr; -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" ctr = _tmp7_ + 1; -#line 1114 "SortedList.c" +#line 1000 "SortedList.c" } -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = FALSE; -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8_ = ctr; -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp9_ = count; -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" if (!(_tmp8_ < _tmp9_)) { -#line 203 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 187 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1126 "SortedList.c" +#line 1012 "SortedList.c" } -#line 204 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = equal_func; -#line 204 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = self->priv->list; -#line 204 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp12_ = ctr; -#line 204 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_); -#line 204 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = _tmp13_; -#line 204 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = search; -#line 204 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16_ = _tmp10_ (_tmp14_, _tmp15_); -#line 204 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = _tmp16_; -#line 204 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" ((_tmp14_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp14_ = (self->priv->g_destroy_func (_tmp14_), NULL)); -#line 204 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp17_) { -#line 205 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 189 "/home/jens/Source/shotwell/src/SortedList.vala" result = ctr; -#line 205 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 189 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1152 "SortedList.c" +#line 1038 "SortedList.c" } } } } -#line 208 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 192 "/home/jens/Source/shotwell/src/SortedList.vala" result = -1; -#line 208 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 192 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1161 "SortedList.c" +#line 1047 "SortedList.c" } -#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = search; -#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp19_ = equal_func; -#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp20_ = sorted_list_binary_search (self, _tmp18_, _tmp19_); -#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp20_; -#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1173 "SortedList.c" +#line 1059 "SortedList.c" } @@ -1178,19 +1064,19 @@ gpointer sorted_list_remove_at (SortedList* self, gint index) { GeeArrayList* _tmp0_; gint _tmp1_; gpointer _tmp2_; -#line 226 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 210 "/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" +#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 227 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = index; -#line 227 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp1_); -#line 227 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 227 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1194 "SortedList.c" +#line 1080 "SortedList.c" } @@ -1202,46 +1088,46 @@ static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_len gpointer* _tmp2_; gpointer* _tmp3_; gint _tmp3__length1; -#line 230 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 214 "/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" +#line 215 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 231 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 215 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp1_); -#line 231 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 215 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = _tmp2_; -#line 231 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 215 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3__length1 = _tmp1_; -#line 231 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 215 "/home/jens/Source/shotwell/src/SortedList.vala" if (result_length1) { -#line 231 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 215 "/home/jens/Source/shotwell/src/SortedList.vala" *result_length1 = _tmp3__length1; -#line 1220 "SortedList.c" +#line 1106 "SortedList.c" } -#line 231 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 215 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp3_; -#line 231 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 215 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1226 "SortedList.c" +#line 1112 "SortedList.c" } void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_target) { Comparator _tmp0_; void* _tmp0__target; -#line 234 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 218 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); -#line 235 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 219 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = new_cmp; -#line 235 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 219 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0__target = new_cmp_target; -#line 235 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 219 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->cmp = _tmp0_; -#line 235 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 219 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->cmp_target = _tmp0__target; -#line 237 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 221 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_merge_sort (self, NULL); -#line 1245 "SortedList.c" +#line 1131 "SortedList.c" } @@ -1259,45 +1145,45 @@ gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) { gint _tmp7_; gint _tmp8_; gint _tmp9_; -#line 245 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 229 "/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" +#line 230 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = item; -#line 246 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 230 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = g_direct_equal; -#line 246 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 230 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = sorted_list_locate (self, _tmp0_, TRUE, _tmp1_); -#line 246 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 230 "/home/jens/Source/shotwell/src/SortedList.vala" index = _tmp2_; -#line 247 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 231 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = index; -#line 247 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 231 "/home/jens/Source/shotwell/src/SortedList.vala" _vala_assert (_tmp3_ >= 0, "index >= 0"); -#line 249 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 233 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = item; -#line 249 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 233 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = sorted_list_get_sorted_insert_pos (self, _tmp4_); -#line 249 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 233 "/home/jens/Source/shotwell/src/SortedList.vala" new_index = _tmp5_; -#line 251 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 235 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = index; -#line 251 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 235 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = new_index; -#line 251 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 235 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp6_ == _tmp7_) { -#line 252 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 236 "/home/jens/Source/shotwell/src/SortedList.vala" result = FALSE; -#line 252 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 236 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1293 "SortedList.c" +#line 1179 "SortedList.c" } -#line 256 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 240 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8_ = new_index; -#line 256 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 240 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp9_ = index; -#line 256 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 240 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp8_ > _tmp9_) { -#line 1301 "SortedList.c" +#line 1187 "SortedList.c" GeeArrayList* _tmp10_; gint _tmp11_; gconstpointer _tmp12_; @@ -1307,31 +1193,31 @@ gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) { gpointer _tmp15_; gconstpointer _tmp16_; gconstpointer _tmp17_; -#line 257 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 241 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = self->priv->list; -#line 257 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 241 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = new_index; -#line 257 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 241 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp12_ = item; -#line 257 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 241 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_, _tmp12_); -#line 258 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 242 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = self->priv->list; -#line 258 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 242 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = index; -#line 258 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 242 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_); -#line 258 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 242 "/home/jens/Source/shotwell/src/SortedList.vala" removed_item = _tmp15_; -#line 259 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 243 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16_ = item; -#line 259 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 243 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = removed_item; -#line 259 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 243 "/home/jens/Source/shotwell/src/SortedList.vala" _vala_assert (_tmp16_ == _tmp17_, "item == removed_item"); -#line 256 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 240 "/home/jens/Source/shotwell/src/SortedList.vala" ((removed_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (removed_item = (self->priv->g_destroy_func (removed_item), NULL)); -#line 1335 "SortedList.c" +#line 1221 "SortedList.c" } else { gpointer removed_item = NULL; GeeArrayList* _tmp18_; @@ -1342,37 +1228,37 @@ gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) { GeeArrayList* _tmp23_; gint _tmp24_; gconstpointer _tmp25_; -#line 261 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 245 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = self->priv->list; -#line 261 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 245 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp19_ = index; -#line 261 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 245 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp20_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp19_); -#line 261 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 245 "/home/jens/Source/shotwell/src/SortedList.vala" removed_item = _tmp20_; -#line 262 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 246 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp21_ = item; -#line 262 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 246 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp22_ = removed_item; -#line 262 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 246 "/home/jens/Source/shotwell/src/SortedList.vala" _vala_assert (_tmp21_ == _tmp22_, "item == removed_item"); -#line 263 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 247 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23_ = self->priv->list; -#line 263 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 247 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp24_ = new_index; -#line 263 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 247 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp25_ = item; -#line 263 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 247 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp24_, _tmp25_); -#line 256 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 240 "/home/jens/Source/shotwell/src/SortedList.vala" ((removed_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (removed_item = (self->priv->g_destroy_func (removed_item), NULL)); -#line 1370 "SortedList.c" +#line 1256 "SortedList.c" } -#line 270 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 254 "/home/jens/Source/shotwell/src/SortedList.vala" result = TRUE; -#line 270 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 254 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1376 "SortedList.c" +#line 1262 "SortedList.c" } @@ -1383,26 +1269,26 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i GeeArrayList* _tmp0_; gint _tmp1_; gint _tmp2_; -#line 273 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 257 "/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" +#line 258 "/home/jens/Source/shotwell/src/SortedList.vala" low = 0; -#line 275 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 259 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 275 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 259 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 259 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; -#line 275 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 259 "/home/jens/Source/shotwell/src/SortedList.vala" high = _tmp2_; -#line 1399 "SortedList.c" +#line 1285 "SortedList.c" { gboolean _tmp3_ = FALSE; -#line 276 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 260 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = TRUE; -#line 276 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 260 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1406 "SortedList.c" +#line 1292 "SortedList.c" gint _tmp4_; gint _tmp5_; gint mid = 0; @@ -1422,47 +1308,47 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i gconstpointer _tmp26_; gint64 _tmp27_; gint64 _tmp28_; -#line 276 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 260 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp3_) { -#line 1428 "SortedList.c" +#line 1314 "SortedList.c" } -#line 276 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 260 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = FALSE; -#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 261 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = low; -#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 261 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = high; -#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 261 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp4_ == _tmp5_) { -#line 278 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 262 "/home/jens/Source/shotwell/src/SortedList.vala" result = low; -#line 278 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 262 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1442 "SortedList.c" +#line 1328 "SortedList.c" } -#line 280 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 264 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = low; -#line 280 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 264 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = high; -#line 280 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 264 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8_ = low; -#line 280 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 264 "/home/jens/Source/shotwell/src/SortedList.vala" mid = _tmp6_ + ((_tmp7_ - _tmp8_) / 2); -#line 284 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 268 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp9_ = self->priv->list; -#line 284 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 268 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = mid; -#line 284 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 268 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp10_); -#line 284 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 268 "/home/jens/Source/shotwell/src/SortedList.vala" cmp_item = _tmp11_; -#line 285 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 269 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp12_ = item; -#line 285 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 269 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = cmp_item; -#line 285 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 269 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp12_ == _tmp13_) { -#line 1466 "SortedList.c" +#line 1352 "SortedList.c" gint _tmp14_; GeeArrayList* _tmp15_; gint _tmp16_; @@ -1470,95 +1356,95 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i GeeArrayList* _tmp21_; gint _tmp22_; gpointer _tmp23_; -#line 287 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 271 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = mid; -#line 287 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 271 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = self->priv->list; -#line 287 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 271 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 271 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = _tmp16_; -#line 287 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 271 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp14_ >= (_tmp17_ - 1)) { -#line 1484 "SortedList.c" +#line 1370 "SortedList.c" GeeArrayList* _tmp18_; gint _tmp19_; gint _tmp20_; -#line 288 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 272 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = self->priv->list; -#line 288 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 272 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 272 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp20_ = _tmp19_; -#line 288 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 272 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp20_; -#line 288 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 272 "/home/jens/Source/shotwell/src/SortedList.vala" ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); -#line 288 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 272 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1500 "SortedList.c" +#line 1386 "SortedList.c" } -#line 290 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 274 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp21_ = self->priv->list; -#line 290 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 274 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp22_ = mid; -#line 290 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 274 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_ + 1); -#line 290 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 274 "/home/jens/Source/shotwell/src/SortedList.vala" ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); -#line 290 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 274 "/home/jens/Source/shotwell/src/SortedList.vala" cmp_item = _tmp23_; -#line 1512 "SortedList.c" +#line 1398 "SortedList.c" } -#line 293 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp24_ = self->priv->cmp; -#line 293 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp24__target = self->priv->cmp_target; -#line 293 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp25_ = item; -#line 293 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp26_ = cmp_item; -#line 293 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp27_ = _tmp24_ (_tmp25_, _tmp26_, _tmp24__target); -#line 293 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" _result_ = _tmp27_; -#line 294 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 278 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp28_ = _result_; -#line 294 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 278 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp28_ < ((gint64) 0)) { -#line 1530 "SortedList.c" +#line 1416 "SortedList.c" gint _tmp29_; -#line 295 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 279 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp29_ = mid; -#line 295 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 279 "/home/jens/Source/shotwell/src/SortedList.vala" high = _tmp29_; -#line 1536 "SortedList.c" +#line 1422 "SortedList.c" } else { gint64 _tmp30_; -#line 296 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 280 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp30_ = _result_; -#line 296 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 280 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp30_ > ((gint64) 0)) { -#line 1543 "SortedList.c" +#line 1429 "SortedList.c" gint _tmp31_; -#line 297 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 281 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp31_ = mid; -#line 297 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 281 "/home/jens/Source/shotwell/src/SortedList.vala" low = _tmp31_ + 1; -#line 1549 "SortedList.c" +#line 1435 "SortedList.c" } else { -#line 299 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 283 "/home/jens/Source/shotwell/src/SortedList.vala" result = mid; -#line 299 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 283 "/home/jens/Source/shotwell/src/SortedList.vala" ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); -#line 299 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 283 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1557 "SortedList.c" +#line 1443 "SortedList.c" } } -#line 276 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 260 "/home/jens/Source/shotwell/src/SortedList.vala" ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); -#line 1562 "SortedList.c" +#line 1448 "SortedList.c" } } } @@ -1572,27 +1458,27 @@ SortedList* sorted_list_copy (SortedList* self) { SortedList* _tmp1_; GeeArrayList* _tmp2_; GeeArrayList* _tmp3_; -#line 303 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 287 "/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" +#line 288 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->cmp; -#line 304 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 288 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0__target = self->priv->cmp_target; -#line 304 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 288 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 288 "/home/jens/Source/shotwell/src/SortedList.vala" copy = _tmp1_; -#line 306 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 290 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = copy->priv->list; -#line 306 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 290 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = self->priv->list; -#line 306 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 290 "/home/jens/Source/shotwell/src/SortedList.vala" gee_array_list_add_all (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 308 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 292 "/home/jens/Source/shotwell/src/SortedList.vala" result = copy; -#line 308 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 292 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1596 "SortedList.c" +#line 1482 "SortedList.c" } @@ -1627,79 +1513,79 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { gpointer* _tmp38_; gint _tmp38__length1; gint _tmp39_; -#line 329 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 313 "/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" +#line 313 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail ((add == NULL) || GEE_IS_LIST (add), FALSE); -#line 330 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 314 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->cmp; -#line 330 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 314 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0__target = self->priv->cmp_target; -#line 330 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 314 "/home/jens/Source/shotwell/src/SortedList.vala" _vala_assert (_tmp0_ != NULL, "cmp != null"); -#line 332 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 316 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = self->priv->list; -#line 332 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 316 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 316 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = _tmp2_; -#line 332 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 316 "/home/jens/Source/shotwell/src/SortedList.vala" list_count = _tmp3_; -#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = add; -#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp5_ != NULL) { -#line 1653 "SortedList.c" +#line 1539 "SortedList.c" GeeList* _tmp6_; gint _tmp7_; gint _tmp8_; -#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = add; -#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8_ = _tmp7_; -#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = _tmp8_; -#line 1665 "SortedList.c" +#line 1551 "SortedList.c" } else { -#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = 0; -#line 1669 "SortedList.c" +#line 1555 "SortedList.c" } -#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" add_count = _tmp4_; -#line 335 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 319 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp9_ = list_count; -#line 335 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 319 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = add_count; -#line 335 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 319 "/home/jens/Source/shotwell/src/SortedList.vala" count = _tmp9_ + _tmp10_; -#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 320 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = count; -#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 320 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp11_ == 0) { -#line 337 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 321 "/home/jens/Source/shotwell/src/SortedList.vala" result = FALSE; -#line 337 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 321 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1687 "SortedList.c" +#line 1573 "SortedList.c" } -#line 341 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 325 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp12_ = count; -#line 341 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 325 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = g_new0 (gpointer, _tmp12_); -#line 341 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 325 "/home/jens/Source/shotwell/src/SortedList.vala" array = _tmp13_; -#line 341 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 325 "/home/jens/Source/shotwell/src/SortedList.vala" array_length1 = _tmp12_; -#line 341 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 325 "/home/jens/Source/shotwell/src/SortedList.vala" _array_size_ = array_length1; -#line 342 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 326 "/home/jens/Source/shotwell/src/SortedList.vala" offset = 0; -#line 344 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 328 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1703 "SortedList.c" +#line 1589 "SortedList.c" gint _tmp14_; gint _tmp15_; gpointer* _tmp16_; @@ -1710,51 +1596,51 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { gpointer _tmp20_; gpointer _tmp21_; gint _tmp22_; -#line 344 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 328 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = offset; -#line 344 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 328 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = list_count; -#line 344 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 328 "/home/jens/Source/shotwell/src/SortedList.vala" if (!(_tmp14_ < _tmp15_)) { -#line 344 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 328 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1722 "SortedList.c" +#line 1608 "SortedList.c" } -#line 345 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 329 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16_ = array; -#line 345 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 329 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16__length1 = array_length1; -#line 345 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 329 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = offset; -#line 345 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 329 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = self->priv->list; -#line 345 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 329 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp19_ = offset; -#line 345 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 329 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp20_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp19_); -#line 345 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 329 "/home/jens/Source/shotwell/src/SortedList.vala" ((_tmp16_[_tmp17_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp16_[_tmp17_] = (self->priv->g_destroy_func (_tmp16_[_tmp17_]), NULL)); -#line 345 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 329 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16_[_tmp17_] = _tmp20_; -#line 345 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 329 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp21_ = _tmp16_[_tmp17_]; -#line 346 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 330 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp22_ = offset; -#line 346 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 330 "/home/jens/Source/shotwell/src/SortedList.vala" offset = _tmp22_ + 1; -#line 1746 "SortedList.c" +#line 1632 "SortedList.c" } -#line 349 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23_ = add; -#line 349 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp23_ != NULL) { -#line 1752 "SortedList.c" +#line 1638 "SortedList.c" gint add_ctr = 0; -#line 350 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 334 "/home/jens/Source/shotwell/src/SortedList.vala" add_ctr = 0; -#line 351 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 335 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1758 "SortedList.c" +#line 1644 "SortedList.c" gint _tmp24_; gint _tmp25_; gpointer* _tmp26_; @@ -1765,72 +1651,72 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { gpointer _tmp30_; gpointer _tmp31_; gint _tmp32_; -#line 351 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 335 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp24_ = offset; -#line 351 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 335 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp25_ = count; -#line 351 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 335 "/home/jens/Source/shotwell/src/SortedList.vala" if (!(_tmp24_ < _tmp25_)) { -#line 351 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 335 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1777 "SortedList.c" +#line 1663 "SortedList.c" } -#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp26_ = array; -#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp26__length1 = array_length1; -#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp27_ = offset; -#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp28_ = add; -#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp29_ = add_ctr; -#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" add_ctr = _tmp29_ + 1; -#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp30_ = gee_list_get (_tmp28_, _tmp29_); -#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" ((_tmp26_[_tmp27_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp26_[_tmp27_] = (self->priv->g_destroy_func (_tmp26_[_tmp27_]), NULL)); -#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp26_[_tmp27_] = _tmp30_; -#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp31_ = _tmp26_[_tmp27_]; -#line 353 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 337 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp32_ = offset; -#line 353 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 337 "/home/jens/Source/shotwell/src/SortedList.vala" offset = _tmp32_ + 1; -#line 1803 "SortedList.c" +#line 1689 "SortedList.c" } } -#line 357 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 341 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp33_ = offset; -#line 357 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 341 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp34_ = count; -#line 357 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 341 "/home/jens/Source/shotwell/src/SortedList.vala" _vala_assert (_tmp33_ == _tmp34_, "offset == count"); -#line 359 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 343 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp35_ = array; -#line 359 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 343 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp35__length1 = array_length1; -#line 359 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 343 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp36_ = count; -#line 359 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 343 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp37_ = g_new0 (gpointer, _tmp36_); -#line 359 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 343 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp38_ = _tmp37_; -#line 359 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 343 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp38__length1 = _tmp36_; -#line 359 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 343 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp39_ = count; -#line 359 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 343 "/home/jens/Source/shotwell/src/SortedList.vala" _sorted_list_merge_sort (self, _tmp35_, _tmp35__length1, _tmp38_, _tmp36_, 0, _tmp39_ - 1); -#line 359 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 343 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp38_ = (_vala_array_free (_tmp38_, _tmp38__length1, (GDestroyNotify) self->priv->g_destroy_func), NULL); -#line 361 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 345 "/home/jens/Source/shotwell/src/SortedList.vala" offset = 0; -#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 346 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1834 "SortedList.c" +#line 1720 "SortedList.c" gint _tmp40_; gint _tmp41_; GeeArrayList* _tmp42_; @@ -1840,39 +1726,39 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { gint _tmp45_; gconstpointer _tmp46_; gint _tmp47_; -#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 346 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp40_ = offset; -#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 346 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp41_ = list_count; -#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 346 "/home/jens/Source/shotwell/src/SortedList.vala" if (!(_tmp40_ < _tmp41_)) { -#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 346 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1852 "SortedList.c" +#line 1738 "SortedList.c" } -#line 363 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 347 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp42_ = self->priv->list; -#line 363 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 347 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp43_ = offset; -#line 363 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 347 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp44_ = array; -#line 363 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 347 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp44__length1 = array_length1; -#line 363 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 347 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp45_ = offset; -#line 363 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 347 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp46_ = _tmp44_[_tmp45_]; -#line 363 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 347 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_list_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp43_, _tmp46_); -#line 364 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 348 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp47_ = offset; -#line 364 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 348 "/home/jens/Source/shotwell/src/SortedList.vala" offset = _tmp47_ + 1; -#line 1872 "SortedList.c" +#line 1758 "SortedList.c" } -#line 367 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 351 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1876 "SortedList.c" +#line 1762 "SortedList.c" gint _tmp48_; gint _tmp49_; GeeArrayList* _tmp50_; @@ -1882,43 +1768,43 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { gint _tmp53_; gconstpointer _tmp54_; gint _tmp55_; -#line 367 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 351 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp48_ = offset; -#line 367 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 351 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp49_ = count; -#line 367 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 351 "/home/jens/Source/shotwell/src/SortedList.vala" if (!(_tmp48_ < _tmp49_)) { -#line 367 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 351 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1894 "SortedList.c" +#line 1780 "SortedList.c" } -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp50_ = self->priv->list; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp51_ = offset; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp52_ = array; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp52__length1 = array_length1; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp53_ = offset; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp54_ = _tmp52_[_tmp53_]; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 352 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp51_, _tmp54_); -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 353 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp55_ = offset; -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 353 "/home/jens/Source/shotwell/src/SortedList.vala" offset = _tmp55_ + 1; -#line 1914 "SortedList.c" +#line 1800 "SortedList.c" } -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 356 "/home/jens/Source/shotwell/src/SortedList.vala" result = TRUE; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 356 "/home/jens/Source/shotwell/src/SortedList.vala" array = (_vala_array_free (array, array_length1, (GDestroyNotify) self->priv->g_destroy_func), NULL); -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 356 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1922 "SortedList.c" +#line 1808 "SortedList.c" } @@ -1955,87 +1841,87 @@ static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int arra gint _tmp20_; gconstpointer _tmp21_; gint64 _tmp22_; -#line 375 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 359 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); -#line 376 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 360 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = start_index; -#line 376 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 360 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = end_index; -#line 376 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 360 "/home/jens/Source/shotwell/src/SortedList.vala" _vala_assert (_tmp0_ <= _tmp1_, "start_index <= end_index"); -#line 378 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = end_index; -#line 378 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = start_index; -#line 378 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" count = (_tmp2_ - _tmp3_) + 1; -#line 379 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 363 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = count; -#line 379 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 363 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp4_ <= 1) { -#line 380 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 364 "/home/jens/Source/shotwell/src/SortedList.vala" return; -#line 1979 "SortedList.c" +#line 1865 "SortedList.c" } -#line 382 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 366 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = start_index; -#line 382 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 366 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = count; -#line 382 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 366 "/home/jens/Source/shotwell/src/SortedList.vala" middle_index = _tmp5_ + (_tmp6_ / 2); -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = array; -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7__length1 = array_length1; -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8_ = scratch; -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8__length1 = scratch_length1; -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp9_ = start_index; -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = middle_index; -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" _sorted_list_merge_sort (self, _tmp7_, _tmp7__length1, _tmp8_, _tmp8__length1, _tmp9_, _tmp10_ - 1); -#line 385 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = array; -#line 385 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11__length1 = array_length1; -#line 385 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp12_ = scratch; -#line 385 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp12__length1 = scratch_length1; -#line 385 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = middle_index; -#line 385 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = end_index; -#line 385 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" _sorted_list_merge_sort (self, _tmp11_, _tmp11__length1, _tmp12_, _tmp12__length1, _tmp13_, _tmp14_); -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = self->priv->cmp; -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15__target = self->priv->cmp_target; -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16_ = array; -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16__length1 = array_length1; -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = middle_index; -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = _tmp16_[_tmp17_ - 1]; -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp19_ = array; -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp19__length1 = array_length1; -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp20_ = middle_index; -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp21_ = _tmp19_[_tmp20_]; -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp22_ = _tmp15_ (_tmp18_, _tmp21_, _tmp15__target); -#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp22_ > ((gint64) 0)) { -#line 2039 "SortedList.c" +#line 1925 "SortedList.c" gpointer* _tmp23_; gint _tmp23__length1; gpointer* _tmp24_; @@ -2043,23 +1929,23 @@ static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int arra gint _tmp25_; gint _tmp26_; gint _tmp27_; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23_ = array; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23__length1 = array_length1; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp24_ = scratch; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp24__length1 = scratch_length1; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp25_ = start_index; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp26_ = middle_index; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp27_ = end_index; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_merge (self, _tmp23_, _tmp23__length1, _tmp24_, _tmp24__length1, _tmp25_, _tmp26_, _tmp27_); -#line 2063 "SortedList.c" +#line 1949 "SortedList.c" } } @@ -2084,49 +1970,49 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng gint scratch_index = 0; gint _tmp57_; gint _tmp58_; -#line 391 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 375 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); -#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 376 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = start_index; -#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 376 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = end_index; -#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 376 "/home/jens/Source/shotwell/src/SortedList.vala" _vala_assert (_tmp0_ < _tmp1_, "start_index < end_index"); -#line 394 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 378 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = end_index; -#line 394 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 378 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = start_index; -#line 394 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 378 "/home/jens/Source/shotwell/src/SortedList.vala" count = (_tmp2_ - _tmp3_) + 1; -#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 379 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = start_index; -#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 379 "/home/jens/Source/shotwell/src/SortedList.vala" left_start = _tmp4_; -#line 396 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 380 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp5_ = middle_index; -#line 396 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 380 "/home/jens/Source/shotwell/src/SortedList.vala" left_end = _tmp5_ - 1; -#line 397 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 381 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = middle_index; -#line 397 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 381 "/home/jens/Source/shotwell/src/SortedList.vala" right_start = _tmp6_; -#line 398 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 382 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp7_ = end_index; -#line 398 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 382 "/home/jens/Source/shotwell/src/SortedList.vala" right_end = _tmp7_; -#line 400 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8_ = scratch; -#line 400 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp8__length1 = scratch_length1; -#line 400 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp9_ = count; -#line 400 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" _vala_assert (_tmp8__length1 >= _tmp9_, "scratch.length >= count"); -#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 385 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = 0; -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2130 "SortedList.c" +#line 2016 "SortedList.c" gboolean _tmp10_ = FALSE; gint _tmp11_; gint _tmp12_; @@ -2147,70 +2033,70 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng gconstpointer _tmp24_; gconstpointer _tmp25_; gint64 _tmp26_; -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = left_start; -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp12_ = left_end; -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp11_ <= _tmp12_) { -#line 2157 "SortedList.c" +#line 2043 "SortedList.c" gint _tmp13_; gint _tmp14_; -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp13_ = right_start; -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp14_ = right_end; -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = _tmp13_ <= _tmp14_; -#line 2166 "SortedList.c" +#line 2052 "SortedList.c" } else { -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp10_ = FALSE; -#line 2170 "SortedList.c" +#line 2056 "SortedList.c" } -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp10_) { -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2176 "SortedList.c" +#line 2062 "SortedList.c" } -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15_ = array; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp15__length1 = array_length1; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp16_ = left_start; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp17_ = _tmp15_[_tmp16_]; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp18_ = ((_tmp17_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp17_) : ((gpointer) _tmp17_); -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" left = _tmp18_; -#line 405 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 389 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp19_ = array; -#line 405 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 389 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp19__length1 = array_length1; -#line 405 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 389 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp20_ = right_start; -#line 405 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 389 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp21_ = _tmp19_[_tmp20_]; -#line 405 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 389 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp22_ = ((_tmp21_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp21_) : ((gpointer) _tmp21_); -#line 405 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 389 "/home/jens/Source/shotwell/src/SortedList.vala" right = _tmp22_; -#line 407 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 391 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23_ = self->priv->cmp; -#line 407 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 391 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp23__target = self->priv->cmp_target; -#line 407 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 391 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp24_ = left; -#line 407 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 391 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp25_ = right; -#line 407 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 391 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp26_ = _tmp23_ (_tmp24_, _tmp25_, _tmp23__target); -#line 407 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 391 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp26_ <= ((gint64) 0)) { -#line 2214 "SortedList.c" +#line 2100 "SortedList.c" gpointer* _tmp27_; gint _tmp27__length1; gint _tmp28_; @@ -2218,29 +2104,29 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng gpointer _tmp30_; gpointer _tmp31_; gint _tmp32_; -#line 408 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp27_ = scratch; -#line 408 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp27__length1 = scratch_length1; -#line 408 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp28_ = scratch_index; -#line 408 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = _tmp28_ + 1; -#line 408 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp29_ = left; -#line 408 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp30_ = ((_tmp29_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp29_) : ((gpointer) _tmp29_); -#line 408 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" ((_tmp27_[_tmp28_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp27_[_tmp28_] = (self->priv->g_destroy_func (_tmp27_[_tmp28_]), NULL)); -#line 408 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp27_[_tmp28_] = _tmp30_; -#line 408 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp31_ = _tmp27_[_tmp28_]; -#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 393 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp32_ = left_start; -#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 393 "/home/jens/Source/shotwell/src/SortedList.vala" left_start = _tmp32_ + 1; -#line 2244 "SortedList.c" +#line 2130 "SortedList.c" } else { gpointer* _tmp33_; gint _tmp33__length1; @@ -2249,39 +2135,39 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng gpointer _tmp36_; gpointer _tmp37_; gint _tmp38_; -#line 411 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp33_ = scratch; -#line 411 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp33__length1 = scratch_length1; -#line 411 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp34_ = scratch_index; -#line 411 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = _tmp34_ + 1; -#line 411 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp35_ = right; -#line 411 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp36_ = ((_tmp35_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp35_) : ((gpointer) _tmp35_); -#line 411 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" ((_tmp33_[_tmp34_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp33_[_tmp34_] = (self->priv->g_destroy_func (_tmp33_[_tmp34_]), NULL)); -#line 411 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp33_[_tmp34_] = _tmp36_; -#line 411 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp37_ = _tmp33_[_tmp34_]; -#line 412 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 396 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp38_ = right_start; -#line 412 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 396 "/home/jens/Source/shotwell/src/SortedList.vala" right_start = _tmp38_ + 1; -#line 2275 "SortedList.c" +#line 2161 "SortedList.c" } -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" ((right == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (right = (self->priv->g_destroy_func (right), NULL)); -#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 387 "/home/jens/Source/shotwell/src/SortedList.vala" ((left == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (left = (self->priv->g_destroy_func (left), NULL)); -#line 2281 "SortedList.c" +#line 2167 "SortedList.c" } -#line 416 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 400 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2285 "SortedList.c" +#line 2171 "SortedList.c" gint _tmp39_; gint _tmp40_; gpointer* _tmp41_; @@ -2293,47 +2179,47 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng gconstpointer _tmp45_; gpointer _tmp46_; gpointer _tmp47_; -#line 416 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 400 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp39_ = left_start; -#line 416 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 400 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp40_ = left_end; -#line 416 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 400 "/home/jens/Source/shotwell/src/SortedList.vala" if (!(_tmp39_ <= _tmp40_)) { -#line 416 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 400 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2305 "SortedList.c" +#line 2191 "SortedList.c" } -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp41_ = scratch; -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp41__length1 = scratch_length1; -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp42_ = scratch_index; -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = _tmp42_ + 1; -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp43_ = array; -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp43__length1 = array_length1; -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp44_ = left_start; -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" left_start = _tmp44_ + 1; -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp45_ = _tmp43_[_tmp44_]; -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp46_ = ((_tmp45_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp45_) : ((gpointer) _tmp45_); -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" ((_tmp41_[_tmp42_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp41_[_tmp42_] = (self->priv->g_destroy_func (_tmp41_[_tmp42_]), NULL)); -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp41_[_tmp42_] = _tmp46_; -#line 417 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp47_ = _tmp41_[_tmp42_]; -#line 2333 "SortedList.c" +#line 2219 "SortedList.c" } -#line 419 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2337 "SortedList.c" +#line 2223 "SortedList.c" gint _tmp48_; gint _tmp49_; gpointer* _tmp50_; @@ -2345,68 +2231,68 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng gconstpointer _tmp54_; gpointer _tmp55_; gpointer _tmp56_; -#line 419 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp48_ = right_start; -#line 419 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp49_ = right_end; -#line 419 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" if (!(_tmp48_ <= _tmp49_)) { -#line 419 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 403 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2357 "SortedList.c" +#line 2243 "SortedList.c" } -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp50_ = scratch; -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp50__length1 = scratch_length1; -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp51_ = scratch_index; -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = _tmp51_ + 1; -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp52_ = array; -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp52__length1 = array_length1; -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp53_ = right_start; -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" right_start = _tmp53_ + 1; -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp54_ = _tmp52_[_tmp53_]; -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp55_ = ((_tmp54_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp54_) : ((gpointer) _tmp54_); -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" ((_tmp50_[_tmp51_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp50_[_tmp51_] = (self->priv->g_destroy_func (_tmp50_[_tmp51_]), NULL)); -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp50_[_tmp51_] = _tmp55_; -#line 420 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp56_ = _tmp50_[_tmp51_]; -#line 2385 "SortedList.c" +#line 2271 "SortedList.c" } -#line 422 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 406 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp57_ = scratch_index; -#line 422 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 406 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp58_ = count; -#line 422 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 406 "/home/jens/Source/shotwell/src/SortedList.vala" _vala_assert (_tmp57_ == _tmp58_, "scratch_index == count"); -#line 424 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 408 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = 0; -#line 2395 "SortedList.c" +#line 2281 "SortedList.c" { gint list_index = 0; gint _tmp59_; -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp59_ = start_index; -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" list_index = _tmp59_; -#line 2403 "SortedList.c" +#line 2289 "SortedList.c" { gboolean _tmp60_ = FALSE; -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp60_ = TRUE; -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2410 "SortedList.c" +#line 2296 "SortedList.c" gint _tmp62_; gint _tmp63_; gpointer* _tmp64_; @@ -2418,53 +2304,53 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng gconstpointer _tmp68_; gpointer _tmp69_; gpointer _tmp70_; -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp60_) { -#line 2424 "SortedList.c" +#line 2310 "SortedList.c" gint _tmp61_; -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp61_ = list_index; -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" list_index = _tmp61_ + 1; -#line 2430 "SortedList.c" +#line 2316 "SortedList.c" } -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp60_ = FALSE; -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp62_ = list_index; -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp63_ = end_index; -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" if (!(_tmp62_ <= _tmp63_)) { -#line 425 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2442 "SortedList.c" +#line 2328 "SortedList.c" } -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp64_ = array; -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp64__length1 = array_length1; -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp65_ = list_index; -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp66_ = scratch; -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp66__length1 = scratch_length1; -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp67_ = scratch_index; -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = _tmp67_ + 1; -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp68_ = _tmp66_[_tmp67_]; -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp69_ = ((_tmp68_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp68_) : ((gpointer) _tmp68_); -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" ((_tmp64_[_tmp65_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp64_[_tmp65_] = (self->priv->g_destroy_func (_tmp64_[_tmp65_]), NULL)); -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp64_[_tmp65_] = _tmp69_; -#line 426 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp70_ = _tmp64_[_tmp65_]; -#line 2468 "SortedList.c" +#line 2354 "SortedList.c" } } } @@ -2474,13 +2360,13 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng static GType sorted_list_real_get_element_type (GeeTraversable* base) { GType result; SortedList* self; -#line 35 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 19 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); -#line 35 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 19 "/home/jens/Source/shotwell/src/SortedList.vala" result = self->priv->g_type; -#line 35 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 19 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2484 "SortedList.c" +#line 2370 "SortedList.c" } @@ -2490,19 +2376,19 @@ static gboolean sorted_list_real_get_read_only (GeeCollection* base) { GeeArrayList* _tmp0_; gboolean _tmp1_; gboolean _tmp2_; -#line 39 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 23 "/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" +#line 23 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 39 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 23 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 23 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; -#line 39 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 23 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 39 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 23 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2506 "SortedList.c" +#line 2392 "SortedList.c" } @@ -2512,19 +2398,19 @@ static gboolean sorted_list_real_get_is_empty (GeeCollection* base) { GeeArrayList* _tmp0_; gboolean _tmp1_; gboolean _tmp2_; -#line 132 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 116 "/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" +#line 117 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 133 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 117 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 133 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 117 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; -#line 133 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 117 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 133 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 117 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2528 "SortedList.c" +#line 2414 "SortedList.c" } @@ -2534,19 +2420,19 @@ static gint sorted_list_real_get_size (GeeCollection* base) { GeeArrayList* _tmp0_; gint _tmp1_; gint _tmp2_; -#line 150 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 134 "/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" +#line 134 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 150 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 134 "/home/jens/Source/shotwell/src/SortedList.vala" _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" +#line 134 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; -#line 150 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 134 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp2_; -#line 150 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 134 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2550 "SortedList.c" +#line 2436 "SortedList.c" } @@ -2556,19 +2442,19 @@ static GeeCollection* sorted_list_real_get_read_only_view (GeeCollection* base) GeeArrayList* _tmp0_; GeeBidirList* _tmp1_; GeeBidirList* _tmp2_; -#line 215 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 199 "/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" +#line 200 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 216 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 200 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = gee_abstract_bidir_list_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_BIDIR_LIST, GeeAbstractBidirList)); -#line 216 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 200 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; -#line 216 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 200 "/home/jens/Source/shotwell/src/SortedList.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); -#line 216 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 200 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2572 "SortedList.c" +#line 2458 "SortedList.c" } @@ -2577,205 +2463,205 @@ GeeList* sorted_list_get_read_only_view_as_list (SortedList* self) { GeeArrayList* _tmp0_; GeeBidirList* _tmp1_; GeeBidirList* _tmp2_; -#line 221 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 205 "/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" +#line 206 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; -#line 222 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 206 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = gee_abstract_bidir_list_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_BIDIR_LIST, GeeAbstractBidirList)); -#line 222 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 206 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = _tmp1_; -#line 222 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 206 "/home/jens/Source/shotwell/src/SortedList.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); -#line 222 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 206 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2593 "SortedList.c" +#line 2479 "SortedList.c" } static void sorted_list_class_init (SortedListClass * klass) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_parent_class = g_type_class_peek_parent (klass); -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" g_type_class_add_private (klass, sizeof (SortedListPrivate)); -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_CLASS (klass)->get_property = _vala_sorted_list_get_property; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_CLASS (klass)->set_property = _vala_sorted_list_set_property; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_CLASS (klass)->finalize = sorted_list_finalize; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, 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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup 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" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" 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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" 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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" 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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" 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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" 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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" 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" +#line 2512 "SortedList.c" } static GType sorted_list_gee_traversable_get_g_type (SortedList* self) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_type; -#line 2633 "SortedList.c" +#line 2519 "SortedList.c" } static GBoxedCopyFunc sorted_list_gee_traversable_get_g_dup_func (SortedList* self) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_dup_func; -#line 2640 "SortedList.c" +#line 2526 "SortedList.c" } static GDestroyNotify sorted_list_gee_traversable_get_g_destroy_func (SortedList* self) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_destroy_func; -#line 2647 "SortedList.c" +#line 2533 "SortedList.c" } static void sorted_list_gee_traversable_interface_init (GeeTraversableIface * iface) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->foreach = (gboolean (*) (GeeTraversable *, GeeForallFunc, void*)) sorted_list_real_foreach; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_type = (GType (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_type; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_dup_func; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_destroy_func; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_element_type = sorted_list_real_get_element_type; -#line 2664 "SortedList.c" +#line 2550 "SortedList.c" } static GType sorted_list_gee_iterable_get_g_type (SortedList* self) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_type; -#line 2671 "SortedList.c" +#line 2557 "SortedList.c" } static GBoxedCopyFunc sorted_list_gee_iterable_get_g_dup_func (SortedList* self) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_dup_func; -#line 2678 "SortedList.c" +#line 2564 "SortedList.c" } static GDestroyNotify sorted_list_gee_iterable_get_g_destroy_func (SortedList* self) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_destroy_func; -#line 2685 "SortedList.c" +#line 2571 "SortedList.c" } static void sorted_list_gee_iterable_interface_init (GeeIterableIface * iface) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->iterator = (GeeIterator* (*) (GeeIterable *)) sorted_list_real_iterator; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_type = (GType (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_type; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_dup_func; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_destroy_func = (GDestroyNotify (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_destroy_func; -#line 2700 "SortedList.c" +#line 2586 "SortedList.c" } static GType sorted_list_gee_collection_get_g_type (SortedList* self) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_type; -#line 2707 "SortedList.c" +#line 2593 "SortedList.c" } static GBoxedCopyFunc sorted_list_gee_collection_get_g_dup_func (SortedList* self) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_dup_func; -#line 2714 "SortedList.c" +#line 2600 "SortedList.c" } static GDestroyNotify sorted_list_gee_collection_get_g_destroy_func (SortedList* self) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_destroy_func; -#line 2721 "SortedList.c" +#line 2607 "SortedList.c" } static void sorted_list_gee_collection_interface_init (GeeCollectionIface * iface) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->add = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_add; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->add_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_add_all; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->clear = (void (*) (GeeCollection *)) sorted_list_real_clear; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->contains = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_contains; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->contains_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_contains_all; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->remove = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_remove; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->remove_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_remove_all; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->retain_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_retain_all; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->to_array = (gpointer* (*) (GeeCollection *, int*)) sorted_list_real_to_array; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_type = (GType (*) (GeeCollection *)) sorted_list_gee_collection_get_g_type; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeCollection *)) sorted_list_gee_collection_get_g_dup_func; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_destroy_func = (GDestroyNotify (*) (GeeCollection *)) sorted_list_gee_collection_get_g_destroy_func; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_is_empty = sorted_list_real_get_is_empty; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_size = sorted_list_real_get_size; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_read_only_view = sorted_list_real_get_read_only_view; -#line 2760 "SortedList.c" +#line 2646 "SortedList.c" } static void sorted_list_instance_init (SortedList * self) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv = SORTED_LIST_GET_PRIVATE (self); -#line 2767 "SortedList.c" +#line 2653 "SortedList.c" } static void sorted_list_finalize (GObject * obj) { SortedList * self; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SORTED_LIST, SortedList); -#line 26 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 10 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (self->priv->list); -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_CLASS (sorted_list_parent_class)->finalize (obj); -#line 2779 "SortedList.c" +#line 2665 "SortedList.c" } @@ -2800,51 +2686,51 @@ GType sorted_list_get_type (void) { static void _vala_sorted_list_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SortedList * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SORTED_LIST, SortedList); -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" switch (property_id) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" case SORTED_LIST_ELEMENT_TYPE_PROPERTY: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" case SORTED_LIST_READ_ONLY_PROPERTY: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" case SORTED_LIST_IS_EMPTY_PROPERTY: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" case SORTED_LIST_SIZE_PROPERTY: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" case SORTED_LIST_READ_ONLY_VIEW_PROPERTY: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" case SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/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" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2842 "SortedList.c" +#line 2728 "SortedList.c" default: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2848 "SortedList.c" +#line 2734 "SortedList.c" } } @@ -2852,33 +2738,33 @@ static void _vala_sorted_list_get_property (GObject * object, guint property_id, static void _vala_sorted_list_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { SortedList * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SORTED_LIST, SortedList); -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" switch (property_id) { -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" case SORTED_LIST_G_TYPE: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->g_type = g_value_get_gtype (value); -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" case SORTED_LIST_G_DUP_FUNC: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->g_dup_func = g_value_get_pointer (value); -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" case SORTED_LIST_G_DESTROY_FUNC: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->g_destroy_func = g_value_get_pointer (value); -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2876 "SortedList.c" +#line 2762 "SortedList.c" default: -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 25 "/home/jens/Source/shotwell/src/SortedList.vala" +#line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2882 "SortedList.c" +#line 2768 "SortedList.c" } } -- cgit v1.2.3 From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/SortedList.c | 2225 +++++++++++++++++++++++++----------------------------- 1 file changed, 1024 insertions(+), 1201 deletions(-) (limited to 'src/SortedList.c') diff --git a/src/SortedList.c b/src/SortedList.c index f5bd10e..37f2db4 100644 --- a/src/SortedList.c +++ b/src/SortedList.c @@ -1,4 +1,4 @@ -/* SortedList.c generated by valac 0.36.6, the Vala compiler +/* SortedList.c generated by valac 0.40.4, the Vala compiler * generated from SortedList.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -22,6 +23,20 @@ typedef struct _SortedList SortedList; typedef struct _SortedListClass SortedListClass; typedef struct _SortedListPrivate SortedListPrivate; +enum { + SORTED_LIST_0_PROPERTY, + SORTED_LIST_G_TYPE, + SORTED_LIST_G_DUP_FUNC, + SORTED_LIST_G_DESTROY_FUNC, + 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, + SORTED_LIST_NUM_PROPERTIES +}; +static GParamSpec* sorted_list_properties[SORTED_LIST_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -55,58 +70,107 @@ static GeeCollectionIface * sorted_list_gee_collection_parent_iface = NULL; GType sorted_list_get_type (void) G_GNUC_CONST; #define SORTED_LIST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SORTED_LIST, SortedListPrivate)) -enum { - SORTED_LIST_DUMMY_PROPERTY, - SORTED_LIST_G_TYPE, - SORTED_LIST_G_DUP_FUNC, - SORTED_LIST_G_DESTROY_FUNC, - 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); +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); static GeeIterator* sorted_list_real_iterator (GeeIterable* base); -static gboolean sorted_list_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target); -static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item); -static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer item); -static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* collection); -gboolean sorted_list_add_list (SortedList* self, GeeList* items); -static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add); +static gboolean sorted_list_real_foreach (GeeTraversable* base, + GeeForallFunc f, + void* f_target); +static gboolean sorted_list_real_add (GeeCollection* base, + gconstpointer item); +static gint sorted_list_get_sorted_insert_pos (SortedList* self, + gconstpointer item); +static gboolean sorted_list_real_add_all (GeeCollection* base, + GeeCollection* collection); +gboolean sorted_list_add_list (SortedList* self, + GeeList* items); +static gboolean sorted_list_merge_sort (SortedList* self, + GeeList* add); static void sorted_list_real_clear (GeeCollection* base); -static gboolean sorted_list_real_contains (GeeCollection* base, gconstpointer item); -static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollection* collection); -static gboolean sorted_list_real_remove (GeeCollection* base, gconstpointer item); -static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection* collection); -static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection* collection); +static gboolean sorted_list_real_contains (GeeCollection* base, + gconstpointer item); +static gboolean sorted_list_real_contains_all (GeeCollection* base, + GeeCollection* collection); +static gboolean sorted_list_real_remove (GeeCollection* base, + gconstpointer item); +static gboolean sorted_list_real_remove_all (GeeCollection* base, + GeeCollection* collection); +static gboolean sorted_list_real_retain_all (GeeCollection* base, + GeeCollection* collection); gint sorted_list_get_count (SortedList* self); -gpointer sorted_list_get_at (SortedList* self, gint index); -static gint sorted_list_binary_search (SortedList* self, gconstpointer search, GEqualFunc equal_func); -gint sorted_list_index_of (SortedList* self, gconstpointer search); -gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altered, GEqualFunc equal_func); -gpointer sorted_list_remove_at (SortedList* self, gint index); -static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_length1); -void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_target); -gboolean sorted_list_resort_item (SortedList* self, gconstpointer item); +gpointer sorted_list_get_at (SortedList* self, + gint index); +static gint sorted_list_binary_search (SortedList* self, + gconstpointer search, + GEqualFunc equal_func); +gint sorted_list_index_of (SortedList* self, + gconstpointer search); +gint sorted_list_locate (SortedList* self, + gconstpointer search, + gboolean altered, + GEqualFunc equal_func); +gpointer sorted_list_remove_at (SortedList* self, + gint index); +static gpointer* sorted_list_real_to_array (GeeCollection* base, + int* result_length1); +void sorted_list_resort (SortedList* self, + Comparator new_cmp, + void* new_cmp_target); +gboolean sorted_list_resort_item (SortedList* self, + gconstpointer item); 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); +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 _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); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target) { +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); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +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_; - Comparator _tmp1_; - void* _tmp1__target; #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" self = (SortedList*) g_object_new (object_type, NULL); #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -122,27 +186,31 @@ SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFu #line 14 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv->list = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = cmp; -#line 15 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1__target = cmp_target; -#line 15 "/home/jens/Source/shotwell/src/SortedList.vala" - self->priv->cmp = _tmp1_; + self->priv->cmp = cmp; #line 15 "/home/jens/Source/shotwell/src/SortedList.vala" - self->priv->cmp_target = _tmp1__target; + self->priv->cmp_target = cmp_target; #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" return self; -#line 135 "SortedList.c" +#line 195 "SortedList.c" } -SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target) { +SortedList* +sorted_list_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target) +{ #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" return sorted_list_construct (TYPE_SORTED_LIST, g_type, g_dup_func, g_destroy_func, cmp, cmp_target); -#line 142 "SortedList.c" +#line 208 "SortedList.c" } -static GeeIterator* sorted_list_real_iterator (GeeIterable* base) { +static GeeIterator* +sorted_list_real_iterator (GeeIterable* base) +{ SortedList * self; GeeIterator* result = NULL; GeeArrayList* _tmp0_; @@ -157,36 +225,34 @@ static GeeIterator* sorted_list_real_iterator (GeeIterable* base) { result = _tmp1_; #line 27 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 161 "SortedList.c" +#line 229 "SortedList.c" } -static gboolean sorted_list_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target) { +static gboolean +sorted_list_real_foreach (GeeTraversable* base, + GeeForallFunc f, + void* f_target) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - GeeForallFunc _tmp1_; - void* _tmp1__target; - gboolean _tmp2_; #line 30 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 31 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 31 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = f; -#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1__target = f_target; -#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_collection_foreach (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_, _tmp1__target); -#line 31 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_abstract_collection_foreach (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), f, f_target); #line 31 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 186 "SortedList.c" +#line 249 "SortedList.c" } -static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) { +static gboolean +sorted_list_real_add (GeeCollection* base, + gconstpointer item) +{ SortedList * self; gboolean result = FALSE; Comparator _tmp0_; @@ -199,212 +265,175 @@ static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) { _tmp0__target = self->priv->cmp_target; #line 35 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp0_ == NULL) { -#line 203 "SortedList.c" +#line 269 "SortedList.c" GeeArrayList* _tmp1_; - gconstpointer _tmp2_; #line 36 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp1_ = self->priv->list; #line 36 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = item; -#line 36 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 212 "SortedList.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), item); +#line 275 "SortedList.c" } else { - GeeArrayList* _tmp3_; - gconstpointer _tmp4_; - gint _tmp5_; - gconstpointer _tmp6_; -#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = self->priv->list; -#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = item; -#line 38 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = sorted_list_get_sorted_insert_pos (self, _tmp4_); + GeeArrayList* _tmp2_; #line 38 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = item; + _tmp2_ = self->priv->list; #line 38 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp5_, _tmp6_); -#line 228 "SortedList.c" + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), sorted_list_get_sorted_insert_pos (self, item), item); +#line 282 "SortedList.c" } #line 44 "/home/jens/Source/shotwell/src/SortedList.vala" result = TRUE; #line 44 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 234 "SortedList.c" +#line 288 "SortedList.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 51 "/home/jens/Source/shotwell/src/SortedList.vala" return self ? g_object_ref (self) : NULL; -#line 241 "SortedList.c" +#line 297 "SortedList.c" } -static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* collection) { +static gboolean +sorted_list_real_add_all (GeeCollection* base, + GeeCollection* collection) +{ SortedList * self; gboolean result = FALSE; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; GeeList* as_list = NULL; - GeeCollection* _tmp3_; - GeeList* _tmp4_; - GeeList* _tmp5_; - Comparator _tmp8_; - void* _tmp8__target; + GeeList* _tmp2_; + GeeList* _tmp3_; + Comparator _tmp5_; + void* _tmp5__target; gboolean changed = FALSE; - GeeCollection* _tmp12_; - gint _tmp13_; - gint _tmp14_; + gint _tmp7_; + gint _tmp8_; #line 47 "/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" g_return_val_if_fail (GEE_IS_COLLECTION (collection), FALSE); #line 48 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = collection; -#line 48 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (collection); #line 48 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 48 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 49 "/home/jens/Source/shotwell/src/SortedList.vala" result = FALSE; #line 49 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 277 "SortedList.c" +#line 331 "SortedList.c" } #line 51 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = collection; -#line 51 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, GEE_TYPE_LIST) ? ((GeeList*) _tmp3_) : NULL); + _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (collection, GEE_TYPE_LIST) ? ((GeeList*) collection) : NULL); #line 51 "/home/jens/Source/shotwell/src/SortedList.vala" - as_list = _tmp4_; + as_list = _tmp2_; #line 52 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = as_list; + _tmp3_ = as_list; #line 52 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp5_ != NULL) { -#line 289 "SortedList.c" - GeeList* _tmp6_; - gboolean _tmp7_; -#line 53 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = as_list; + if (_tmp3_ != NULL) { +#line 341 "SortedList.c" + GeeList* _tmp4_; #line 53 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = sorted_list_add_list (self, _tmp6_); + _tmp4_ = as_list; #line 53 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp7_; + result = sorted_list_add_list (self, _tmp4_); #line 53 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (as_list); #line 53 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 302 "SortedList.c" +#line 351 "SortedList.c" } #line 55 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = self->priv->cmp; + _tmp5_ = self->priv->cmp; #line 55 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8__target = self->priv->cmp_target; + _tmp5__target = self->priv->cmp_target; #line 55 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp8_ == NULL) { -#line 310 "SortedList.c" - GeeArrayList* _tmp9_; - GeeCollection* _tmp10_; - gboolean _tmp11_; -#line 56 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = self->priv->list; -#line 56 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = collection; + if (_tmp5_ == NULL) { +#line 359 "SortedList.c" + GeeArrayList* _tmp6_; #line 56 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = gee_array_list_add_all (_tmp9_, _tmp10_); + _tmp6_ = self->priv->list; #line 56 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp11_; + result = gee_array_list_add_all (_tmp6_, collection); #line 56 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (as_list); #line 56 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 326 "SortedList.c" +#line 369 "SortedList.c" } #line 58 "/home/jens/Source/shotwell/src/SortedList.vala" changed = FALSE; #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = collection; + _tmp7_ = gee_collection_get_size (collection); #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = gee_collection_get_size (_tmp12_); + _tmp8_ = _tmp7_; #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = _tmp13_; -#line 59 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp14_ == 1) { -#line 338 "SortedList.c" + if (_tmp8_ == 1) { +#line 379 "SortedList.c" GeeIterator* iter = NULL; - GeeCollection* _tmp15_; - GeeIterator* _tmp16_; - GeeIterator* _tmp17_; + GeeIterator* _tmp9_; + GeeIterator* _tmp10_; gpointer item = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - GeeArrayList* _tmp20_; - gconstpointer _tmp21_; - gint _tmp22_; - gconstpointer _tmp23_; -#line 60 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = collection; + GeeIterator* _tmp11_; + gpointer _tmp12_; + GeeArrayList* _tmp13_; + gconstpointer _tmp14_; + gconstpointer _tmp15_; #line 60 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (collection, GEE_TYPE_ITERABLE, GeeIterable)); #line 60 "/home/jens/Source/shotwell/src/SortedList.vala" - iter = _tmp16_; + iter = _tmp9_; #line 61 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = iter; + _tmp10_ = iter; #line 61 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_iterator_next (_tmp17_); + gee_iterator_next (_tmp10_); #line 62 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = iter; + _tmp11_ = iter; #line 62 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 62 "/home/jens/Source/shotwell/src/SortedList.vala" - item = _tmp19_; -#line 64 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = self->priv->list; + item = _tmp12_; #line 64 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = item; + _tmp13_ = self->priv->list; #line 64 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = sorted_list_get_sorted_insert_pos (self, _tmp21_); + _tmp14_ = item; #line 64 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = item; + _tmp15_ = item; #line 64 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_, _tmp23_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), sorted_list_get_sorted_insert_pos (self, _tmp14_), _tmp15_); #line 65 "/home/jens/Source/shotwell/src/SortedList.vala" changed = TRUE; #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (iter); -#line 382 "SortedList.c" +#line 417 "SortedList.c" } else { GeeList* items = NULL; - GeeArrayList* _tmp24_; - GeeList* _tmp25_; - GeeCollection* _tmp26_; - GeeList* _tmp27_; - gboolean _tmp28_; + GeeArrayList* _tmp16_; + GeeList* _tmp17_; + GeeList* _tmp18_; #line 67 "/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); + _tmp16_ = gee_array_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, NULL, NULL, NULL); #line 67 "/home/jens/Source/shotwell/src/SortedList.vala" - items = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_LIST, GeeList); -#line 68 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = items; + items = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_LIST, GeeList); #line 68 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = collection; + _tmp17_ = items; #line 68 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_); + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), collection); #line 70 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_ = items; + _tmp18_ = items; #line 70 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp28_ = sorted_list_merge_sort (self, _tmp27_); -#line 70 "/home/jens/Source/shotwell/src/SortedList.vala" - changed = _tmp28_; + changed = sorted_list_merge_sort (self, _tmp18_); #line 59 "/home/jens/Source/shotwell/src/SortedList.vala" _g_object_unref0 (items); -#line 408 "SortedList.c" +#line 437 "SortedList.c" } #line 76 "/home/jens/Source/shotwell/src/SortedList.vala" result = changed; @@ -412,16 +441,18 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co _g_object_unref0 (as_list); #line 76 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 416 "SortedList.c" +#line 445 "SortedList.c" } -gboolean sorted_list_add_list (SortedList* self, GeeList* items) { +gboolean +sorted_list_add_list (SortedList* self, + GeeList* items) +{ gboolean result = FALSE; gboolean added = FALSE; - GeeList* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; #line 79 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), FALSE); #line 79 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -429,104 +460,80 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) { #line 80 "/home/jens/Source/shotwell/src/SortedList.vala" added = FALSE; #line 81 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = items; -#line 81 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp0_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (items, GEE_TYPE_COLLECTION, GeeCollection)); #line 81 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 81 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp2_ == 0) { -#line 440 "SortedList.c" + if (_tmp1_ == 0) { +#line 469 "SortedList.c" } else { - Comparator _tmp3_; - void* _tmp3__target; + Comparator _tmp2_; + void* _tmp2__target; #line 83 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = self->priv->cmp; + _tmp2_ = self->priv->cmp; #line 83 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3__target = self->priv->cmp_target; + _tmp2__target = self->priv->cmp_target; #line 83 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp3_ != NULL) { -#line 450 "SortedList.c" - GeeList* _tmp4_; - gint _tmp5_; - gint _tmp6_; -#line 86 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = items; + if (_tmp2_ != NULL) { +#line 479 "SortedList.c" + gint _tmp3_; + gint _tmp4_; #line 86 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (items, GEE_TYPE_COLLECTION, GeeCollection)); #line 86 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 86 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp6_ == 1) { -#line 462 "SortedList.c" - GeeArrayList* _tmp7_; - GeeList* _tmp8_; + if (_tmp4_ == 1) { +#line 488 "SortedList.c" + GeeArrayList* _tmp5_; + gpointer _tmp6_; + gpointer _tmp7_; + gpointer _tmp8_; gpointer _tmp9_; - gpointer _tmp10_; - gint _tmp11_; - GeeList* _tmp12_; - gpointer _tmp13_; - gpointer _tmp14_; -#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = self->priv->list; -#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = items; #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = gee_list_get (_tmp8_, 0); + _tmp5_ = self->priv->list; #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = _tmp9_; + _tmp6_ = gee_list_get (items, 0); #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = sorted_list_get_sorted_insert_pos (self, _tmp10_); + _tmp7_ = _tmp6_; #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = items; + _tmp8_ = gee_list_get (items, 0); #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = gee_list_get (_tmp12_, 0); + _tmp9_ = _tmp8_; #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = _tmp13_; + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), sorted_list_get_sorted_insert_pos (self, _tmp7_), _tmp9_); #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_, _tmp14_); + ((_tmp9_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp9_ = (self->priv->g_destroy_func (_tmp9_), NULL)); #line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp14_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp14_ = (self->priv->g_destroy_func (_tmp14_), NULL)); -#line 87 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp10_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp10_ = (self->priv->g_destroy_func (_tmp10_), NULL)); + ((_tmp7_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp7_ = (self->priv->g_destroy_func (_tmp7_), NULL)); #line 88 "/home/jens/Source/shotwell/src/SortedList.vala" added = TRUE; -#line 495 "SortedList.c" +#line 512 "SortedList.c" } else { - GeeList* _tmp15_; - gboolean _tmp16_; -#line 90 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = items; -#line 90 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = sorted_list_merge_sort (self, _tmp15_); #line 90 "/home/jens/Source/shotwell/src/SortedList.vala" - added = _tmp16_; -#line 505 "SortedList.c" + added = sorted_list_merge_sort (self, items); +#line 516 "SortedList.c" } } else { - GeeArrayList* _tmp17_; - GeeList* _tmp18_; - gboolean _tmp19_; -#line 93 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = self->priv->list; -#line 93 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = items; + GeeArrayList* _tmp10_; #line 93 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = gee_array_list_add_all (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = self->priv->list; #line 93 "/home/jens/Source/shotwell/src/SortedList.vala" - added = _tmp19_; -#line 519 "SortedList.c" + added = gee_array_list_add_all (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (items, GEE_TYPE_COLLECTION, GeeCollection)); +#line 524 "SortedList.c" } } #line 100 "/home/jens/Source/shotwell/src/SortedList.vala" result = added; #line 100 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 526 "SortedList.c" +#line 531 "SortedList.c" } -static void sorted_list_real_clear (GeeCollection* base) { +static void +sorted_list_real_clear (GeeCollection* base) +{ SortedList * self; GeeArrayList* _tmp0_; #line 103 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -535,38 +542,36 @@ static void sorted_list_real_clear (GeeCollection* base) { _tmp0_ = self->priv->list; #line 104 "/home/jens/Source/shotwell/src/SortedList.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 539 "SortedList.c" +#line 546 "SortedList.c" } -static gboolean sorted_list_real_contains (GeeCollection* base, gconstpointer item) { +static gboolean +sorted_list_real_contains (GeeCollection* base, + gconstpointer item) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - gconstpointer _tmp1_; - gboolean _tmp2_; #line 107 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 108 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 108 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = item; -#line 108 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 108 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), item); #line 108 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 561 "SortedList.c" +#line 565 "SortedList.c" } -static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollection* collection) { +static gboolean +sorted_list_real_contains_all (GeeCollection* base, + GeeCollection* collection) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; #line 111 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 111 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -574,45 +579,39 @@ static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollectio #line 112 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 112 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = collection; -#line 112 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 112 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), collection); #line 112 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 585 "SortedList.c" +#line 586 "SortedList.c" } -static gboolean sorted_list_real_remove (GeeCollection* base, gconstpointer item) { +static gboolean +sorted_list_real_remove (GeeCollection* base, + gconstpointer item) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - gconstpointer _tmp1_; - gboolean _tmp2_; #line 121 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 122 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 122 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = item; -#line 122 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 122 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), item); #line 122 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 607 "SortedList.c" +#line 605 "SortedList.c" } -static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection* collection) { +static gboolean +sorted_list_real_remove_all (GeeCollection* base, + GeeCollection* collection) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; #line 125 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 125 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -620,23 +619,20 @@ static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection* #line 126 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 126 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = collection; -#line 126 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 126 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), collection); #line 126 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 631 "SortedList.c" +#line 626 "SortedList.c" } -static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection* collection) { +static gboolean +sorted_list_real_retain_all (GeeCollection* base, + GeeCollection* collection) +{ SortedList * self; gboolean result = FALSE; GeeArrayList* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; #line 129 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList); #line 129 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -644,18 +640,16 @@ static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection* #line 130 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 130 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = collection; -#line 130 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_collection_retain_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 130 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = gee_collection_retain_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), collection); #line 130 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 655 "SortedList.c" +#line 647 "SortedList.c" } -inline gint sorted_list_get_count (SortedList* self) { +inline gint +sorted_list_get_count (SortedList* self) +{ gint result = 0; GeeArrayList* _tmp0_; gint _tmp1_; @@ -672,32 +666,36 @@ inline gint sorted_list_get_count (SortedList* self) { result = _tmp2_; #line 138 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 676 "SortedList.c" +#line 670 "SortedList.c" } -gpointer sorted_list_get_at (SortedList* self, gint index) { +gpointer +sorted_list_get_at (SortedList* self, + gint index) +{ gpointer result = NULL; GeeArrayList* _tmp0_; - gint _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 141 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), NULL); #line 142 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 142 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = index; -#line 142 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp1_); + _tmp1_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), index); #line 142 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = _tmp1_; #line 142 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 697 "SortedList.c" +#line 691 "SortedList.c" } -static gint sorted_list_binary_search (SortedList* self, gconstpointer search, GEqualFunc equal_func) { +static gint +sorted_list_binary_search (SortedList* self, + gconstpointer search, + GEqualFunc equal_func) +{ gint result = 0; Comparator _tmp0_; void* _tmp0__target; @@ -724,14 +722,14 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G _tmp3_ = _tmp2_; #line 149 "/home/jens/Source/shotwell/src/SortedList.vala" max = _tmp3_; -#line 728 "SortedList.c" +#line 726 "SortedList.c" { gboolean _tmp4_ = FALSE; #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = TRUE; #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 735 "SortedList.c" +#line 733 "SortedList.c" gint mid = 0; gint _tmp5_; gint _tmp6_; @@ -741,19 +739,16 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G gint _tmp9_; gpointer _tmp10_; gboolean _tmp11_ = FALSE; - GEqualFunc _tmp12_; gint64 compare = 0LL; - Comparator _tmp17_; - void* _tmp17__target; - gconstpointer _tmp18_; - gconstpointer _tmp19_; - gint64 _tmp20_; - gint64 _tmp21_; - gint _tmp25_; - gint _tmp26_; + Comparator _tmp13_; + void* _tmp13__target; + gconstpointer _tmp14_; + gint64 _tmp15_; + gint _tmp19_; + gint _tmp20_; #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp4_) { -#line 757 "SortedList.c" +#line 752 "SortedList.c" } #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = FALSE; @@ -774,29 +769,18 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G #line 152 "/home/jens/Source/shotwell/src/SortedList.vala" item = _tmp10_; #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = equal_func; -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp12_ != NULL) { -#line 781 "SortedList.c" - GEqualFunc _tmp13_; - gconstpointer _tmp14_; - gconstpointer _tmp15_; - gboolean _tmp16_; -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = equal_func; + if (equal_func != NULL) { +#line 774 "SortedList.c" + gconstpointer _tmp12_; #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = item; + _tmp12_ = item; #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = search; -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = _tmp13_ (_tmp14_, _tmp15_); -#line 154 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = _tmp16_; -#line 796 "SortedList.c" + _tmp11_ = equal_func (_tmp12_, search); +#line 780 "SortedList.c" } else { #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp11_ = FALSE; -#line 800 "SortedList.c" +#line 784 "SortedList.c" } #line 154 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp11_) { @@ -806,79 +790,78 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); #line 155 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 810 "SortedList.c" +#line 794 "SortedList.c" } #line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = self->priv->cmp; -#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17__target = self->priv->cmp_target; -#line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = item; + _tmp13_ = self->priv->cmp; #line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = search; + _tmp13__target = self->priv->cmp_target; #line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = _tmp17_ (_tmp18_, _tmp19_, _tmp17__target); + _tmp14_ = item; #line 157 "/home/jens/Source/shotwell/src/SortedList.vala" - compare = _tmp20_; + compare = _tmp13_ (_tmp14_, search, _tmp13__target); #line 158 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = compare; + _tmp15_ = compare; #line 158 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp21_ == ((gint64) 0)) { + if (_tmp15_ == ((gint64) 0)) { #line 159 "/home/jens/Source/shotwell/src/SortedList.vala" result = mid; #line 159 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); #line 159 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 834 "SortedList.c" +#line 814 "SortedList.c" } else { - gint64 _tmp22_; + gint64 _tmp16_; #line 160 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = compare; + _tmp16_ = compare; #line 160 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp22_ > ((gint64) 0)) { -#line 841 "SortedList.c" - gint _tmp23_; + if (_tmp16_ > ((gint64) 0)) { +#line 821 "SortedList.c" + gint _tmp17_; #line 161 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = mid; + _tmp17_ = mid; #line 161 "/home/jens/Source/shotwell/src/SortedList.vala" - max = _tmp23_ - 1; -#line 847 "SortedList.c" + max = _tmp17_ - 1; +#line 827 "SortedList.c" } else { - gint _tmp24_; + gint _tmp18_; #line 163 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = mid; + _tmp18_ = mid; #line 163 "/home/jens/Source/shotwell/src/SortedList.vala" - min = _tmp24_ + 1; -#line 854 "SortedList.c" + min = _tmp18_ + 1; +#line 834 "SortedList.c" } } #line 165 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = min; + _tmp19_ = min; #line 165 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = max; + _tmp20_ = max; #line 165 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp25_ > _tmp26_) { + if (_tmp19_ > _tmp20_) { #line 166 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); #line 166 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 867 "SortedList.c" +#line 847 "SortedList.c" } #line 150 "/home/jens/Source/shotwell/src/SortedList.vala" ((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL)); -#line 871 "SortedList.c" +#line 851 "SortedList.c" } } #line 169 "/home/jens/Source/shotwell/src/SortedList.vala" result = -1; #line 169 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 878 "SortedList.c" +#line 858 "SortedList.c" } -gint sorted_list_index_of (SortedList* self, gconstpointer search) { +gint +sorted_list_index_of (SortedList* self, + gconstpointer search) +{ gint result = 0; gint _tmp0_ = 0; Comparator _tmp1_; @@ -891,46 +874,35 @@ gint sorted_list_index_of (SortedList* self, gconstpointer search) { _tmp1__target = self->priv->cmp_target; #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp1_ != NULL) { -#line 895 "SortedList.c" - gconstpointer _tmp2_; - gint _tmp3_; #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = search; -#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = sorted_list_binary_search (self, _tmp2_, NULL); -#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = _tmp3_; -#line 904 "SortedList.c" + _tmp0_ = sorted_list_binary_search (self, search, NULL); +#line 880 "SortedList.c" } else { - gconstpointer _tmp4_; - GEqualFunc _tmp5_; - gint _tmp6_; -#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = search; + GEqualFunc _tmp2_; #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = g_direct_equal; + _tmp2_ = g_direct_equal; #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = sorted_list_locate (self, _tmp4_, FALSE, _tmp5_); -#line 180 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = _tmp6_; -#line 917 "SortedList.c" + _tmp0_ = sorted_list_locate (self, search, FALSE, _tmp2_); +#line 887 "SortedList.c" } #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp0_; #line 180 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 923 "SortedList.c" +#line 893 "SortedList.c" } -gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altered, GEqualFunc equal_func) { +gint +sorted_list_locate (SortedList* self, + gconstpointer search, + gboolean altered, + GEqualFunc equal_func) +{ gint result = 0; gboolean _tmp0_ = FALSE; Comparator _tmp1_; void* _tmp1__target; - gconstpointer _tmp18_; - GEqualFunc _tmp19_; - gint _tmp20_; #line 184 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), 0); #line 185 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -941,100 +913,88 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere if (_tmp1_ == NULL) { #line 185 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = TRUE; -#line 945 "SortedList.c" +#line 917 "SortedList.c" } else { - gboolean _tmp2_; #line 185 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = altered; -#line 185 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = _tmp2_; -#line 952 "SortedList.c" + _tmp0_ = altered; +#line 921 "SortedList.c" } #line 185 "/home/jens/Source/shotwell/src/SortedList.vala" if (_tmp0_) { -#line 956 "SortedList.c" +#line 925 "SortedList.c" gint count = 0; - GeeArrayList* _tmp3_; + GeeArrayList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; #line 186 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = self->priv->list; + _tmp2_ = self->priv->list; #line 186 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 186 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 186 "/home/jens/Source/shotwell/src/SortedList.vala" - count = _tmp5_; -#line 969 "SortedList.c" + count = _tmp4_; +#line 938 "SortedList.c" { gint ctr = 0; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" ctr = 0; -#line 974 "SortedList.c" +#line 943 "SortedList.c" { - gboolean _tmp6_ = FALSE; + gboolean _tmp5_ = FALSE; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = TRUE; + _tmp5_ = TRUE; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 981 "SortedList.c" +#line 950 "SortedList.c" + gint _tmp7_; gint _tmp8_; - gint _tmp9_; - GEqualFunc _tmp10_; - GeeArrayList* _tmp11_; - gint _tmp12_; - gpointer _tmp13_; - gpointer _tmp14_; - gconstpointer _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; + GeeArrayList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + gpointer _tmp12_; + gboolean _tmp13_; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!_tmp6_) { -#line 994 "SortedList.c" - gint _tmp7_; + if (!_tmp5_) { +#line 960 "SortedList.c" + gint _tmp6_; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = ctr; + _tmp6_ = ctr; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - ctr = _tmp7_ + 1; -#line 1000 "SortedList.c" + ctr = _tmp6_ + 1; +#line 966 "SortedList.c" } #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = FALSE; + _tmp5_ = FALSE; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = ctr; + _tmp7_ = ctr; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = count; + _tmp8_ = count; #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp8_ < _tmp9_)) { + if (!(_tmp7_ < _tmp8_)) { #line 187 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1012 "SortedList.c" +#line 978 "SortedList.c" } #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = equal_func; -#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = self->priv->list; -#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = ctr; + _tmp9_ = self->priv->list; #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_); + _tmp10_ = ctr; #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = _tmp13_; + _tmp11_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp10_); #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = search; + _tmp12_ = _tmp11_; #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = _tmp10_ (_tmp14_, _tmp15_); + _tmp13_ = equal_func (_tmp12_, search); #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = _tmp16_; + ((_tmp12_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp12_ = (self->priv->g_destroy_func (_tmp12_), NULL)); #line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp14_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp14_ = (self->priv->g_destroy_func (_tmp14_), NULL)); -#line 188 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp17_) { + if (_tmp13_) { #line 189 "/home/jens/Source/shotwell/src/SortedList.vala" result = ctr; #line 189 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1038 "SortedList.c" +#line 998 "SortedList.c" } } } @@ -1043,44 +1003,41 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere result = -1; #line 192 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1047 "SortedList.c" +#line 1007 "SortedList.c" } #line 195 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = search; -#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = equal_func; -#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = sorted_list_binary_search (self, _tmp18_, _tmp19_); -#line 195 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp20_; + result = sorted_list_binary_search (self, search, equal_func); #line 195 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1059 "SortedList.c" +#line 1013 "SortedList.c" } -gpointer sorted_list_remove_at (SortedList* self, gint index) { +gpointer +sorted_list_remove_at (SortedList* self, + gint index) +{ gpointer result = NULL; GeeArrayList* _tmp0_; - gint _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 210 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), NULL); #line 211 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = self->priv->list; #line 211 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = index; -#line 211 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp1_); + _tmp1_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), index); #line 211 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp2_; + result = _tmp1_; #line 211 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1080 "SortedList.c" +#line 1034 "SortedList.c" } -static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_length1) { +static gpointer* +sorted_list_real_to_array (GeeCollection* base, + int* result_length1) +{ SortedList * self; gpointer* result = NULL; GeeArrayList* _tmp0_; @@ -1102,167 +1059,147 @@ static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_len if (result_length1) { #line 215 "/home/jens/Source/shotwell/src/SortedList.vala" *result_length1 = _tmp3__length1; -#line 1106 "SortedList.c" +#line 1063 "SortedList.c" } #line 215 "/home/jens/Source/shotwell/src/SortedList.vala" result = _tmp3_; #line 215 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1112 "SortedList.c" +#line 1069 "SortedList.c" } -void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_target) { - Comparator _tmp0_; - void* _tmp0__target; +void +sorted_list_resort (SortedList* self, + Comparator new_cmp, + void* new_cmp_target) +{ #line 218 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); #line 219 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = new_cmp; + self->priv->cmp = new_cmp; #line 219 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0__target = new_cmp_target; -#line 219 "/home/jens/Source/shotwell/src/SortedList.vala" - self->priv->cmp = _tmp0_; -#line 219 "/home/jens/Source/shotwell/src/SortedList.vala" - self->priv->cmp_target = _tmp0__target; + self->priv->cmp_target = new_cmp_target; #line 221 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_merge_sort (self, NULL); -#line 1131 "SortedList.c" +#line 1086 "SortedList.c" } -gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) { +gboolean +sorted_list_resort_item (SortedList* self, + gconstpointer item) +{ gboolean result = FALSE; gint index = 0; - gconstpointer _tmp0_; - GEqualFunc _tmp1_; + GEqualFunc _tmp0_; + gint _tmp1_; + gint new_index = 0; gint _tmp2_; gint _tmp3_; - gint new_index = 0; - gconstpointer _tmp4_; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - gint _tmp8_; - gint _tmp9_; #line 229 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), FALSE); #line 230 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = item; + _tmp0_ = g_direct_equal; #line 230 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = g_direct_equal; -#line 230 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = sorted_list_locate (self, _tmp0_, TRUE, _tmp1_); -#line 230 "/home/jens/Source/shotwell/src/SortedList.vala" - index = _tmp2_; + index = sorted_list_locate (self, item, TRUE, _tmp0_); #line 231 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = index; + _tmp1_ = index; #line 231 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp3_ >= 0, "index >= 0"); -#line 233 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = item; -#line 233 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = sorted_list_get_sorted_insert_pos (self, _tmp4_); + _vala_assert (_tmp1_ >= 0, "index >= 0"); #line 233 "/home/jens/Source/shotwell/src/SortedList.vala" - new_index = _tmp5_; + new_index = sorted_list_get_sorted_insert_pos (self, item); #line 235 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = index; + _tmp2_ = index; #line 235 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = new_index; + _tmp3_ = new_index; #line 235 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp6_ == _tmp7_) { + if (_tmp2_ == _tmp3_) { #line 236 "/home/jens/Source/shotwell/src/SortedList.vala" result = FALSE; #line 236 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1179 "SortedList.c" +#line 1125 "SortedList.c" } #line 240 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = new_index; + _tmp4_ = new_index; #line 240 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = index; + _tmp5_ = index; #line 240 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp8_ > _tmp9_) { -#line 1187 "SortedList.c" - GeeArrayList* _tmp10_; - gint _tmp11_; - gconstpointer _tmp12_; + if (_tmp4_ > _tmp5_) { +#line 1133 "SortedList.c" + GeeArrayList* _tmp6_; + gint _tmp7_; gpointer removed_item = NULL; - GeeArrayList* _tmp13_; - gint _tmp14_; - gpointer _tmp15_; - gconstpointer _tmp16_; - gconstpointer _tmp17_; + GeeArrayList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + gconstpointer _tmp11_; #line 241 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = self->priv->list; + _tmp6_ = self->priv->list; #line 241 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = new_index; + _tmp7_ = new_index; #line 241 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = item; -#line 241 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_, _tmp12_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_, item); #line 242 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = self->priv->list; + _tmp8_ = self->priv->list; #line 242 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = index; + _tmp9_ = index; #line 242 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_); + _tmp10_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_); #line 242 "/home/jens/Source/shotwell/src/SortedList.vala" - removed_item = _tmp15_; + removed_item = _tmp10_; #line 243 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = item; + _tmp11_ = removed_item; #line 243 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = removed_item; -#line 243 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp16_ == _tmp17_, "item == removed_item"); + _vala_assert (item == _tmp11_, "item == removed_item"); #line 240 "/home/jens/Source/shotwell/src/SortedList.vala" ((removed_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (removed_item = (self->priv->g_destroy_func (removed_item), NULL)); -#line 1221 "SortedList.c" +#line 1161 "SortedList.c" } else { gpointer removed_item = NULL; - GeeArrayList* _tmp18_; - gint _tmp19_; - gpointer _tmp20_; - gconstpointer _tmp21_; - gconstpointer _tmp22_; - GeeArrayList* _tmp23_; - gint _tmp24_; - gconstpointer _tmp25_; + GeeArrayList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + gconstpointer _tmp15_; + GeeArrayList* _tmp16_; + gint _tmp17_; #line 245 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = self->priv->list; + _tmp12_ = self->priv->list; #line 245 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = index; + _tmp13_ = index; #line 245 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp19_); + _tmp14_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_); #line 245 "/home/jens/Source/shotwell/src/SortedList.vala" - removed_item = _tmp20_; -#line 246 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = item; + removed_item = _tmp14_; #line 246 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = removed_item; + _tmp15_ = removed_item; #line 246 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp21_ == _tmp22_, "item == removed_item"); + _vala_assert (item == _tmp15_, "item == removed_item"); #line 247 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = self->priv->list; + _tmp16_ = self->priv->list; #line 247 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = new_index; + _tmp17_ = new_index; #line 247 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = item; -#line 247 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp24_, _tmp25_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_, item); #line 240 "/home/jens/Source/shotwell/src/SortedList.vala" ((removed_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (removed_item = (self->priv->g_destroy_func (removed_item), NULL)); -#line 1256 "SortedList.c" +#line 1190 "SortedList.c" } #line 254 "/home/jens/Source/shotwell/src/SortedList.vala" result = TRUE; #line 254 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1262 "SortedList.c" +#line 1196 "SortedList.c" } -static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer item) { +static gint +sorted_list_get_sorted_insert_pos (SortedList* self, + gconstpointer item) +{ gint result = 0; gint low = 0; gint high = 0; @@ -1281,14 +1218,14 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i _tmp2_ = _tmp1_; #line 259 "/home/jens/Source/shotwell/src/SortedList.vala" high = _tmp2_; -#line 1285 "SortedList.c" +#line 1222 "SortedList.c" { gboolean _tmp3_ = FALSE; #line 260 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = TRUE; #line 260 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1292 "SortedList.c" +#line 1229 "SortedList.c" gint _tmp4_; gint _tmp5_; gint mid = 0; @@ -1300,17 +1237,14 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i gint _tmp10_; gpointer _tmp11_; gconstpointer _tmp12_; - gconstpointer _tmp13_; gint64 _result_ = 0LL; - Comparator _tmp24_; - void* _tmp24__target; - gconstpointer _tmp25_; - gconstpointer _tmp26_; - gint64 _tmp27_; - gint64 _tmp28_; + Comparator _tmp23_; + void* _tmp23__target; + gconstpointer _tmp24_; + gint64 _tmp25_; #line 260 "/home/jens/Source/shotwell/src/SortedList.vala" if (!_tmp3_) { -#line 1314 "SortedList.c" +#line 1248 "SortedList.c" } #line 260 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp3_ = FALSE; @@ -1324,7 +1258,7 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i result = low; #line 262 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1328 "SortedList.c" +#line 1262 "SortedList.c" } #line 264 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp6_ = low; @@ -1343,95 +1277,89 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i #line 268 "/home/jens/Source/shotwell/src/SortedList.vala" cmp_item = _tmp11_; #line 269 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = item; -#line 269 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = cmp_item; + _tmp12_ = cmp_item; #line 269 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp12_ == _tmp13_) { -#line 1352 "SortedList.c" - gint _tmp14_; - GeeArrayList* _tmp15_; + if (item == _tmp12_) { +#line 1284 "SortedList.c" + gint _tmp13_; + GeeArrayList* _tmp14_; + gint _tmp15_; gint _tmp16_; - gint _tmp17_; - GeeArrayList* _tmp21_; - gint _tmp22_; - gpointer _tmp23_; + GeeArrayList* _tmp20_; + gint _tmp21_; + gpointer _tmp22_; #line 271 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = mid; + _tmp13_ = mid; #line 271 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = self->priv->list; + _tmp14_ = self->priv->list; #line 271 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 271 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 271 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp14_ >= (_tmp17_ - 1)) { -#line 1370 "SortedList.c" - GeeArrayList* _tmp18_; + if (_tmp13_ >= (_tmp16_ - 1)) { +#line 1302 "SortedList.c" + GeeArrayList* _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = self->priv->list; + _tmp17_ = self->priv->list; #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" - result = _tmp20_; + result = _tmp19_; #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); #line 272 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1386 "SortedList.c" +#line 1318 "SortedList.c" } #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = self->priv->list; + _tmp20_ = self->priv->list; #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = mid; + _tmp21_ = mid; #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_ + 1); + _tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp21_ + 1); #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); #line 274 "/home/jens/Source/shotwell/src/SortedList.vala" - cmp_item = _tmp23_; -#line 1398 "SortedList.c" + cmp_item = _tmp22_; +#line 1330 "SortedList.c" } #line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = self->priv->cmp; -#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24__target = self->priv->cmp_target; + _tmp23_ = self->priv->cmp; #line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = item; + _tmp23__target = self->priv->cmp_target; #line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = cmp_item; + _tmp24_ = cmp_item; #line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_ = _tmp24_ (_tmp25_, _tmp26_, _tmp24__target); -#line 277 "/home/jens/Source/shotwell/src/SortedList.vala" - _result_ = _tmp27_; + _result_ = _tmp23_ (item, _tmp24_, _tmp23__target); #line 278 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp28_ = _result_; + _tmp25_ = _result_; #line 278 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp28_ < ((gint64) 0)) { -#line 1416 "SortedList.c" - gint _tmp29_; + if (_tmp25_ < ((gint64) 0)) { +#line 1344 "SortedList.c" + gint _tmp26_; #line 279 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp29_ = mid; + _tmp26_ = mid; #line 279 "/home/jens/Source/shotwell/src/SortedList.vala" - high = _tmp29_; -#line 1422 "SortedList.c" + high = _tmp26_; +#line 1350 "SortedList.c" } else { - gint64 _tmp30_; + gint64 _tmp27_; #line 280 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp30_ = _result_; + _tmp27_ = _result_; #line 280 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp30_ > ((gint64) 0)) { -#line 1429 "SortedList.c" - gint _tmp31_; + if (_tmp27_ > ((gint64) 0)) { +#line 1357 "SortedList.c" + gint _tmp28_; #line 281 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp31_ = mid; + _tmp28_ = mid; #line 281 "/home/jens/Source/shotwell/src/SortedList.vala" - low = _tmp31_ + 1; -#line 1435 "SortedList.c" + low = _tmp28_ + 1; +#line 1363 "SortedList.c" } else { #line 283 "/home/jens/Source/shotwell/src/SortedList.vala" result = mid; @@ -1439,18 +1367,20 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); #line 283 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1443 "SortedList.c" +#line 1371 "SortedList.c" } } #line 260 "/home/jens/Source/shotwell/src/SortedList.vala" ((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL)); -#line 1448 "SortedList.c" +#line 1376 "SortedList.c" } } } -SortedList* sorted_list_copy (SortedList* self) { +SortedList* +sorted_list_copy (SortedList* self) +{ SortedList* result = NULL; SortedList* copy = NULL; Comparator _tmp0_; @@ -1478,11 +1408,14 @@ SortedList* sorted_list_copy (SortedList* self) { result = copy; #line 292 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1482 "SortedList.c" +#line 1412 "SortedList.c" } -static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { +static gboolean +sorted_list_merge_sort (SortedList* self, + GeeList* add) +{ gboolean result = FALSE; Comparator _tmp0_; void* _tmp0__target; @@ -1491,28 +1424,26 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { gint _tmp2_; gint _tmp3_; gint _tmp4_ = 0; - GeeList* _tmp5_; gint add_count = 0; gint count = 0; + gint _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; - gint _tmp11_; gpointer* array = NULL; - gint _tmp12_; - gpointer* _tmp13_; + gint _tmp10_; + gpointer* _tmp11_; gint array_length1; gint _array_size_; gint offset = 0; - GeeList* _tmp23_; - gint _tmp33_; - gint _tmp34_; - gpointer* _tmp35_; - gint _tmp35__length1; - gint _tmp36_; - gpointer* _tmp37_; - gpointer* _tmp38_; - gint _tmp38__length1; - gint _tmp39_; + gint _tmp29_; + gint _tmp30_; + gpointer* _tmp31_; + gint _tmp31__length1; + gint _tmp32_; + gpointer* _tmp33_; + gpointer* _tmp34_; + gint _tmp34__length1; + gint _tmp35_; #line 313 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_val_if_fail (IS_SORTED_LIST (self), FALSE); #line 313 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -1532,271 +1463,261 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { #line 316 "/home/jens/Source/shotwell/src/SortedList.vala" list_count = _tmp3_; #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = add; -#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp5_ != NULL) { -#line 1539 "SortedList.c" - GeeList* _tmp6_; - gint _tmp7_; - gint _tmp8_; -#line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = add; + if (add != NULL) { +#line 1468 "SortedList.c" + gint _tmp5_; + gint _tmp6_; #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (add, GEE_TYPE_COLLECTION, GeeCollection)); #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = _tmp8_; -#line 1551 "SortedList.c" + _tmp4_ = _tmp6_; +#line 1477 "SortedList.c" } else { #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp4_ = 0; -#line 1555 "SortedList.c" +#line 1481 "SortedList.c" } #line 317 "/home/jens/Source/shotwell/src/SortedList.vala" add_count = _tmp4_; #line 319 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = list_count; + _tmp7_ = list_count; #line 319 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = add_count; + _tmp8_ = add_count; #line 319 "/home/jens/Source/shotwell/src/SortedList.vala" - count = _tmp9_ + _tmp10_; + count = _tmp7_ + _tmp8_; #line 320 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = count; + _tmp9_ = count; #line 320 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp11_ == 0) { + if (_tmp9_ == 0) { #line 321 "/home/jens/Source/shotwell/src/SortedList.vala" result = FALSE; #line 321 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1573 "SortedList.c" +#line 1499 "SortedList.c" } #line 325 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = count; + _tmp10_ = count; #line 325 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = g_new0 (gpointer, _tmp12_); + _tmp11_ = g_new0 (gpointer, _tmp10_); #line 325 "/home/jens/Source/shotwell/src/SortedList.vala" - array = _tmp13_; + array = _tmp11_; #line 325 "/home/jens/Source/shotwell/src/SortedList.vala" - array_length1 = _tmp12_; + array_length1 = _tmp10_; #line 325 "/home/jens/Source/shotwell/src/SortedList.vala" _array_size_ = array_length1; #line 326 "/home/jens/Source/shotwell/src/SortedList.vala" offset = 0; #line 328 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1589 "SortedList.c" - gint _tmp14_; +#line 1515 "SortedList.c" + gint _tmp12_; + gint _tmp13_; + gpointer* _tmp14_; + gint _tmp14__length1; gint _tmp15_; - gpointer* _tmp16_; - gint _tmp16__length1; + GeeArrayList* _tmp16_; gint _tmp17_; - GeeArrayList* _tmp18_; - gint _tmp19_; - gpointer _tmp20_; - gpointer _tmp21_; - gint _tmp22_; + gpointer _tmp18_; + gpointer _tmp19_; + gint _tmp20_; #line 328 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = offset; + _tmp12_ = offset; #line 328 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = list_count; + _tmp13_ = list_count; #line 328 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp14_ < _tmp15_)) { + if (!(_tmp12_ < _tmp13_)) { #line 328 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1608 "SortedList.c" +#line 1534 "SortedList.c" } #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = array; + _tmp14_ = array; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16__length1 = array_length1; + _tmp14__length1 = array_length1; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = offset; + _tmp15_ = offset; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = self->priv->list; + _tmp16_ = self->priv->list; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = offset; + _tmp17_ = offset; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp19_); + _tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_); #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp16_[_tmp17_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp16_[_tmp17_] = (self->priv->g_destroy_func (_tmp16_[_tmp17_]), NULL)); + ((_tmp14_[_tmp15_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp14_[_tmp15_] = (self->priv->g_destroy_func (_tmp14_[_tmp15_]), NULL)); #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_[_tmp17_] = _tmp20_; + _tmp14_[_tmp15_] = _tmp18_; #line 329 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = _tmp16_[_tmp17_]; + _tmp19_ = _tmp14_[_tmp15_]; #line 330 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = offset; + _tmp20_ = offset; #line 330 "/home/jens/Source/shotwell/src/SortedList.vala" - offset = _tmp22_ + 1; -#line 1632 "SortedList.c" + offset = _tmp20_ + 1; +#line 1558 "SortedList.c" } #line 333 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = add; -#line 333 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp23_ != NULL) { -#line 1638 "SortedList.c" + if (add != NULL) { +#line 1562 "SortedList.c" gint add_ctr = 0; #line 334 "/home/jens/Source/shotwell/src/SortedList.vala" add_ctr = 0; #line 335 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1644 "SortedList.c" +#line 1568 "SortedList.c" + gint _tmp21_; + gint _tmp22_; + gpointer* _tmp23_; + gint _tmp23__length1; gint _tmp24_; gint _tmp25_; - gpointer* _tmp26_; - gint _tmp26__length1; - gint _tmp27_; - GeeList* _tmp28_; - gint _tmp29_; - gpointer _tmp30_; - gpointer _tmp31_; - gint _tmp32_; + gpointer _tmp26_; + gpointer _tmp27_; + gint _tmp28_; #line 335 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = offset; + _tmp21_ = offset; #line 335 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = count; + _tmp22_ = count; #line 335 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp24_ < _tmp25_)) { + if (!(_tmp21_ < _tmp22_)) { #line 335 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1663 "SortedList.c" +#line 1586 "SortedList.c" } #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = array; -#line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26__length1 = array_length1; + _tmp23_ = array; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_ = offset; + _tmp23__length1 = array_length1; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp28_ = add; + _tmp24_ = offset; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp29_ = add_ctr; + _tmp25_ = add_ctr; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - add_ctr = _tmp29_ + 1; + add_ctr = _tmp25_ + 1; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp30_ = gee_list_get (_tmp28_, _tmp29_); + _tmp26_ = gee_list_get (add, _tmp25_); #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp26_[_tmp27_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp26_[_tmp27_] = (self->priv->g_destroy_func (_tmp26_[_tmp27_]), NULL)); + ((_tmp23_[_tmp24_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp23_[_tmp24_] = (self->priv->g_destroy_func (_tmp23_[_tmp24_]), NULL)); #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_[_tmp27_] = _tmp30_; + _tmp23_[_tmp24_] = _tmp26_; #line 336 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp31_ = _tmp26_[_tmp27_]; + _tmp27_ = _tmp23_[_tmp24_]; #line 337 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp32_ = offset; + _tmp28_ = offset; #line 337 "/home/jens/Source/shotwell/src/SortedList.vala" - offset = _tmp32_ + 1; -#line 1689 "SortedList.c" + offset = _tmp28_ + 1; +#line 1610 "SortedList.c" } } #line 341 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp33_ = offset; + _tmp29_ = offset; #line 341 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp34_ = count; + _tmp30_ = count; #line 341 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp33_ == _tmp34_, "offset == count"); + _vala_assert (_tmp29_ == _tmp30_, "offset == count"); #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp35_ = array; + _tmp31_ = array; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp35__length1 = array_length1; + _tmp31__length1 = array_length1; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp36_ = count; + _tmp32_ = count; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp37_ = g_new0 (gpointer, _tmp36_); + _tmp33_ = g_new0 (gpointer, _tmp32_); #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp38_ = _tmp37_; + _tmp34_ = _tmp33_; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp38__length1 = _tmp36_; + _tmp34__length1 = _tmp32_; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp39_ = count; + _tmp35_ = count; #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _sorted_list_merge_sort (self, _tmp35_, _tmp35__length1, _tmp38_, _tmp36_, 0, _tmp39_ - 1); + _sorted_list_merge_sort (self, _tmp31_, _tmp31__length1, _tmp34_, _tmp32_, 0, _tmp35_ - 1); #line 343 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp38_ = (_vala_array_free (_tmp38_, _tmp38__length1, (GDestroyNotify) self->priv->g_destroy_func), NULL); + _tmp34_ = (_vala_array_free (_tmp34_, _tmp34__length1, (GDestroyNotify) self->priv->g_destroy_func), NULL); #line 345 "/home/jens/Source/shotwell/src/SortedList.vala" offset = 0; #line 346 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1720 "SortedList.c" - gint _tmp40_; +#line 1641 "SortedList.c" + gint _tmp36_; + gint _tmp37_; + GeeArrayList* _tmp38_; + gint _tmp39_; + gpointer* _tmp40_; + gint _tmp40__length1; gint _tmp41_; - GeeArrayList* _tmp42_; + gconstpointer _tmp42_; gint _tmp43_; - gpointer* _tmp44_; - gint _tmp44__length1; - gint _tmp45_; - gconstpointer _tmp46_; - gint _tmp47_; #line 346 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp40_ = offset; + _tmp36_ = offset; #line 346 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp41_ = list_count; + _tmp37_ = list_count; #line 346 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp40_ < _tmp41_)) { + if (!(_tmp36_ < _tmp37_)) { #line 346 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1738 "SortedList.c" +#line 1659 "SortedList.c" } #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp42_ = self->priv->list; + _tmp38_ = self->priv->list; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp43_ = offset; + _tmp39_ = offset; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp44_ = array; + _tmp40_ = array; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp44__length1 = array_length1; + _tmp40__length1 = array_length1; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp45_ = offset; + _tmp41_ = offset; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp46_ = _tmp44_[_tmp45_]; + _tmp42_ = _tmp40_[_tmp41_]; #line 347 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp43_, _tmp46_); + gee_abstract_list_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp39_, _tmp42_); #line 348 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp47_ = offset; + _tmp43_ = offset; #line 348 "/home/jens/Source/shotwell/src/SortedList.vala" - offset = _tmp47_ + 1; -#line 1758 "SortedList.c" + offset = _tmp43_ + 1; +#line 1679 "SortedList.c" } #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 1762 "SortedList.c" - gint _tmp48_; +#line 1683 "SortedList.c" + gint _tmp44_; + gint _tmp45_; + GeeArrayList* _tmp46_; + gint _tmp47_; + gpointer* _tmp48_; + gint _tmp48__length1; gint _tmp49_; - GeeArrayList* _tmp50_; + gconstpointer _tmp50_; gint _tmp51_; - gpointer* _tmp52_; - gint _tmp52__length1; - gint _tmp53_; - gconstpointer _tmp54_; - gint _tmp55_; #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp48_ = offset; + _tmp44_ = offset; #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp49_ = count; + _tmp45_ = count; #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp48_ < _tmp49_)) { + if (!(_tmp44_ < _tmp45_)) { #line 351 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 1780 "SortedList.c" +#line 1701 "SortedList.c" } #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp50_ = self->priv->list; + _tmp46_ = self->priv->list; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp51_ = offset; + _tmp47_ = offset; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp52_ = array; + _tmp48_ = array; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp52__length1 = array_length1; + _tmp48__length1 = array_length1; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp53_ = offset; + _tmp49_ = offset; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp54_ = _tmp52_[_tmp53_]; + _tmp50_ = _tmp48_[_tmp49_]; #line 352 "/home/jens/Source/shotwell/src/SortedList.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp51_, _tmp54_); + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp47_, _tmp50_); #line 353 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp55_ = offset; + _tmp51_ = offset; #line 353 "/home/jens/Source/shotwell/src/SortedList.vala" - offset = _tmp55_ + 1; -#line 1800 "SortedList.c" + offset = _tmp51_ + 1; +#line 1721 "SortedList.c" } #line 356 "/home/jens/Source/shotwell/src/SortedList.vala" result = TRUE; @@ -1804,560 +1725,402 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) { array = (_vala_array_free (array, array_length1, (GDestroyNotify) self->priv->g_destroy_func), NULL); #line 356 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 1808 "SortedList.c" +#line 1729 "SortedList.c" } -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_sort (SortedList* self, + gpointer* array, + int array_length1, + gpointer* scratch, + int scratch_length1, + gint start_index, + gint end_index) +{ + gint count = 0; gint _tmp0_; + gint middle_index = 0; gint _tmp1_; - gint count = 0; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint middle_index = 0; + Comparator _tmp4_; + void* _tmp4__target; 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_; + gconstpointer _tmp6_; + gint _tmp7_; + gconstpointer _tmp8_; #line 359 "/home/jens/Source/shotwell/src/SortedList.vala" g_return_if_fail (IS_SORTED_LIST (self)); #line 360 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp0_ = start_index; -#line 360 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = end_index; -#line 360 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp0_ <= _tmp1_, "start_index <= end_index"); + _vala_assert (start_index <= end_index, "start_index <= end_index"); #line 362 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = end_index; -#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = start_index; -#line 362 "/home/jens/Source/shotwell/src/SortedList.vala" - count = (_tmp2_ - _tmp3_) + 1; + count = (end_index - start_index) + 1; #line 363 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = count; + _tmp0_ = count; #line 363 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp4_ <= 1) { + if (_tmp0_ <= 1) { #line 364 "/home/jens/Source/shotwell/src/SortedList.vala" return; -#line 1865 "SortedList.c" +#line 1766 "SortedList.c" } #line 366 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = start_index; -#line 366 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = count; + _tmp1_ = count; #line 366 "/home/jens/Source/shotwell/src/SortedList.vala" - middle_index = _tmp5_ + (_tmp6_ / 2); -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = array; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7__length1 = array_length1; + middle_index = start_index + (_tmp1_ / 2); #line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = scratch; + _tmp2_ = middle_index; #line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8__length1 = scratch_length1; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = start_index; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = middle_index; -#line 368 "/home/jens/Source/shotwell/src/SortedList.vala" - _sorted_list_merge_sort (self, _tmp7_, _tmp7__length1, _tmp8_, _tmp8__length1, _tmp9_, _tmp10_ - 1); -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = array; + _sorted_list_merge_sort (self, array, array_length1, scratch, scratch_length1, start_index, _tmp2_ - 1); #line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11__length1 = array_length1; + _tmp3_ = middle_index; #line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = scratch; -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12__length1 = scratch_length1; -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = middle_index; -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = end_index; -#line 369 "/home/jens/Source/shotwell/src/SortedList.vala" - _sorted_list_merge_sort (self, _tmp11_, _tmp11__length1, _tmp12_, _tmp12__length1, _tmp13_, _tmp14_); -#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = self->priv->cmp; -#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15__target = self->priv->cmp_target; -#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = array; -#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16__length1 = array_length1; -#line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = middle_index; + _sorted_list_merge_sort (self, array, array_length1, scratch, scratch_length1, _tmp3_, end_index); #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = _tmp16_[_tmp17_ - 1]; + _tmp4_ = self->priv->cmp; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = array; + _tmp4__target = self->priv->cmp_target; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19__length1 = array_length1; + _tmp5_ = middle_index; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = middle_index; + _tmp6_ = array[_tmp5_ - 1]; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = _tmp19_[_tmp20_]; + _tmp7_ = middle_index; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = _tmp15_ (_tmp18_, _tmp21_, _tmp15__target); + _tmp8_ = array[_tmp7_]; #line 371 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp22_ > ((gint64) 0)) { -#line 1925 "SortedList.c" - gpointer* _tmp23_; - gint _tmp23__length1; - gpointer* _tmp24_; - gint _tmp24__length1; - gint _tmp25_; - gint _tmp26_; - gint _tmp27_; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = array; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23__length1 = array_length1; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = scratch; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24__length1 = scratch_length1; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = start_index; -#line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = middle_index; + if (_tmp4_ (_tmp6_, _tmp8_, _tmp4__target) > ((gint64) 0)) { +#line 1794 "SortedList.c" + gint _tmp9_; #line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_ = end_index; + _tmp9_ = middle_index; #line 372 "/home/jens/Source/shotwell/src/SortedList.vala" - sorted_list_merge (self, _tmp23_, _tmp23__length1, _tmp24_, _tmp24__length1, _tmp25_, _tmp26_, _tmp27_); -#line 1949 "SortedList.c" + sorted_list_merge (self, array, array_length1, scratch, scratch_length1, start_index, _tmp9_, end_index); +#line 1800 "SortedList.c" } } -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_; - gint _tmp1_; +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 count = 0; - gint _tmp2_; - gint _tmp3_; gint left_start = 0; - gint _tmp4_; gint left_end = 0; - gint _tmp5_; gint right_start = 0; - gint _tmp6_; gint right_end = 0; - gint _tmp7_; - gpointer* _tmp8_; - gint _tmp8__length1; - gint _tmp9_; + gint _tmp0_; gint scratch_index = 0; - gint _tmp57_; - gint _tmp58_; + gint _tmp39_; + gint _tmp40_; #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" - _tmp0_ = start_index; -#line 376 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = end_index; -#line 376 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp0_ < _tmp1_, "start_index < end_index"); -#line 378 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp2_ = end_index; + _vala_assert (start_index < end_index, "start_index < end_index"); #line 378 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = start_index; -#line 378 "/home/jens/Source/shotwell/src/SortedList.vala" - count = (_tmp2_ - _tmp3_) + 1; -#line 379 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp4_ = start_index; + count = (end_index - start_index) + 1; #line 379 "/home/jens/Source/shotwell/src/SortedList.vala" - left_start = _tmp4_; -#line 380 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp5_ = middle_index; + left_start = start_index; #line 380 "/home/jens/Source/shotwell/src/SortedList.vala" - left_end = _tmp5_ - 1; + left_end = middle_index - 1; #line 381 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp6_ = middle_index; -#line 381 "/home/jens/Source/shotwell/src/SortedList.vala" - right_start = _tmp6_; -#line 382 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp7_ = end_index; + right_start = middle_index; #line 382 "/home/jens/Source/shotwell/src/SortedList.vala" - right_end = _tmp7_; -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8_ = scratch; + right_end = end_index; #line 384 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp8__length1 = scratch_length1; -#line 384 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp9_ = count; + _tmp0_ = count; #line 384 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp8__length1 >= _tmp9_, "scratch.length >= count"); + _vala_assert (scratch_length1 >= _tmp0_, "scratch.length >= count"); #line 385 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = 0; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2016 "SortedList.c" - gboolean _tmp10_ = FALSE; - gint _tmp11_; - gint _tmp12_; +#line 1846 "SortedList.c" + gboolean _tmp1_ = FALSE; + gint _tmp2_; + gint _tmp3_; gpointer left = NULL; - gpointer* _tmp15_; - gint _tmp15__length1; - gint _tmp16_; - gconstpointer _tmp17_; - gpointer _tmp18_; + gint _tmp6_; + gconstpointer _tmp7_; + gpointer _tmp8_; gpointer right = NULL; - gpointer* _tmp19_; - gint _tmp19__length1; - gint _tmp20_; - gconstpointer _tmp21_; - gpointer _tmp22_; - Comparator _tmp23_; - void* _tmp23__target; - gconstpointer _tmp24_; - gconstpointer _tmp25_; - gint64 _tmp26_; + gint _tmp9_; + gconstpointer _tmp10_; + gpointer _tmp11_; + Comparator _tmp12_; + void* _tmp12__target; + gconstpointer _tmp13_; + gconstpointer _tmp14_; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp11_ = left_start; + _tmp2_ = left_start; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp12_ = left_end; + _tmp3_ = left_end; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp11_ <= _tmp12_) { -#line 2043 "SortedList.c" - gint _tmp13_; - gint _tmp14_; + if (_tmp2_ <= _tmp3_) { +#line 1868 "SortedList.c" + gint _tmp4_; + gint _tmp5_; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp13_ = right_start; + _tmp4_ = right_start; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp14_ = right_end; + _tmp5_ = right_end; #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = _tmp13_ <= _tmp14_; -#line 2052 "SortedList.c" + _tmp1_ = _tmp4_ <= _tmp5_; +#line 1877 "SortedList.c" } else { #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp10_ = FALSE; -#line 2056 "SortedList.c" + _tmp1_ = FALSE; +#line 1881 "SortedList.c" } #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!_tmp10_) { + if (!_tmp1_) { #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2062 "SortedList.c" +#line 1887 "SortedList.c" } #line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15_ = array; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp15__length1 = array_length1; -#line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp16_ = left_start; + _tmp6_ = left_start; #line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp17_ = _tmp15_[_tmp16_]; + _tmp7_ = array[_tmp6_]; #line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp18_ = ((_tmp17_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp17_) : ((gpointer) _tmp17_); + _tmp8_ = ((_tmp7_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp7_) : ((gpointer) _tmp7_); #line 388 "/home/jens/Source/shotwell/src/SortedList.vala" - left = _tmp18_; + left = _tmp8_; #line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19_ = array; + _tmp9_ = right_start; #line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp19__length1 = array_length1; + _tmp10_ = array[_tmp9_]; #line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp20_ = right_start; + _tmp11_ = ((_tmp10_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp10_) : ((gpointer) _tmp10_); #line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp21_ = _tmp19_[_tmp20_]; -#line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp22_ = ((_tmp21_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp21_) : ((gpointer) _tmp21_); -#line 389 "/home/jens/Source/shotwell/src/SortedList.vala" - right = _tmp22_; -#line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23_ = self->priv->cmp; + right = _tmp11_; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp23__target = self->priv->cmp_target; + _tmp12_ = self->priv->cmp; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp24_ = left; + _tmp12__target = self->priv->cmp_target; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp25_ = right; + _tmp13_ = left; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp26_ = _tmp23_ (_tmp24_, _tmp25_, _tmp23__target); + _tmp14_ = right; #line 391 "/home/jens/Source/shotwell/src/SortedList.vala" - if (_tmp26_ <= ((gint64) 0)) { -#line 2100 "SortedList.c" - gpointer* _tmp27_; - gint _tmp27__length1; - gint _tmp28_; - gconstpointer _tmp29_; - gpointer _tmp30_; - gpointer _tmp31_; - gint _tmp32_; -#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_ = scratch; + if (_tmp12_ (_tmp13_, _tmp14_, _tmp12__target) <= ((gint64) 0)) { +#line 1915 "SortedList.c" + gint _tmp15_; + gconstpointer _tmp16_; + gpointer _tmp17_; + gpointer _tmp18_; + gint _tmp19_; #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27__length1 = scratch_length1; + _tmp15_ = scratch_index; #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp28_ = scratch_index; + scratch_index = _tmp15_ + 1; #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - scratch_index = _tmp28_ + 1; + _tmp16_ = left; #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp29_ = left; + _tmp17_ = ((_tmp16_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp16_) : ((gpointer) _tmp16_); #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp30_ = ((_tmp29_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp29_) : ((gpointer) _tmp29_); + ((scratch[_tmp15_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (scratch[_tmp15_] = (self->priv->g_destroy_func (scratch[_tmp15_]), NULL)); #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp27_[_tmp28_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp27_[_tmp28_] = (self->priv->g_destroy_func (_tmp27_[_tmp28_]), NULL)); + scratch[_tmp15_] = _tmp17_; #line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp27_[_tmp28_] = _tmp30_; -#line 392 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp31_ = _tmp27_[_tmp28_]; + _tmp18_ = scratch[_tmp15_]; #line 393 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp32_ = left_start; + _tmp19_ = left_start; #line 393 "/home/jens/Source/shotwell/src/SortedList.vala" - left_start = _tmp32_ + 1; -#line 2130 "SortedList.c" + left_start = _tmp19_ + 1; +#line 1939 "SortedList.c" } else { - gpointer* _tmp33_; - gint _tmp33__length1; - gint _tmp34_; - gconstpointer _tmp35_; - gpointer _tmp36_; - gpointer _tmp37_; - gint _tmp38_; -#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp33_ = scratch; -#line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp33__length1 = scratch_length1; + gint _tmp20_; + gconstpointer _tmp21_; + gpointer _tmp22_; + gpointer _tmp23_; + gint _tmp24_; #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp34_ = scratch_index; + _tmp20_ = scratch_index; #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - scratch_index = _tmp34_ + 1; + scratch_index = _tmp20_ + 1; #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp35_ = right; + _tmp21_ = right; #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp36_ = ((_tmp35_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp35_) : ((gpointer) _tmp35_); + _tmp22_ = ((_tmp21_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp21_) : ((gpointer) _tmp21_); #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp33_[_tmp34_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp33_[_tmp34_] = (self->priv->g_destroy_func (_tmp33_[_tmp34_]), NULL)); + ((scratch[_tmp20_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (scratch[_tmp20_] = (self->priv->g_destroy_func (scratch[_tmp20_]), NULL)); #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp33_[_tmp34_] = _tmp36_; + scratch[_tmp20_] = _tmp22_; #line 395 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp37_ = _tmp33_[_tmp34_]; + _tmp23_ = scratch[_tmp20_]; #line 396 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp38_ = right_start; + _tmp24_ = right_start; #line 396 "/home/jens/Source/shotwell/src/SortedList.vala" - right_start = _tmp38_ + 1; -#line 2161 "SortedList.c" + right_start = _tmp24_ + 1; +#line 1964 "SortedList.c" } #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" ((right == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (right = (self->priv->g_destroy_func (right), NULL)); #line 387 "/home/jens/Source/shotwell/src/SortedList.vala" ((left == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (left = (self->priv->g_destroy_func (left), NULL)); -#line 2167 "SortedList.c" +#line 1970 "SortedList.c" } #line 400 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2171 "SortedList.c" - 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 1974 "SortedList.c" + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; + gint _tmp28_; + gconstpointer _tmp29_; + gpointer _tmp30_; + gpointer _tmp31_; #line 400 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp39_ = left_start; + _tmp25_ = left_start; #line 400 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp40_ = left_end; + _tmp26_ = left_end; #line 400 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp39_ <= _tmp40_)) { + if (!(_tmp25_ <= _tmp26_)) { #line 400 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2191 "SortedList.c" +#line 1990 "SortedList.c" } #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp41_ = scratch; + _tmp27_ = scratch_index; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp41__length1 = scratch_length1; + scratch_index = _tmp27_ + 1; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp42_ = scratch_index; + _tmp28_ = left_start; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - scratch_index = _tmp42_ + 1; + left_start = _tmp28_ + 1; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp43_ = array; + _tmp29_ = array[_tmp28_]; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp43__length1 = array_length1; + _tmp30_ = ((_tmp29_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp29_) : ((gpointer) _tmp29_); #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp44_ = left_start; + ((scratch[_tmp27_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (scratch[_tmp27_] = (self->priv->g_destroy_func (scratch[_tmp27_]), NULL)); #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - left_start = _tmp44_ + 1; + scratch[_tmp27_] = _tmp30_; #line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp45_ = _tmp43_[_tmp44_]; -#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp46_ = ((_tmp45_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp45_) : ((gpointer) _tmp45_); -#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp41_[_tmp42_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp41_[_tmp42_] = (self->priv->g_destroy_func (_tmp41_[_tmp42_]), NULL)); -#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp41_[_tmp42_] = _tmp46_; -#line 401 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp47_ = _tmp41_[_tmp42_]; -#line 2219 "SortedList.c" + _tmp31_ = scratch[_tmp27_]; +#line 2010 "SortedList.c" } #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2223 "SortedList.c" - 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 2014 "SortedList.c" + gint _tmp32_; + gint _tmp33_; + gint _tmp34_; + gint _tmp35_; + gconstpointer _tmp36_; + gpointer _tmp37_; + gpointer _tmp38_; #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp48_ = right_start; + _tmp32_ = right_start; #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp49_ = right_end; + _tmp33_ = right_end; #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp48_ <= _tmp49_)) { + if (!(_tmp32_ <= _tmp33_)) { #line 403 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2243 "SortedList.c" +#line 2030 "SortedList.c" } #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp50_ = scratch; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp50__length1 = scratch_length1; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp51_ = scratch_index; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - scratch_index = _tmp51_ + 1; + _tmp34_ = scratch_index; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp52_ = array; + scratch_index = _tmp34_ + 1; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp52__length1 = array_length1; + _tmp35_ = right_start; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp53_ = right_start; + right_start = _tmp35_ + 1; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - right_start = _tmp53_ + 1; + _tmp36_ = array[_tmp35_]; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp54_ = _tmp52_[_tmp53_]; + _tmp37_ = ((_tmp36_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp36_) : ((gpointer) _tmp36_); #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp55_ = ((_tmp54_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp54_) : ((gpointer) _tmp54_); + ((scratch[_tmp34_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (scratch[_tmp34_] = (self->priv->g_destroy_func (scratch[_tmp34_]), NULL)); #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp50_[_tmp51_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp50_[_tmp51_] = (self->priv->g_destroy_func (_tmp50_[_tmp51_]), NULL)); + scratch[_tmp34_] = _tmp37_; #line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp50_[_tmp51_] = _tmp55_; -#line 404 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp56_ = _tmp50_[_tmp51_]; -#line 2271 "SortedList.c" + _tmp38_ = scratch[_tmp34_]; +#line 2050 "SortedList.c" } #line 406 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp57_ = scratch_index; + _tmp39_ = scratch_index; #line 406 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp58_ = count; + _tmp40_ = count; #line 406 "/home/jens/Source/shotwell/src/SortedList.vala" - _vala_assert (_tmp57_ == _tmp58_, "scratch_index == count"); + _vala_assert (_tmp39_ == _tmp40_, "scratch_index == count"); #line 408 "/home/jens/Source/shotwell/src/SortedList.vala" scratch_index = 0; -#line 2281 "SortedList.c" +#line 2060 "SortedList.c" { gint list_index = 0; - gint _tmp59_; -#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp59_ = start_index; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - list_index = _tmp59_; -#line 2289 "SortedList.c" + list_index = start_index; +#line 2065 "SortedList.c" { - gboolean _tmp60_ = FALSE; + gboolean _tmp41_ = FALSE; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp60_ = TRUE; + _tmp41_ = TRUE; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" while (TRUE) { -#line 2296 "SortedList.c" - 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 2072 "SortedList.c" + gint _tmp43_; + gint _tmp44_; + gint _tmp45_; + gconstpointer _tmp46_; + gpointer _tmp47_; + gpointer _tmp48_; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!_tmp60_) { -#line 2310 "SortedList.c" - gint _tmp61_; + if (!_tmp41_) { +#line 2081 "SortedList.c" + gint _tmp42_; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp61_ = list_index; + _tmp42_ = list_index; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - list_index = _tmp61_ + 1; -#line 2316 "SortedList.c" + list_index = _tmp42_ + 1; +#line 2087 "SortedList.c" } #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp60_ = FALSE; + _tmp41_ = FALSE; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp62_ = list_index; + _tmp43_ = list_index; #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp63_ = end_index; -#line 409 "/home/jens/Source/shotwell/src/SortedList.vala" - if (!(_tmp62_ <= _tmp63_)) { + if (!(_tmp43_ <= end_index)) { #line 409 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2328 "SortedList.c" +#line 2097 "SortedList.c" } #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp64_ = array; -#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp64__length1 = array_length1; + _tmp44_ = list_index; #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp65_ = list_index; + _tmp45_ = scratch_index; #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp66_ = scratch; + scratch_index = _tmp45_ + 1; #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp66__length1 = scratch_length1; + _tmp46_ = scratch[_tmp45_]; #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp67_ = scratch_index; + _tmp47_ = ((_tmp46_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp46_) : ((gpointer) _tmp46_); #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - scratch_index = _tmp67_ + 1; + ((array[_tmp44_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (array[_tmp44_] = (self->priv->g_destroy_func (array[_tmp44_]), NULL)); #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp68_ = _tmp66_[_tmp67_]; + array[_tmp44_] = _tmp47_; #line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp69_ = ((_tmp68_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp68_) : ((gpointer) _tmp68_); -#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - ((_tmp64_[_tmp65_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp64_[_tmp65_] = (self->priv->g_destroy_func (_tmp64_[_tmp65_]), NULL)); -#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp64_[_tmp65_] = _tmp69_; -#line 410 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp70_ = _tmp64_[_tmp65_]; -#line 2354 "SortedList.c" + _tmp48_ = array[_tmp44_]; +#line 2115 "SortedList.c" } } } } -static GType sorted_list_real_get_element_type (GeeTraversable* base) { +static GType +sorted_list_real_get_element_type (GeeTraversable* base) +{ GType result; SortedList* self; #line 19 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2366,11 +2129,13 @@ static GType sorted_list_real_get_element_type (GeeTraversable* base) { result = self->priv->g_type; #line 19 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2370 "SortedList.c" +#line 2133 "SortedList.c" } -static gboolean sorted_list_real_get_read_only (GeeCollection* base) { +static gboolean +sorted_list_real_get_read_only (GeeCollection* base) +{ gboolean result; SortedList* self; GeeArrayList* _tmp0_; @@ -2388,11 +2153,13 @@ static gboolean sorted_list_real_get_read_only (GeeCollection* base) { result = _tmp2_; #line 23 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2392 "SortedList.c" +#line 2157 "SortedList.c" } -static gboolean sorted_list_real_get_is_empty (GeeCollection* base) { +static gboolean +sorted_list_real_get_is_empty (GeeCollection* base) +{ gboolean result; SortedList* self; GeeArrayList* _tmp0_; @@ -2410,11 +2177,13 @@ static gboolean sorted_list_real_get_is_empty (GeeCollection* base) { result = _tmp2_; #line 117 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2414 "SortedList.c" +#line 2181 "SortedList.c" } -static gint sorted_list_real_get_size (GeeCollection* base) { +static gint +sorted_list_real_get_size (GeeCollection* base) +{ gint result; SortedList* self; GeeArrayList* _tmp0_; @@ -2432,11 +2201,13 @@ static gint sorted_list_real_get_size (GeeCollection* base) { result = _tmp2_; #line 134 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2436 "SortedList.c" +#line 2205 "SortedList.c" } -static GeeCollection* sorted_list_real_get_read_only_view (GeeCollection* base) { +static GeeCollection* +sorted_list_real_get_read_only_view (GeeCollection* base) +{ GeeCollection* result; SortedList* self; GeeArrayList* _tmp0_; @@ -2454,11 +2225,13 @@ static GeeCollection* sorted_list_real_get_read_only_view (GeeCollection* base) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 200 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2458 "SortedList.c" +#line 2229 "SortedList.c" } -GeeList* sorted_list_get_read_only_view_as_list (SortedList* self) { +GeeList* +sorted_list_get_read_only_view_as_list (SortedList* self) +{ GeeList* result; GeeArrayList* _tmp0_; GeeBidirList* _tmp1_; @@ -2475,11 +2248,13 @@ GeeList* sorted_list_get_read_only_view_as_list (SortedList* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); #line 206 "/home/jens/Source/shotwell/src/SortedList.vala" return result; -#line 2479 "SortedList.c" +#line 2252 "SortedList.c" } -static void sorted_list_class_init (SortedListClass * klass) { +static void +sorted_list_class_init (SortedListClass * klass) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2491,49 +2266,57 @@ static void sorted_list_class_init (SortedListClass * klass) { #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_CLASS (klass)->finalize = sorted_list_finalize; #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 9 "/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)); + 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_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - 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)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_ELEMENT_TYPE_PROPERTY, sorted_list_properties[SORTED_LIST_ELEMENT_TYPE_PROPERTY] = g_param_spec_gtype ("element-type", "element-type", "element-type", G_TYPE_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - 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)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_PROPERTY, sorted_list_properties[SORTED_LIST_READ_ONLY_PROPERTY] = g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - 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)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_IS_EMPTY_PROPERTY, sorted_list_properties[SORTED_LIST_IS_EMPTY_PROPERTY] = g_param_spec_boolean ("is-empty", "is-empty", "is-empty", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - 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)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_SIZE_PROPERTY, sorted_list_properties[SORTED_LIST_SIZE_PROPERTY] = g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - 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)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_PROPERTY, sorted_list_properties[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_STRINGS | G_PARAM_READABLE)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" - 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 2512 "SortedList.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY, sorted_list_properties[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_STRINGS | G_PARAM_READABLE)); +#line 2287 "SortedList.c" } -static GType sorted_list_gee_traversable_get_g_type (SortedList* self) { +static GType +sorted_list_gee_traversable_get_g_type (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_type; -#line 2519 "SortedList.c" +#line 2296 "SortedList.c" } -static GBoxedCopyFunc sorted_list_gee_traversable_get_g_dup_func (SortedList* self) { +static GBoxedCopyFunc +sorted_list_gee_traversable_get_g_dup_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_dup_func; -#line 2526 "SortedList.c" +#line 2305 "SortedList.c" } -static GDestroyNotify sorted_list_gee_traversable_get_g_destroy_func (SortedList* self) { +static GDestroyNotify +sorted_list_gee_traversable_get_g_destroy_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_destroy_func; -#line 2533 "SortedList.c" +#line 2314 "SortedList.c" } -static void sorted_list_gee_traversable_interface_init (GeeTraversableIface * iface) { +static void +sorted_list_gee_traversable_interface_init (GeeTraversableIface * iface) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_gee_traversable_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2546,32 +2329,40 @@ static void sorted_list_gee_traversable_interface_init (GeeTraversableIface * if iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_destroy_func; #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_element_type = sorted_list_real_get_element_type; -#line 2550 "SortedList.c" +#line 2333 "SortedList.c" } -static GType sorted_list_gee_iterable_get_g_type (SortedList* self) { +static GType +sorted_list_gee_iterable_get_g_type (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_type; -#line 2557 "SortedList.c" +#line 2342 "SortedList.c" } -static GBoxedCopyFunc sorted_list_gee_iterable_get_g_dup_func (SortedList* self) { +static GBoxedCopyFunc +sorted_list_gee_iterable_get_g_dup_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_dup_func; -#line 2564 "SortedList.c" +#line 2351 "SortedList.c" } -static GDestroyNotify sorted_list_gee_iterable_get_g_destroy_func (SortedList* self) { +static GDestroyNotify +sorted_list_gee_iterable_get_g_destroy_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_destroy_func; -#line 2571 "SortedList.c" +#line 2360 "SortedList.c" } -static void sorted_list_gee_iterable_interface_init (GeeIterableIface * iface) { +static void +sorted_list_gee_iterable_interface_init (GeeIterableIface * iface) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_gee_iterable_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2582,32 +2373,40 @@ static void sorted_list_gee_iterable_interface_init (GeeIterableIface * iface) { iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_dup_func; #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_g_destroy_func = (GDestroyNotify (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_destroy_func; -#line 2586 "SortedList.c" +#line 2377 "SortedList.c" } -static GType sorted_list_gee_collection_get_g_type (SortedList* self) { +static GType +sorted_list_gee_collection_get_g_type (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_type; -#line 2593 "SortedList.c" +#line 2386 "SortedList.c" } -static GBoxedCopyFunc sorted_list_gee_collection_get_g_dup_func (SortedList* self) { +static GBoxedCopyFunc +sorted_list_gee_collection_get_g_dup_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_dup_func; -#line 2600 "SortedList.c" +#line 2395 "SortedList.c" } -static GDestroyNotify sorted_list_gee_collection_get_g_destroy_func (SortedList* self) { +static GDestroyNotify +sorted_list_gee_collection_get_g_destroy_func (SortedList* self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" return self->priv->g_destroy_func; -#line 2607 "SortedList.c" +#line 2404 "SortedList.c" } -static void sorted_list_gee_collection_interface_init (GeeCollectionIface * iface) { +static void +sorted_list_gee_collection_interface_init (GeeCollectionIface * iface) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" sorted_list_gee_collection_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2642,18 +2441,22 @@ static void sorted_list_gee_collection_interface_init (GeeCollectionIface * ifac iface->get_size = sorted_list_real_get_size; #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" iface->get_read_only_view = sorted_list_real_get_read_only_view; -#line 2646 "SortedList.c" +#line 2445 "SortedList.c" } -static void sorted_list_instance_init (SortedList * self) { +static void +sorted_list_instance_init (SortedList * self) +{ #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" self->priv = SORTED_LIST_GET_PRIVATE (self); -#line 2653 "SortedList.c" +#line 2454 "SortedList.c" } -static void sorted_list_finalize (GObject * obj) { +static void +sorted_list_finalize (GObject * obj) +{ SortedList * self; #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SORTED_LIST, SortedList); @@ -2661,11 +2464,13 @@ static void sorted_list_finalize (GObject * obj) { _g_object_unref0 (self->priv->list); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_CLASS (sorted_list_parent_class)->finalize (obj); -#line 2665 "SortedList.c" +#line 2468 "SortedList.c" } -GType sorted_list_get_type (void) { +GType +sorted_list_get_type (void) +{ static volatile gsize sorted_list_type_id__volatile = 0; if (g_once_init_enter (&sorted_list_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SortedListClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sorted_list_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SortedList), 0, (GInstanceInitFunc) sorted_list_instance_init, NULL }; @@ -2683,7 +2488,12 @@ GType sorted_list_get_type (void) { } -static void _vala_sorted_list_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_sorted_list_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SortedList * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SORTED_LIST, SortedList); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2724,18 +2534,23 @@ static void _vala_sorted_list_get_property (GObject * object, guint property_id, g_value_take_object (value, sorted_list_get_read_only_view_as_list (self)); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2728 "SortedList.c" +#line 2538 "SortedList.c" default: #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2734 "SortedList.c" +#line 2544 "SortedList.c" } } -static void _vala_sorted_list_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_sorted_list_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SortedList * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SORTED_LIST, SortedList); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" @@ -2758,18 +2573,22 @@ static void _vala_sorted_list_set_property (GObject * object, guint property_id, self->priv->g_destroy_func = g_value_get_pointer (value); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2762 "SortedList.c" +#line 2577 "SortedList.c" default: #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 9 "/home/jens/Source/shotwell/src/SortedList.vala" break; -#line 2768 "SortedList.c" +#line 2583 "SortedList.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2781,7 +2600,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -- cgit v1.2.3