From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/core/DataObject.c | 86 +++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'src/core/DataObject.c') diff --git a/src/core/DataObject.c b/src/core/DataObject.c index 58505c6..a34dc93 100644 --- a/src/core/DataObject.c +++ b/src/core/DataObject.c @@ -1,4 +1,4 @@ -/* DataObject.c generated by valac 0.34.7, the Vala compiler +/* DataObject.c generated by valac 0.36.6, the Vala compiler * generated from DataObject.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -139,13 +139,13 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); void data_object_clear_collection_property (DataObject* self, const gchar* name); void data_collection_clear_property (DataCollection* self, const gchar* name); -static void data_object_finalize (GObject* obj); +static void data_object_finalize (GObject * obj); DataObject* data_object_construct (GType object_type, gint64 object_id) { DataObject * self = NULL; gint64 _tmp0_ = 0LL; - gint64 _tmp1_ = 0LL; + gint64 _tmp1_; #line 38 "/home/jens/Source/shotwell/src/core/DataObject.vala" self = (DataObject*) g_object_new (object_type, NULL); #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -153,7 +153,7 @@ DataObject* data_object_construct (GType object_type, gint64 object_id) { #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp1_ == DATA_OBJECT_INVALID_OBJECT_ID) { #line 156 "DataObject.c" - gint64 _tmp2_ = 0LL; + gint64 _tmp2_; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp2_ = data_object_object_id_generator; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -162,7 +162,7 @@ DataObject* data_object_construct (GType object_type, gint64 object_id) { _tmp0_ = _tmp2_; #line 164 "DataObject.c" } else { - gint64 _tmp3_ = 0LL; + gint64 _tmp3_; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp3_ = object_id; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -178,7 +178,7 @@ DataObject* data_object_construct (GType object_type, gint64 object_id) { static void data_object_real_notify_altered (DataObject* self, Alteration* alteration) { - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_ALTERATION (alteration)); #line 43 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -186,8 +186,8 @@ static void data_object_real_notify_altered (DataObject* self, Alteration* alter #line 43 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { #line 189 "DataObject.c" - DataCollection* _tmp1_ = NULL; - Alteration* _tmp2_ = NULL; + DataCollection* _tmp1_; + Alteration* _tmp2_; #line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = self->priv->member_of; #line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -303,8 +303,8 @@ static gpointer _data_collection_ref0 (gpointer self) { DataCollection* data_object_get_membership (DataObject* self) { DataCollection* result = NULL; - DataCollection* _tmp0_ = NULL; - DataCollection* _tmp1_ = NULL; + DataCollection* _tmp0_; + DataCollection* _tmp1_; #line 73 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), NULL); #line 74 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -321,7 +321,7 @@ DataCollection* data_object_get_membership (DataObject* self) { gboolean data_object_has_membership (DataObject* self) { gboolean result = FALSE; - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; #line 77 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), FALSE); #line 78 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -335,10 +335,10 @@ gboolean data_object_has_membership (DataObject* self) { void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal) { - DataCollection* _tmp0_ = NULL; - DataCollection* _tmp1_ = NULL; - DataCollection* _tmp2_ = NULL; - gint64 _tmp3_ = 0LL; + DataCollection* _tmp0_; + DataCollection* _tmp1_; + DataCollection* _tmp2_; + gint64 _tmp3_; #line 83 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 83 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -364,8 +364,8 @@ void data_object_internal_set_membership (DataObject* self, DataCollection* coll void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal) { - DataCollection* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; + DataCollection* _tmp0_; + gint64 _tmp1_; #line 96 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 97 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -395,7 +395,7 @@ void data_object_internal_clear_membership (DataObject* self) { inline gint64 data_object_internal_get_ordinal (DataObject* self) { gint64 result = 0LL; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 110 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), 0LL); #line 111 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -410,7 +410,7 @@ inline gint64 data_object_internal_get_ordinal (DataObject* self) { inline gint64 data_object_get_object_id (DataObject* self) { gint64 result = 0LL; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 114 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), 0LL); #line 115 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -433,13 +433,13 @@ static void _vala_GValue_free (GValue* self) { void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result) { - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; GValue* _result_ = NULL; - DataCollection* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GValue* _tmp5_ = NULL; + DataCollection* _tmp3_; + const gchar* _tmp4_; + GValue* _tmp5_; GValue* _tmp6_ = NULL; - GValue* _tmp7_ = NULL; + GValue* _tmp7_; GValue _tmp10_ = {0}; #line 118 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); @@ -450,7 +450,7 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G #line 119 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ == NULL) { #line 453 "DataObject.c" - GValue* _tmp1_ = NULL; + GValue* _tmp1_; GValue _tmp2_ = {0}; #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = def; @@ -485,14 +485,14 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp7_ != NULL) { #line 488 "DataObject.c" - GValue* _tmp8_ = NULL; + GValue* _tmp8_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp8_ = _result_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp6_ = _tmp8_; #line 494 "DataObject.c" } else { - GValue* _tmp9_ = NULL; + GValue* _tmp9_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp9_ = def; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -522,7 +522,7 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G void data_object_set_collection_property (DataObject* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) { - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; #line 127 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 127 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -534,11 +534,11 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G #line 128 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { #line 537 "DataObject.c" - DataCollection* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - GValue _tmp3_ = {0}; - ValueEqualFunc _tmp4_ = NULL; - void* _tmp4__target = NULL; + DataCollection* _tmp1_; + const gchar* _tmp2_; + GValue _tmp3_; + ValueEqualFunc _tmp4_; + void* _tmp4__target; #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = self->priv->member_of; #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -557,7 +557,7 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G void data_object_clear_collection_property (DataObject* self, const gchar* name) { - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; #line 132 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 132 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -567,8 +567,8 @@ void data_object_clear_collection_property (DataObject* self, const gchar* name) #line 133 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { #line 570 "DataObject.c" - DataCollection* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + DataCollection* _tmp1_; + const gchar* _tmp2_; #line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = self->priv->member_of; #line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -586,17 +586,17 @@ static void data_object_class_init (DataObjectClass * klass) { #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_type_class_add_private (klass, sizeof (DataObjectPrivate)); #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) data_object_real_notify_altered; + ((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) data_object_real_notify_altered; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) data_object_real_notify_membership_changed; + ((DataObjectClass *) klass)->notify_membership_changed = (void (*) (DataObject *, DataCollection*)) data_object_real_notify_membership_changed; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->notify_collection_property_set = (void (*)(DataObject*, const gchar*, GValue*, GValue*)) data_object_real_notify_collection_property_set; + ((DataObjectClass *) klass)->notify_collection_property_set = (void (*) (DataObject *, const gchar*, GValue*, GValue*)) data_object_real_notify_collection_property_set; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->notify_collection_property_cleared = (void (*)(DataObject*, const gchar*)) data_object_real_notify_collection_property_cleared; + ((DataObjectClass *) klass)->notify_collection_property_cleared = (void (*) (DataObject *, const gchar*)) data_object_real_notify_collection_property_cleared; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) data_object_real_get_name; + ((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) data_object_real_get_name; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) data_object_real_to_string; + ((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) data_object_real_to_string; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" G_OBJECT_CLASS (klass)->finalize = data_object_finalize; #line 603 "DataObject.c" @@ -616,7 +616,7 @@ static void data_object_instance_init (DataObject * self) { } -static void data_object_finalize (GObject* obj) { +static void data_object_finalize (GObject * obj) { DataObject * self; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_OBJECT, DataObject); -- cgit v1.2.3