[gnome-games/wip/exalm/grilo: 3/6] grilo: Remove unused uid fields

[Alexander Mikhaylenko <alexm src gnome org>]

commit e9f8c8a41398a2cc0059945d3bce5e122e7078f9
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Fri Aug 31 16:57:02 2018 +0500

    grilo: Remove unused uid fields
    
    Remove 'uid' field and constructor parameters from GriloCooperative,
    GriloGenre, GriloPlayers and GriloReleaseDate.
    
    Also update RetroSimpleGameUriAdapter and plugins.

 plugins/dreamcast/src/dreamcast-plugin.vala           | 8 ++++----
 plugins/game-cube/src/game-cube-plugin.vala           | 8 ++++----
 plugins/nintendo-ds/src/nintendo-ds-plugin.vala       | 8 ++++----
 plugins/playstation/src/playstation-game-factory.vala | 8 ++++----
 plugins/sega-cd/src/sega-cd-plugin.vala               | 8 ++++----
 plugins/sega-saturn/src/sega-saturn-plugin.vala       | 8 ++++----
 plugins/turbografx-cd/src/turbografx-cd-plugin.vala   | 8 ++++----
 plugins/virtual-boy/src/virtual-boy-plugin.vala       | 8 ++++----
 plugins/wii/src/wii-plugin.vala                       | 8 ++++----
 src/grilo/grilo-cooperative.vala                      | 4 +---
 src/grilo/grilo-genre.vala                            | 4 +---
 src/grilo/grilo-players.vala                          | 4 +---
 src/grilo/grilo-release-date.vala                     | 4 +---
 src/retro/retro-simple-game-uri-adapter.vala          | 8 ++++----
 14 files changed, 44 insertions(+), 52 deletions(-)
---
diff --git a/plugins/dreamcast/src/dreamcast-plugin.vala b/plugins/dreamcast/src/dreamcast-plugin.vala
index 3303e836..82459850 100644
--- a/plugins/dreamcast/src/dreamcast-plugin.vala
+++ b/plugins/dreamcast/src/dreamcast-plugin.vala
@@ -34,10 +34,10 @@ private class Games.DreamcastPlugin : Object, Plugin {
                var cover = new CompositeCover ({
                        new LocalCover (uri),
                        new GriloCover (media, uid)});
-               var release_date = new GriloReleaseDate (media, uid);
-               var cooperative = new GriloCooperative (media, uid);
-               var genre = new GriloGenre (media, uid);
-               var players = new GriloPlayers (media, uid);
+               var release_date = new GriloReleaseDate (media);
+               var cooperative = new GriloCooperative (media);
+               var genre = new GriloGenre (media);
+               var players = new GriloPlayers (media);
                var developer = new GriloDeveloper (media);
                var publisher = new GriloPublisher (media);
                var description = new GriloDescription (media);
diff --git a/plugins/game-cube/src/game-cube-plugin.vala b/plugins/game-cube/src/game-cube-plugin.vala
index 305de2f0..9046ed18 100644
--- a/plugins/game-cube/src/game-cube-plugin.vala
+++ b/plugins/game-cube/src/game-cube-plugin.vala
@@ -34,10 +34,10 @@ private class Games.GameCubePlugin : Object, Plugin {
                var cover = new CompositeCover ({
                        new LocalCover (uri),
                        new GriloCover (media, uid)});
-               var release_date = new GriloReleaseDate (media, uid);
-               var cooperative = new GriloCooperative (media, uid);
-               var genre = new GriloGenre (media, uid);
-               var players = new GriloPlayers (media, uid);
+               var release_date = new GriloReleaseDate (media);
+               var cooperative = new GriloCooperative (media);
+               var genre = new GriloGenre (media);
+               var players = new GriloPlayers (media);
                var developer = new GriloDeveloper (media);
                var publisher = new GriloPublisher (media);
                var description = new GriloDescription (media);
diff --git a/plugins/nintendo-ds/src/nintendo-ds-plugin.vala b/plugins/nintendo-ds/src/nintendo-ds-plugin.vala
index 199a282f..0ecea196 100644
--- a/plugins/nintendo-ds/src/nintendo-ds-plugin.vala
+++ b/plugins/nintendo-ds/src/nintendo-ds-plugin.vala
@@ -29,10 +29,10 @@ private class Games.NintendoDsPlugin : Object, Plugin {
                var title = new FilenameTitle (uri);
                var icon = new NintendoDsIcon (uri);
                var media = new GriloMedia (title, MIME_TYPE);
-               var release_date = new GriloReleaseDate (media, uid);
-               var cooperative = new GriloCooperative (media, uid);
-               var genre = new GriloGenre (media, uid);
-               var players = new GriloPlayers (media, uid);
+               var release_date = new GriloReleaseDate (media);
+               var cooperative = new GriloCooperative (media);
+               var genre = new GriloGenre (media);
+               var players = new GriloPlayers (media);
                var developer = new GriloDeveloper (media);
                var publisher = new GriloPublisher (media);
                var description = new GriloDescription (media);
diff --git a/plugins/playstation/src/playstation-game-factory.vala 
b/plugins/playstation/src/playstation-game-factory.vala
index 6fd0e060..31d41037 100644
--- a/plugins/playstation/src/playstation-game-factory.vala
+++ b/plugins/playstation/src/playstation-game-factory.vala
@@ -142,10 +142,10 @@ public class Games.PlayStationGameFactory : Object, UriGameFactory {
                var cover = new CompositeCover ({
                        new LocalCover (uri),
                        new GriloCover (media, uid)});
-               var release_date = new GriloReleaseDate (media, uid);
-               var cooperative = new GriloCooperative (media, uid);
-               var genre = new GriloGenre (media, uid);
-               var players = new GriloPlayers (media, uid);
+               var release_date = new GriloReleaseDate (media);
+               var cooperative = new GriloCooperative (media);
+               var genre = new GriloGenre (media);
+               var players = new GriloPlayers (media);
                var developer = new GriloDeveloper (media);
                var publisher = new GriloPublisher (media);
                var description = new GriloDescription (media);
diff --git a/plugins/sega-cd/src/sega-cd-plugin.vala b/plugins/sega-cd/src/sega-cd-plugin.vala
index c76afb1d..9f4ef796 100644
--- a/plugins/sega-cd/src/sega-cd-plugin.vala
+++ b/plugins/sega-cd/src/sega-cd-plugin.vala
@@ -78,10 +78,10 @@ private class Games.SegaCDPlugin : Object, Plugin {
                var cover = new CompositeCover ({
                        new LocalCover (uri),
                        new GriloCover (media, uid)});
-               var release_date = new GriloReleaseDate (media, uid);
-               var cooperative = new GriloCooperative (media, uid);
-               var genre = new GriloGenre (media, uid);
-               var players = new GriloPlayers (media, uid);
+               var release_date = new GriloReleaseDate (media);
+               var cooperative = new GriloCooperative (media);
+               var genre = new GriloGenre (media);
+               var players = new GriloPlayers (media);
                var developer = new GriloDeveloper (media);
                var publisher = new GriloPublisher (media);
                var description = new GriloDescription (media);
diff --git a/plugins/sega-saturn/src/sega-saturn-plugin.vala b/plugins/sega-saturn/src/sega-saturn-plugin.vala
index 28216bfa..467f9277 100644
--- a/plugins/sega-saturn/src/sega-saturn-plugin.vala
+++ b/plugins/sega-saturn/src/sega-saturn-plugin.vala
@@ -57,10 +57,10 @@ private class Games.SegaSaturnPlugin : Object, Plugin {
                var cover = new CompositeCover ({
                        new LocalCover (uri),
                        new GriloCover (media, uid)});
-               var release_date = new GriloReleaseDate (media, uid);
-               var cooperative = new GriloCooperative (media, uid);
-               var genre = new GriloGenre (media, uid);
-               var players = new GriloPlayers (media, uid);
+               var release_date = new GriloReleaseDate (media);
+               var cooperative = new GriloCooperative (media);
+               var genre = new GriloGenre (media);
+               var players = new GriloPlayers (media);
                var developer = new GriloDeveloper (media);
                var publisher = new GriloPublisher (media);
                var description = new GriloDescription (media);
diff --git a/plugins/turbografx-cd/src/turbografx-cd-plugin.vala 
b/plugins/turbografx-cd/src/turbografx-cd-plugin.vala
index 558e05c8..9e27b8e9 100644
--- a/plugins/turbografx-cd/src/turbografx-cd-plugin.vala
+++ b/plugins/turbografx-cd/src/turbografx-cd-plugin.vala
@@ -37,10 +37,10 @@ private class Games.TurboGrafxCDPlugin : Object, Plugin {
                var cover = new CompositeCover ({
                        new LocalCover (uri),
                        new GriloCover (media, uid)});
-               var release_date = new GriloReleaseDate (media, uid);
-               var cooperative = new GriloCooperative (media, uid);
-               var genre = new GriloGenre (media, uid);
-               var players = new GriloPlayers (media, uid);
+               var release_date = new GriloReleaseDate (media);
+               var cooperative = new GriloCooperative (media);
+               var genre = new GriloGenre (media);
+               var players = new GriloPlayers (media);
                var developer = new GriloDeveloper (media);
                var publisher = new GriloPublisher (media);
                var description = new GriloDescription (media);
diff --git a/plugins/virtual-boy/src/virtual-boy-plugin.vala b/plugins/virtual-boy/src/virtual-boy-plugin.vala
index 5c318bc0..0af121ef 100644
--- a/plugins/virtual-boy/src/virtual-boy-plugin.vala
+++ b/plugins/virtual-boy/src/virtual-boy-plugin.vala
@@ -36,10 +36,10 @@ private class Games.VirtualBoyPlugin : Object, Plugin {
                var cover = new CompositeCover ({
                        new LocalCover (uri),
                        new GriloCover (media, uid)});
-               var release_date = new GriloReleaseDate (media, uid);
-               var cooperative = new GriloCooperative (media, uid);
-               var genre = new GriloGenre (media, uid);
-               var players = new GriloPlayers (media, uid);
+               var release_date = new GriloReleaseDate (media);
+               var cooperative = new GriloCooperative (media);
+               var genre = new GriloGenre (media);
+               var players = new GriloPlayers (media);
                var developer = new GriloDeveloper (media);
                var publisher = new GriloPublisher (media);
                var description = new GriloDescription (media);
diff --git a/plugins/wii/src/wii-plugin.vala b/plugins/wii/src/wii-plugin.vala
index eba42c2e..54ed9637 100644
--- a/plugins/wii/src/wii-plugin.vala
+++ b/plugins/wii/src/wii-plugin.vala
@@ -34,10 +34,10 @@ private class Games.WiiPlugin : Object, Plugin {
                var cover = new CompositeCover ({
                        new LocalCover (uri),
                        new GriloCover (media, uid)});
-               var release_date = new GriloReleaseDate (media, uid);
-               var cooperative = new GriloCooperative (media, uid);
-               var genre = new GriloGenre (media, uid);
-               var players = new GriloPlayers (media, uid);
+               var release_date = new GriloReleaseDate (media);
+               var cooperative = new GriloCooperative (media);
+               var genre = new GriloGenre (media);
+               var players = new GriloPlayers (media);
                var developer = new GriloDeveloper (media);
                var publisher = new GriloPublisher (media);
                var description = new GriloDescription (media);
diff --git a/src/grilo/grilo-cooperative.vala b/src/grilo/grilo-cooperative.vala
index b19c6cd8..9afdbd6e 100644
--- a/src/grilo/grilo-cooperative.vala
+++ b/src/grilo/grilo-cooperative.vala
@@ -2,15 +2,13 @@
 
 public class Games.GriloCooperative : Object, Cooperative {
        private GriloMedia media;
-       private Uid uid;
        private Grl.KeyID GRL_METADATA_KEY_COOP;
        private Grl.Registry registry;
        private bool cooperative;
        private bool resolving;
 
-       public GriloCooperative (GriloMedia media, Uid uid) {
+       public GriloCooperative (GriloMedia media) {
                this.media = media;
-               this.uid = uid;
                media.resolved.connect (on_media_resolved);
                resolving = false;
        }
diff --git a/src/grilo/grilo-genre.vala b/src/grilo/grilo-genre.vala
index c8a41750..0cfb137b 100644
--- a/src/grilo/grilo-genre.vala
+++ b/src/grilo/grilo-genre.vala
@@ -2,13 +2,11 @@
 
 public class Games.GriloGenre : Object, Genre {
        private GriloMedia media;
-       private Uid uid;
        private List<string> genre;
        private bool resolving;
 
-       public GriloGenre (GriloMedia media, Uid uid) {
+       public GriloGenre (GriloMedia media) {
                this.media = media;
-               this.uid = uid;
                media.resolved.connect (on_media_resolved);
                resolving = false;
        }
diff --git a/src/grilo/grilo-players.vala b/src/grilo/grilo-players.vala
index e73463c2..a5009dc7 100644
--- a/src/grilo/grilo-players.vala
+++ b/src/grilo/grilo-players.vala
@@ -2,15 +2,13 @@
 
 public class Games.GriloPlayers : Object, Players {
        private GriloMedia media;
-       private Uid uid;
        private Grl.Registry registry;
        private Grl.KeyID GRL_METADATA_KEY_PLAYERS;
        private string players;
        private bool resolving;
 
-       public GriloPlayers (GriloMedia media, Uid uid) {
+       public GriloPlayers (GriloMedia media) {
                this.media = media;
-               this.uid = uid;
                media.resolved.connect (on_media_resolved);
                resolving = false;
        }
diff --git a/src/grilo/grilo-release-date.vala b/src/grilo/grilo-release-date.vala
index d4aeb0aa..f8d7a613 100644
--- a/src/grilo/grilo-release-date.vala
+++ b/src/grilo/grilo-release-date.vala
@@ -2,13 +2,11 @@
 
 public class Games.GriloReleaseDate : Object, ReleaseDate {
        private GriloMedia media;
-       private Uid uid;
        private DateTime release_date;
        private bool resolving;
 
-       public GriloReleaseDate (GriloMedia media, Uid uid) {
+       public GriloReleaseDate (GriloMedia media) {
                this.media = media;
-               this.uid = uid;
                media.resolved.connect (on_media_resolved);
                resolving = false;
        }
diff --git a/src/retro/retro-simple-game-uri-adapter.vala b/src/retro/retro-simple-game-uri-adapter.vala
index 90a5a003..c3ef3cf4 100644
--- a/src/retro/retro-simple-game-uri-adapter.vala
+++ b/src/retro/retro-simple-game-uri-adapter.vala
@@ -21,10 +21,10 @@ private class Games.RetroSimpleGameUriAdapter : GameUriAdapter, Object {
                var cover = new CompositeCover ({
                        new LocalCover (uri),
                        new GriloCover (media, uid)});
-               var release_date = new GriloReleaseDate (media, uid);
-               var cooperative = new GriloCooperative (media, uid);
-               var genre = new GriloGenre (media, uid);
-               var players = new GriloPlayers (media, uid);
+               var release_date = new GriloReleaseDate (media);
+               var cooperative = new GriloCooperative (media);
+               var genre = new GriloGenre (media);
+               var players = new GriloPlayers (media);
                var developer = new GriloDeveloper (media);
                var publisher = new GriloPublisher (media);
                var description = new GriloDescription (media);