[gnome-games/wip/exalm/uid: 13/16] game-model: Move compare func to Game
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/exalm/uid: 13/16] game-model: Move compare func to Game
- Date: Thu, 5 Mar 2020 17:59:21 +0000 (UTC)
commit f60c9e0dbc565b38d40cfa56a8031dd142a338eb
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Thu Mar 5 22:51:34 2020 +0500
game-model: Move compare func to Game
src/core/game-model.vala | 20 ++------------------
src/core/game.vala | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/core/game-model.vala b/src/core/game-model.vala
index 520d676d..e17273a0 100644
--- a/src/core/game-model.vala
+++ b/src/core/game-model.vala
@@ -27,7 +27,7 @@ private class Games.GameModel : Object, ListModel {
}
public void add_game (Game game) {
- var iter = sequence.insert_sorted (game, compare_func);
+ var iter = sequence.insert_sorted (game, Game.compare);
n_games++;
items_changed (iter.get_position (), 0, 1);
@@ -48,7 +48,7 @@ private class Games.GameModel : Object, ListModel {
}
public void remove_game (Game game) {
- var iter = sequence.lookup (game, compare_func);
+ var iter = sequence.lookup (game, Game.compare);
var pos = iter.get_position ();
iter.remove ();
@@ -56,20 +56,4 @@ private class Games.GameModel : Object, ListModel {
items_changed (pos, 1, 0);
game_removed (game);
}
-
- private int compare_func (Game a, Game b) {
- var ret = a.name.collate (b.name);
- if (ret != 0)
- return ret;
-
- ret = a.platform.get_name ().collate (
- b.platform.get_name ());
- if (ret != 0)
- return ret;
-
- var uid1 = a.uid.to_string ();
- var uid2 = b.uid.to_string ();
-
- return uid1.collate (uid2);
- }
}
diff --git a/src/core/game.vala b/src/core/game.vala
index 7914d998..30153f3d 100644
--- a/src/core/game.vala
+++ b/src/core/game.vala
@@ -77,4 +77,20 @@ public class Games.Game : Object {
return Uid.equal (a.uid, b.uid);
}
+
+ public static int compare (Game a, Game b) {
+ var ret = a.name.collate (b.name);
+ if (ret != 0)
+ return ret;
+
+ ret = a.platform.get_name ().collate (
+ b.platform.get_name ());
+ if (ret != 0)
+ return ret;
+
+ var uid1 = a.uid.to_string ();
+ var uid2 = b.uid.to_string ();
+
+ return uid1.collate (uid2);
+ }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]