[gnome-games] Rename Icon to GLib.Icon



commit 6d908572609c241853ab28a04a93b54f76086b59
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Wed May 11 17:10:15 2016 +0200

    Rename Icon to GLib.Icon
    
    This is needed to avoid name clash when we will introduce Games.Icon.

 plugins/desktop/src/desktop-game.vala         |    2 +-
 plugins/love/src/love-game.vala               |    6 +++---
 plugins/mame/src/mame-game.vala               |    2 +-
 plugins/sega-saturn/src/sega-saturn-game.vala |    2 +-
 plugins/steam/src/steam-game.vala             |   10 +++++-----
 src/core/cover.vala                           |    2 +-
 src/core/game.vala                            |    2 +-
 src/dummy/dummy-cover.vala                    |    2 +-
 src/dummy/dummy-game.vala                     |    2 +-
 src/ui/game-thumbnail.vala                    |    2 +-
 src/utils/generic-game.vala                   |    4 ++--
 11 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/plugins/desktop/src/desktop-game.vala b/plugins/desktop/src/desktop-game.vala
index e6b2798..47defa1 100644
--- a/plugins/desktop/src/desktop-game.vala
+++ b/plugins/desktop/src/desktop-game.vala
@@ -5,7 +5,7 @@ private class Games.DesktopGame: Object, Game {
                get { return app_info.get_name (); }
        }
 
-       public Icon? icon {
+       public GLib.Icon? icon {
                get { return app_info.get_icon (); }
        }
 
diff --git a/plugins/love/src/love-game.vala b/plugins/love/src/love-game.vala
index 864f10f..6b81685 100644
--- a/plugins/love/src/love-game.vala
+++ b/plugins/love/src/love-game.vala
@@ -8,17 +8,17 @@ private class Games.LoveGame : Object, Game {
                get { return _name; }
        }
 
-       public Icon? icon {
+       public GLib.Icon? icon {
                get { return love_icon; }
        }
 
-       private static Icon? love_icon;
+       private static GLib.Icon? love_icon;
 
        private string path;
 
        static construct {
                try {
-                       love_icon = Icon.new_for_string ("love");
+                       love_icon = GLib.Icon.new_for_string ("love");
                }
                catch (Error e) {
                        warning ("%s\n", e.message);
diff --git a/plugins/mame/src/mame-game.vala b/plugins/mame/src/mame-game.vala
index 7f355e2..3552e40 100644
--- a/plugins/mame/src/mame-game.vala
+++ b/plugins/mame/src/mame-game.vala
@@ -22,7 +22,7 @@ private class Games.MameGame : Object, Game {
                get { return _name; }
        }
 
-       public Icon? icon {
+       public GLib.Icon? icon {
                get { return null; }
        }
 
diff --git a/plugins/sega-saturn/src/sega-saturn-game.vala b/plugins/sega-saturn/src/sega-saturn-game.vala
index f47f7d3..80ecfd9 100644
--- a/plugins/sega-saturn/src/sega-saturn-game.vala
+++ b/plugins/sega-saturn/src/sega-saturn-game.vala
@@ -21,7 +21,7 @@ private class Games.SegaSaturnGame : Object, Game {
                get { return _name; }
        }
 
-       public Icon? icon {
+       public GLib.Icon? icon {
                get { return null; }
        }
 
diff --git a/plugins/steam/src/steam-game.vala b/plugins/steam/src/steam-game.vala
index a7a88e5..ef4e8eb 100644
--- a/plugins/steam/src/steam-game.vala
+++ b/plugins/steam/src/steam-game.vala
@@ -1,15 +1,15 @@
 // This file is part of GNOME Games. License: GPLv3
 
 private class Games.SteamGame : Object, Game {
-       private static Icon? steam_icon;
+       private static GLib.Icon? steam_icon;
 
        private string _name;
        public string name {
                get { return _name; }
        }
 
-       private Icon? _icon;
-       public Icon? icon {
+       private GLib.Icon? _icon;
+       public GLib.Icon? icon {
                get { return _icon != null ? _icon : steam_icon; }
        }
 
@@ -17,7 +17,7 @@ private class Games.SteamGame : Object, Game {
 
        static construct {
                try {
-                       steam_icon = Icon.new_for_string ("steam");
+                       steam_icon = GLib.Icon.new_for_string ("steam");
                }
                catch (Error e) {
                        warning ("%s\n", e.message);
@@ -42,7 +42,7 @@ private class Games.SteamGame : Object, Game {
                try {
                        var icon_name = "steam_icon_" + game_id;
                        if (check_icon_exists (icon_name))
-                               _icon = Icon.new_for_string (icon_name);
+                               _icon = GLib.Icon.new_for_string (icon_name);
                }
                catch (Error e) {
                        warning ("%s\n", e.message);
diff --git a/src/core/cover.vala b/src/core/cover.vala
index 8b894bb..7bdc778 100644
--- a/src/core/cover.vala
+++ b/src/core/cover.vala
@@ -1,5 +1,5 @@
 // This file is part of GNOME Games. License: GPLv3
 
 public interface Games.Cover : Object {
-       public abstract Icon? get_cover ();
+       public abstract GLib.Icon? get_cover ();
 }
diff --git a/src/core/game.vala b/src/core/game.vala
index e4389a9..156b1e4 100644
--- a/src/core/game.vala
+++ b/src/core/game.vala
@@ -2,7 +2,7 @@
 
 public interface Games.Game : Object {
        public abstract string name { get; }
-       public abstract Icon? icon { get; }
+       public abstract GLib.Icon? icon { get; }
 
        public abstract Runner get_runner () throws Error;
 }
diff --git a/src/dummy/dummy-cover.vala b/src/dummy/dummy-cover.vala
index daf0e8d..f527eb1 100644
--- a/src/dummy/dummy-cover.vala
+++ b/src/dummy/dummy-cover.vala
@@ -1,7 +1,7 @@
 // This file is part of GNOME Games. License: GPLv3
 
 public class Games.DummyCover : Object, Cover {
-       public Icon? get_cover () {
+       public GLib.Icon? get_cover () {
                return null;
        }
 }
diff --git a/src/dummy/dummy-game.vala b/src/dummy/dummy-game.vala
index 7e33822..5df939e 100644
--- a/src/dummy/dummy-game.vala
+++ b/src/dummy/dummy-game.vala
@@ -6,7 +6,7 @@ private class Games.DummyGame : Object, Game {
                get { return _name; }
        }
 
-       public Icon? icon {
+       public GLib.Icon? icon {
                get { return null; }
        }
 
diff --git a/src/ui/game-thumbnail.vala b/src/ui/game-thumbnail.vala
index c553e23..38894c2 100644
--- a/src/ui/game-thumbnail.vala
+++ b/src/ui/game-thumbnail.vala
@@ -105,7 +105,7 @@ private class Games.GameThumbnail: Gtk.DrawingArea {
                context.cr.paint ();
        }
 
-       private Gdk.Pixbuf? get_scaled_icon (DrawingContext context, Icon? icon, double scale) {
+       private Gdk.Pixbuf? get_scaled_icon (DrawingContext context, GLib.Icon? icon, double scale) {
                if (icon == null)
                        return null;
 
diff --git a/src/utils/generic-game.vala b/src/utils/generic-game.vala
index 7d0eeae..94f449e 100644
--- a/src/utils/generic-game.vala
+++ b/src/utils/generic-game.vala
@@ -18,8 +18,8 @@ public class Games.GenericGame : Object, Game {
                }
        }
 
-       private Icon? _icon;
-       public Icon? icon {
+       private GLib.Icon? _icon;
+       public GLib.Icon? icon {
                get {
                        _icon = game_cover.get_cover ();
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]