diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2019-10-03 15:22:21 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2019-10-03 15:22:21 +0200 |
commit | 5204e98502aa1d0dc4a05c5d3f15b7c39c8d832c (patch) | |
tree | cf732995c187d192ce8eab868c5f60cd0982184e /src/core | |
parent | 4b884ce062be787b9e64836146133a1066b679e3 (diff) | |
parent | de88de73ad9d13cc2a54668aa4bc6523c196ffa9 (diff) |
Update upstream source from tag 'upstream/0.30.7'
Update to upstream version '0.30.7'
with Debian dir 9549ff4a34004ef1e2ea60b54b2fb65fe1ddf75e
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/ContainerSourceCollection.vala | 2 | ||||
-rw-r--r-- | src/core/DataObject.vala | 2 | ||||
-rw-r--r-- | src/core/DataSource.vala | 4 | ||||
-rw-r--r-- | src/core/DataSourceTypes.vala | 6 | ||||
-rw-r--r-- | src/core/DatabaseSourceCollection.vala | 2 | ||||
-rw-r--r-- | src/core/SourceCollection.vala | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/core/ContainerSourceCollection.vala b/src/core/ContainerSourceCollection.vala index cf6218a..0b231dc 100644 --- a/src/core/ContainerSourceCollection.vala +++ b/src/core/ContainerSourceCollection.vala @@ -35,7 +35,7 @@ public abstract class ContainerSourceCollection : DatabaseSourceCollection { Gee.Collection<DataSource> sources) { } - public ContainerSourceCollection(string backlink_name, string name, + protected ContainerSourceCollection(string backlink_name, string name, GetSourceDatabaseKey source_key_func) { base (name, source_key_func); diff --git a/src/core/DataObject.vala b/src/core/DataObject.vala index 3c98e9e..62241b5 100644 --- a/src/core/DataObject.vala +++ b/src/core/DataObject.vala @@ -35,7 +35,7 @@ public abstract class DataObject : Object { // NOTE: Supplying an object ID should *only* be used when reconstituting the object (generally // only done by DataSources). - public DataObject(int64 object_id = INVALID_OBJECT_ID) { + protected DataObject(int64 object_id = INVALID_OBJECT_ID) { this.object_id = (object_id == INVALID_OBJECT_ID) ? object_id_generator++ : object_id; } diff --git a/src/core/DataSource.vala b/src/core/DataSource.vala index 352ac54..3f2eb22 100644 --- a/src/core/DataSource.vala +++ b/src/core/DataSource.vala @@ -60,7 +60,7 @@ public abstract class DataSource : DataObject { public virtual signal void destroyed() { } - public DataSource(int64 object_id = INVALID_OBJECT_ID) { + protected DataSource(int64 object_id = INVALID_OBJECT_ID) { base (object_id); } @@ -568,7 +568,7 @@ public abstract class SourceProxy { public virtual signal void broken() { } - public SourceProxy(DataSource source) { + protected SourceProxy(DataSource source) { object_id = source.get_object_id(); source_string = source.to_string(); diff --git a/src/core/DataSourceTypes.vala b/src/core/DataSourceTypes.vala index 6d8479e..a79264f 100644 --- a/src/core/DataSourceTypes.vala +++ b/src/core/DataSourceTypes.vala @@ -12,7 +12,7 @@ public abstract class ThumbnailSource : DataSource { public virtual signal void thumbnail_altered() { } - public ThumbnailSource(int64 object_id = INVALID_OBJECT_ID) { + protected ThumbnailSource(int64 object_id = INVALID_OBJECT_ID) { base (object_id); } @@ -51,7 +51,7 @@ public abstract class ThumbnailSource : DataSource { } public abstract class PhotoSource : MediaSource { - public PhotoSource(int64 object_id = INVALID_OBJECT_ID) { + protected PhotoSource(int64 object_id = INVALID_OBJECT_ID) { base (object_id); } @@ -68,7 +68,7 @@ public abstract class VideoSource : MediaSource { // public abstract class EventSource : ThumbnailSource { - public EventSource(int64 object_id = INVALID_OBJECT_ID) { + protected EventSource(int64 object_id = INVALID_OBJECT_ID) { base (object_id); } diff --git a/src/core/DatabaseSourceCollection.vala b/src/core/DatabaseSourceCollection.vala index fec6825..2808307 100644 --- a/src/core/DatabaseSourceCollection.vala +++ b/src/core/DatabaseSourceCollection.vala @@ -17,7 +17,7 @@ public abstract class DatabaseSourceCollection : SourceCollection { private Gee.HashMap<int64?, DataSource> map = new Gee.HashMap<int64?, DataSource>(int64_hash, int64_equal); - public DatabaseSourceCollection(string name, GetSourceDatabaseKey source_key_func) { + protected DatabaseSourceCollection(string name, GetSourceDatabaseKey source_key_func) { base (name); this.source_key_func = source_key_func; diff --git a/src/core/SourceCollection.vala b/src/core/SourceCollection.vala index 066b813..6eaf86c 100644 --- a/src/core/SourceCollection.vala +++ b/src/core/SourceCollection.vala @@ -47,7 +47,7 @@ public abstract class SourceCollection : DataCollection { private Gee.MultiMap<SourceBacklink, DataSource>? backlinks = null; - public SourceCollection(string name) { + protected SourceCollection(string name) { base (name); } |