summaryrefslogtreecommitdiff
path: root/src/core/DatabaseSourceCollection.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
commitabdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch)
tree26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/core/DatabaseSourceCollection.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parentdd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/core/DatabaseSourceCollection.c')
-rw-r--r--src/core/DatabaseSourceCollection.c170
1 files changed, 85 insertions, 85 deletions
diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c
index d21ab1b..192d771 100644
--- a/src/core/DatabaseSourceCollection.c
+++ b/src/core/DatabaseSourceCollection.c
@@ -1,4 +1,4 @@
-/* DatabaseSourceCollection.c generated by valac 0.34.7, the Vala compiler
+/* DatabaseSourceCollection.c generated by valac 0.36.6, the Vala compiler
* generated from DatabaseSourceCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -295,7 +295,7 @@ void data_collection_notify_items_added (DataCollection* self, GeeIterable* adde
static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed);
void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed);
DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key);
-static void database_source_collection_finalize (DataCollection* obj);
+static void database_source_collection_finalize (DataCollection * obj);
gpointer source_holding_tank_ref (gpointer instance);
void source_holding_tank_unref (gpointer instance);
GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -315,7 +315,7 @@ SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceColle
DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id);
static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed);
void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
-static void database_source_holding_tank_finalize (SourceHoldingTank* obj);
+static void database_source_holding_tank_finalize (SourceHoldingTank * obj);
static guint _int64_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
@@ -350,9 +350,9 @@ static gint64* _int64_dup (gint64* self) {
DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) {
DatabaseSourceCollection* self = NULL;
- const gchar* _tmp0_ = NULL;
- GetSourceDatabaseKey _tmp1_ = NULL;
- void* _tmp1__target = NULL;
+ const gchar* _tmp0_;
+ GetSourceDatabaseKey _tmp1_;
+ void* _tmp1__target;
#line 20 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 21 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -382,7 +382,7 @@ static gpointer _g_object_ref0 (gpointer self) {
static void database_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) {
DatabaseSourceCollection * self;
- GeeIterable* _tmp17_ = NULL;
+ GeeIterable* _tmp17_;
#line 26 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection);
#line 26 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -390,8 +390,8 @@ static void database_source_collection_real_notify_items_added (DataCollection*
#line 391 "DatabaseSourceCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterator* _tmp1_;
#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
_tmp0_ = added;
#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -401,25 +401,25 @@ static void database_source_collection_real_notify_items_added (DataCollection*
#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
while (TRUE) {
#line 404 "DatabaseSourceCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataObject* object = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
DataSource* source = NULL;
- DataObject* _tmp6_ = NULL;
- DataSource* _tmp7_ = NULL;
+ DataObject* _tmp6_;
+ DataSource* _tmp7_;
gint64 key = 0LL;
- GetSourceDatabaseKey _tmp8_ = NULL;
- void* _tmp8__target = NULL;
- DataSource* _tmp9_ = NULL;
- gint64 _tmp10_ = 0LL;
- GeeHashMap* _tmp11_ = NULL;
- gint64 _tmp12_ = 0LL;
- gboolean _tmp13_ = FALSE;
- GeeHashMap* _tmp14_ = NULL;
- gint64 _tmp15_ = 0LL;
- DataSource* _tmp16_ = NULL;
+ GetSourceDatabaseKey _tmp8_;
+ void* _tmp8__target;
+ DataSource* _tmp9_;
+ gint64 _tmp10_;
+ GeeHashMap* _tmp11_;
+ gint64 _tmp12_;
+ gboolean _tmp13_;
+ GeeHashMap* _tmp14_;
+ gint64 _tmp15_;
+ DataSource* _tmp16_;
#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
_tmp2_ = _object_it;
#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -488,7 +488,7 @@ static void database_source_collection_real_notify_items_added (DataCollection*
static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) {
DatabaseSourceCollection * self;
- GeeIterable* _tmp13_ = NULL;
+ GeeIterable* _tmp13_;
#line 39 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection);
#line 39 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -496,8 +496,8 @@ static void database_source_collection_real_notify_items_removed (DataCollection
#line 497 "DatabaseSourceCollection.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterator* _tmp1_;
#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
_tmp0_ = removed;
#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -507,21 +507,21 @@ static void database_source_collection_real_notify_items_removed (DataCollection
#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
while (TRUE) {
#line 510 "DatabaseSourceCollection.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataObject* object = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
gint64 key = 0LL;
- GetSourceDatabaseKey _tmp6_ = NULL;
- void* _tmp6__target = NULL;
- DataObject* _tmp7_ = NULL;
- gint64 _tmp8_ = 0LL;
+ GetSourceDatabaseKey _tmp6_;
+ void* _tmp6__target;
+ DataObject* _tmp7_;
+ gint64 _tmp8_;
gboolean is_removed = FALSE;
- GeeHashMap* _tmp9_ = NULL;
- gint64 _tmp10_ = 0LL;
- gboolean _tmp11_ = FALSE;
- gboolean _tmp12_ = FALSE;
+ GeeHashMap* _tmp9_;
+ gint64 _tmp10_;
+ gboolean _tmp11_;
+ gboolean _tmp12_;
#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
_tmp2_ = _object_it;
#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -578,9 +578,9 @@ static void database_source_collection_real_notify_items_removed (DataCollection
DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key) {
DataSource* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- gint64 _tmp1_ = 0LL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ gint64 _tmp1_;
+ gpointer _tmp2_;
#line 50 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
g_return_val_if_fail (IS_DATABASE_SOURCE_COLLECTION (self), NULL);
#line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -605,15 +605,15 @@ static void database_source_collection_class_init (DatabaseSourceCollectionClass
#line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
g_type_class_add_private (klass, sizeof (DatabaseSourceCollectionPrivate));
#line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) database_source_collection_real_notify_items_added;
+ ((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_added;
#line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) database_source_collection_real_notify_items_removed;
+ ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_removed;
#line 612 "DatabaseSourceCollection.c"
}
static void database_source_collection_instance_init (DatabaseSourceCollection * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self->priv = DATABASE_SOURCE_COLLECTION_GET_PRIVATE (self);
#line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -624,7 +624,7 @@ static void database_source_collection_instance_init (DatabaseSourceCollection *
}
-static void database_source_collection_finalize (DataCollection* obj) {
+static void database_source_collection_finalize (DataCollection * obj) {
DatabaseSourceCollection * self;
#line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection);
@@ -650,11 +650,11 @@ GType database_source_collection_get_type (void) {
DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
DatabaseSourceHoldingTank* self = NULL;
- SourceCollection* _tmp0_ = NULL;
- SourceHoldingTankCheckToKeep _tmp1_ = NULL;
- void* _tmp1__target = NULL;
- GetSourceDatabaseKey _tmp2_ = NULL;
- void* _tmp2__target = NULL;
+ SourceCollection* _tmp0_;
+ SourceHoldingTankCheckToKeep _tmp1_;
+ void* _tmp1__target;
+ GetSourceDatabaseKey _tmp2_;
+ void* _tmp2__target;
#line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
#line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -688,9 +688,9 @@ DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* s
DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id) {
DataSource* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- gint64 _tmp1_ = 0LL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ gint64 _tmp1_;
+ gpointer _tmp2_;
#line 67 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
g_return_val_if_fail (IS_DATABASE_SOURCE_HOLDING_TANK (self), NULL);
#line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -709,10 +709,10 @@ DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* s
static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) {
DatabaseSourceHoldingTank * self;
- GeeCollection* _tmp0_ = NULL;
- GeeCollection* _tmp12_ = NULL;
- GeeCollection* _tmp23_ = NULL;
- GeeCollection* _tmp24_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp12_;
+ GeeCollection* _tmp23_;
+ GeeCollection* _tmp24_;
#line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank);
#line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -726,8 +726,8 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol
#line 727 "DatabaseSourceCollection.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeCollection* _tmp1_;
+ GeeIterator* _tmp2_;
#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
_tmp1_ = added;
#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -737,17 +737,17 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol
#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
while (TRUE) {
#line 740 "DatabaseSourceCollection.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataSource* source = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
- GeeHashMap* _tmp7_ = NULL;
- GetSourceDatabaseKey _tmp8_ = NULL;
- void* _tmp8__target = NULL;
- DataSource* _tmp9_ = NULL;
- gint64 _tmp10_ = 0LL;
- DataSource* _tmp11_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
+ GeeHashMap* _tmp7_;
+ GetSourceDatabaseKey _tmp8_;
+ void* _tmp8__target;
+ DataSource* _tmp9_;
+ gint64 _tmp10_;
+ DataSource* _tmp11_;
#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
_tmp3_ = _source_it;
#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -794,8 +794,8 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol
#line 795 "DatabaseSourceCollection.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp13_ = NULL;
- GeeIterator* _tmp14_ = NULL;
+ GeeCollection* _tmp13_;
+ GeeIterator* _tmp14_;
#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
_tmp13_ = removed;
#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -805,16 +805,16 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol
#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
while (TRUE) {
#line 808 "DatabaseSourceCollection.c"
- GeeIterator* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
+ GeeIterator* _tmp15_;
+ gboolean _tmp16_;
DataSource* source = NULL;
- GeeIterator* _tmp17_ = NULL;
- gpointer _tmp18_ = NULL;
- GeeHashMap* _tmp19_ = NULL;
- GetSourceDatabaseKey _tmp20_ = NULL;
- void* _tmp20__target = NULL;
- DataSource* _tmp21_ = NULL;
- gint64 _tmp22_ = 0LL;
+ GeeIterator* _tmp17_;
+ gpointer _tmp18_;
+ GeeHashMap* _tmp19_;
+ GetSourceDatabaseKey _tmp20_;
+ void* _tmp20__target;
+ DataSource* _tmp21_;
+ gint64 _tmp22_;
#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
_tmp15_ = _source_it;
#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -870,13 +870,13 @@ static void database_source_holding_tank_class_init (DatabaseSourceHoldingTankCl
#line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
g_type_class_add_private (klass, sizeof (DatabaseSourceHoldingTankPrivate));
#line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
- ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) database_source_holding_tank_real_notify_contents_altered;
+ ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) database_source_holding_tank_real_notify_contents_altered;
#line 875 "DatabaseSourceCollection.c"
}
static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTank * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self->priv = DATABASE_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
#line 57 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -887,7 +887,7 @@ static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTan
}
-static void database_source_holding_tank_finalize (SourceHoldingTank* obj) {
+static void database_source_holding_tank_finalize (SourceHoldingTank * obj) {
DatabaseSourceHoldingTank * self;
#line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank);