Commit 4b0c7c91 authored by Rico Tzschichholz's avatar Rico Tzschichholz

Constructors of abstract classes should not be public

parent bf0b956d
......@@ -48,7 +48,7 @@ public abstract class Rygel.RecursiveModuleLoader : Object {
*
* @param path base path of the loader.
*/
public RecursiveModuleLoader (string path) {
protected RecursiveModuleLoader (string path) {
Object (base_path : path);
}
......
......@@ -48,9 +48,9 @@ public abstract class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
internal ClientHacks hack;
public HTTPRequest (HTTPServer http_server,
Soup.Server server,
Soup.Message msg) {
protected HTTPRequest (HTTPServer http_server,
Soup.Server server,
Soup.Message msg) {
this.http_server = http_server;
this.cancellable = new Cancellable ();
this.root_container = http_server.root_container;
......
......@@ -27,7 +27,7 @@ internal abstract class Rygel.LastChangeEntry : Object {
private string id;
private uint update_id;
public LastChangeEntry (string tag, string id, uint update_id) {
protected LastChangeEntry (string tag, string id, uint update_id) {
this.tag = tag;
this.id = id;
this.update_id = update_id;
......
......@@ -269,10 +269,10 @@ public abstract class Rygel.MediaContainer : MediaObject {
* @param title See the title property of the #RygelMediaObject class.
* @param child_count The initially-known number of child items.
*/
public MediaContainer (string id,
MediaContainer? parent,
string title,
int child_count) {
protected MediaContainer (string id,
MediaContainer? parent,
string title,
int child_count) {
Object (id : id,
parent : parent,
title : title,
......@@ -286,8 +286,8 @@ public abstract class Rygel.MediaContainer : MediaObject {
* @param title See the title property of the #RygelMediaObject.
* @param child_count The initially-known number of child items.
*/
public MediaContainer.root (string title,
int child_count) {
protected MediaContainer.root (string title,
int child_count) {
Object (id : "0",
parent : null,
title : title,
......
......@@ -104,10 +104,10 @@ public abstract class Rygel.MediaFileItem : MediaItem {
protected static Regex address_regex;
public MediaFileItem (string id,
MediaContainer parent,
string title,
string upnp_class) {
protected MediaFileItem (string id,
MediaContainer parent,
string title,
string upnp_class) {
Object (id : id,
parent : parent,
title : title,
......
......@@ -126,10 +126,10 @@ public abstract class Rygel.MediaServerPlugin : Rygel.Plugin {
* @param name The non-human-readable name for the plugin and its service, used in UPnP messages and in the Rygel configuration file.
* @param description An optional human-readable description (modelDescription) of the UPnP service provided by the plugin.
*/
public MediaServerPlugin (MediaContainer root_container,
string name,
string? description = null,
PluginCapabilities capabilities =
protected MediaServerPlugin (MediaContainer root_container,
string name,
string? description = null,
PluginCapabilities capabilities =
PluginCapabilities.NONE) {
Object (desc_path : MEDIA_SERVER_DESC_PATH,
name : name,
......
......@@ -37,13 +37,13 @@ internal abstract class Rygel.AudioTranscoder : Rygel.GstTranscoder {
public const string NO_CONTAINER = null;
public AudioTranscoder (string name,
string content_type,
string dlna_profile,
int audio_bitrate,
string? container_caps,
string audio_codec_caps,
string extension) {
protected AudioTranscoder (string name,
string content_type,
string dlna_profile,
int audio_bitrate,
string? container_caps,
string audio_codec_caps,
string extension) {
base (name, content_type, dlna_profile, extension);
this.audio_bitrate = audio_bitrate;
......@@ -54,13 +54,13 @@ internal abstract class Rygel.AudioTranscoder : Rygel.GstTranscoder {
this.audio_codec_format = Caps.from_string (audio_codec_caps);
}
public AudioTranscoder.with_class (string name,
string content_type,
string dlna_profile,
int audio_bitrate,
string? container_caps,
string audio_codec_caps,
string extension) {
protected AudioTranscoder.with_class (string name,
string content_type,
string dlna_profile,
int audio_bitrate,
string? container_caps,
string audio_codec_caps,
string extension) {
base (name, content_type, dlna_profile, extension);
this.audio_bitrate = audio_bitrate;
......
......@@ -57,10 +57,10 @@ internal abstract class Rygel.GstTranscoder : GLib.Object {
private bool link_failed;
public GstTranscoder (string name,
string mime_type,
string dlna_profile,
string extension) {
protected GstTranscoder (string name,
string mime_type,
string dlna_profile,
string extension) {
GLib.Object (name : name,
mime_type : mime_type,
dlna_profile : dlna_profile,
......
......@@ -34,16 +34,16 @@ internal abstract class Rygel.VideoTranscoder : Rygel.AudioTranscoder {
private Caps video_codec_format;
private Caps video_restrictions = null;
public VideoTranscoder (string name,
string content_type,
string dlna_profile,
int audio_bitrate,
int video_bitrate,
string container_caps,
string audio_codec_caps,
string video_codec_caps,
string extension,
string? restrictions = null) {
protected VideoTranscoder (string name,
string content_type,
string dlna_profile,
int audio_bitrate,
int video_bitrate,
string container_caps,
string audio_codec_caps,
string video_codec_caps,
string extension,
string? restrictions = null) {
base.with_class (name,
content_type,
......
......@@ -374,16 +374,16 @@ public abstract class Rygel.LMS.CategoryContainer : Rygel.MediaContainer,
}
public CategoryContainer (string db_id,
MediaContainer parent,
string title,
LMS.Database lms_db,
string sql_all,
string sql_find_object,
string sql_count,
string? sql_added,
string? sql_removed
) {
protected CategoryContainer (string db_id,
MediaContainer parent,
string title,
LMS.Database lms_db,
string sql_all,
string sql_find_object,
string sql_count,
string? sql_added,
string? sql_removed
) {
Object (id : "%s:%s".printf (parent.id, db_id),
db_id : db_id,
parent : parent,
......
......@@ -30,9 +30,9 @@ internal abstract class Rygel.MediaExport.QueryContainer : DBContainer {
public SearchExpression expression { get; construct set; }
// constructors
public QueryContainer (SearchExpression expression,
string id,
string name) {
protected QueryContainer (SearchExpression expression,
string id,
string name) {
Object (id : id,
parent : null,
title : name,
......
......@@ -31,10 +31,10 @@ public abstract class Rygel.Tracker.CategoryContainer : Rygel.SimpleContainer {
private CategoryAllContainer all_container;
public CategoryContainer (string id,
MediaContainer parent,
string title,
ItemFactory item_factory) {
protected CategoryContainer (string id,
MediaContainer parent,
string title,
ItemFactory item_factory) {
base (id, parent, title);
this.item_factory = item_factory;
......
......@@ -56,10 +56,10 @@ public abstract class Rygel.Tracker.ItemFactory {
public ArrayList<string> properties;
public ItemFactory (string category,
string category_iri,
string upnp_class,
string? upload_dir) {
protected ItemFactory (string category,
string category_iri,
string upnp_class,
string? upload_dir) {
this.category = category;
this.category_iri = category_iri;
this.upnp_class = upnp_class;
......
......@@ -42,11 +42,11 @@ public abstract class Rygel.Tracker.MetadataContainer : Rygel.SimpleContainer {
private Sparql.Connection resources;
protected QueryTriplets triplets;
public MetadataContainer (string id,
MediaContainer parent,
string title,
ItemFactory item_factory,
string? child_class = null) {
protected MetadataContainer (string id,
MediaContainer parent,
string title,
ItemFactory item_factory,
string? child_class = null) {
base (id, parent, title);
this.item_factory = item_factory;
......
......@@ -34,12 +34,12 @@ using Gee;
public abstract class Rygel.Tracker.MetadataMultiValues : MetadataContainer {
public string[] key_chain;
public MetadataMultiValues (string id,
MediaContainer parent,
string title,
ItemFactory item_factory,
string[] key_chain,
string? child_class = null) {
protected MetadataMultiValues (string id,
MediaContainer parent,
string title,
ItemFactory item_factory,
string[] key_chain,
string? child_class = null) {
base (id, parent, title, item_factory, child_class);
this.key_chain = key_chain;
......
......@@ -33,12 +33,12 @@ using Tracker;
public abstract class Rygel.Tracker.MetadataValues : MetadataContainer {
private string property;
public MetadataValues (string id,
MediaContainer parent,
string title,
ItemFactory item_factory,
string property,
string? child_class = null) {
protected MetadataValues (string id,
MediaContainer parent,
string title,
ItemFactory item_factory,
string property,
string? child_class = null) {
base (id, parent, title, item_factory, child_class);
this.property = property;
......
......@@ -32,7 +32,7 @@ using Tracker;
public abstract class Rygel.Tracker.Query {
public QueryTriplets triplets;
public Query (QueryTriplets triplets) {
protected Query (QueryTriplets triplets) {
this.triplets = triplets;
}
......
......@@ -27,8 +27,8 @@ public abstract class Rygel.PreferencesSection : GLib.Object {
public string name;
public PreferencesSection (WritableUserConfig config,
string name) {
protected PreferencesSection (WritableUserConfig config,
string name) {
this.name = name;
this.config = config;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment