diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-09-30 16:17:30 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-09-30 16:21:11 +0200 |
commit | a5c510f8e247e68110051179ebaebe0fe74e794c (patch) | |
tree | 42d631bcc210b6eef69766a64e433235c75fbe3f /src/librygel-ruih | |
parent | 251421b0d9f26de6b3c388c5666a95ea1bcc2eee (diff) | |
download | rygel-a5c510f8e247e68110051179ebaebe0fe74e794c.tar.gz |
Fix 'static const' warnings with vala 0.33.1
Diffstat (limited to 'src/librygel-ruih')
-rw-r--r-- | src/librygel-ruih/rygel-ruih-filter-entry.vala | 2 | ||||
-rw-r--r-- | src/librygel-ruih/rygel-ruih-icon-elem.vala | 10 | ||||
-rw-r--r-- | src/librygel-ruih/rygel-ruih-server-plugin.vala | 4 | ||||
-rw-r--r-- | src/librygel-ruih/rygel-ruih-servicemanager.vala | 12 | ||||
-rw-r--r-- | src/librygel-ruih/rygel-ruih-ui-listing.vala | 24 |
5 files changed, 26 insertions, 26 deletions
diff --git a/src/librygel-ruih/rygel-ruih-filter-entry.vala b/src/librygel-ruih/rygel-ruih-filter-entry.vala index c17cdf12..a2abf230 100644 --- a/src/librygel-ruih/rygel-ruih-filter-entry.vala +++ b/src/librygel-ruih/rygel-ruih-filter-entry.vala @@ -22,7 +22,7 @@ */ protected class FilterEntry { - private static const string LIFETIME = "lifetime"; + private const string LIFETIME = "lifetime"; private string entry_name = null; private string entry_value = null; diff --git a/src/librygel-ruih/rygel-ruih-icon-elem.vala b/src/librygel-ruih/rygel-ruih-icon-elem.vala index 3c0478da..04a006bb 100644 --- a/src/librygel-ruih/rygel-ruih-icon-elem.vala +++ b/src/librygel-ruih/rygel-ruih-icon-elem.vala @@ -25,11 +25,11 @@ using Gee; using Xml; protected class IconElem : UIListing { - private static const string MIMETYPE = "mimetype"; - private static const string WIDTH = "width"; - private static const string HEIGHT = "height"; - private static const string DEPTH = "depth"; - private static const string URL = "url"; + private const string MIMETYPE = "mimetype"; + private const string WIDTH = "width"; + private const string HEIGHT = "height"; + private const string DEPTH = "depth"; + private const string URL = "url"; // optional attributes private string mime_type = null; diff --git a/src/librygel-ruih/rygel-ruih-server-plugin.vala b/src/librygel-ruih/rygel-ruih-server-plugin.vala index 0838f91b..4bc356f8 100644 --- a/src/librygel-ruih/rygel-ruih-server-plugin.vala +++ b/src/librygel-ruih/rygel-ruih-server-plugin.vala @@ -28,10 +28,10 @@ * */ public class Rygel.RuihServerPlugin : Rygel.Plugin { - private static const string RUIH_SERVER_DESC_PATH = + private const string RUIH_SERVER_DESC_PATH = BuildConfig.DATA_DIR + "/xml/RuihServer2.xml"; - private static const string RUIH = + private const string RUIH = "urn:schemas-upnp-org:device:RemoteUIServer"; diff --git a/src/librygel-ruih/rygel-ruih-servicemanager.vala b/src/librygel-ruih/rygel-ruih-servicemanager.vala index 8ad20fdb..b0b7af0c 100644 --- a/src/librygel-ruih/rygel-ruih-servicemanager.vala +++ b/src/librygel-ruih/rygel-ruih-servicemanager.vala @@ -28,12 +28,12 @@ using GLib; public class Rygel.RuihServiceManager : Object { - private static const string DEVICEPROFILE = "deviceprofile"; - private static const string PROTOCOL = "protocol"; - private static const string PROTOCOL_INFO = "protocolInfo"; - private static const string SHORT_NAME = "shortName"; - private static const string UI = "ui"; - private static const string UILIST = "uilist"; + private const string DEVICEPROFILE = "deviceprofile"; + private const string PROTOCOL = "protocol"; + private const string PROTOCOL_INFO = "protocolInfo"; + private const string SHORT_NAME = "shortName"; + private const string UI = "ui"; + private const string UILIST = "uilist"; private static string PRE_RESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" diff --git a/src/librygel-ruih/rygel-ruih-ui-listing.vala b/src/librygel-ruih/rygel-ruih-ui-listing.vala index da0d4f57..f664c91d 100644 --- a/src/librygel-ruih/rygel-ruih-ui-listing.vala +++ b/src/librygel-ruih/rygel-ruih-ui-listing.vala @@ -25,18 +25,18 @@ using Gee; public abstract class UIListing { - protected static const string DESCRIPTION = "description"; - protected static const string FORK = "fork"; - protected static const string ICON = "icon"; - protected static const string ICONLIST = "iconList"; - protected static const string LIFETIME = "lifetime"; - protected static const string NAME = "name"; - protected static const string PROTOCOL = "protocol"; - protected static const string PROTOCOL_INFO = "protocolInfo"; - protected static const string SHORT_NAME = "shortName"; - protected static const string UI = "ui"; - protected static const string URI = "uri"; - protected static const string UIID = "uiID"; + protected const string DESCRIPTION = "description"; + protected const string FORK = "fork"; + protected const string ICON = "icon"; + protected const string ICONLIST = "iconList"; + protected const string LIFETIME = "lifetime"; + protected const string NAME = "name"; + protected const string PROTOCOL = "protocol"; + protected const string PROTOCOL_INFO = "protocolInfo"; + protected const string SHORT_NAME = "shortName"; + protected const string UI = "ui"; + protected const string URI = "uri"; + protected const string UIID = "uiID"; public abstract bool match (ArrayList<ProtocolElem>? protocols, ArrayList<FilterEntry> filters); |