[banshee] Disambiguate SqliteModelCache.GetSingle calls

[Gabriel Burt <gburt src gnome org>]

commit 546e79c43170f8347763b8a9cbcd845c76766233
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Mon Feb 22 13:24:38 2010 -0800

    Disambiguate SqliteModelCache.GetSingle calls

 .../DatabaseTrackListModel.cs                      |    2 +-
 .../DatabaseTrackModelCache.cs                     |    4 ++--
 .../IDatabaseTrackModelCache.cs                    |    2 +-
 .../Banshee.Collection.Database/RandomByAlbum.cs   |    2 +-
 .../Banshee.Collection.Database/RandomByArtist.cs  |    2 +-
 .../Banshee.Collection.Database/RandomByRating.cs  |    2 +-
 .../Banshee.Collection.Database/RandomByScore.cs   |    2 +-
 .../Banshee.Collection.Database/RandomByTrack.cs   |    2 +-
 .../Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs    |    4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs
index e2c948b..7279c3a 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs
@@ -362,7 +362,7 @@ namespace Banshee.Collection.Database
         public int IndexOfFirst (TrackInfo track)
         {
             lock (this) {
-                return IndexOf (cache.GetSingle ("AND MetadataHash = ? ORDER BY OrderID", track.MetadataHash));
+                return IndexOf (cache.GetSingleWhere ("AND MetadataHash = ? ORDER BY OrderID", track.MetadataHash));
             }
         }
 
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackModelCache.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackModelCache.cs
index e63d3ea..d15d289 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackModelCache.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackModelCache.cs
@@ -41,9 +41,9 @@ namespace Banshee.Collection.Database
         {
         }
 
-        public new TrackInfo GetSingle (string conditionOrderFragment, params object [] args)
+        public new TrackInfo GetSingleWhere (string conditionOrderFragment, params object [] args)
         {
-            return base.GetSingle (conditionOrderFragment, args);
+            return base.GetSingleWhere (conditionOrderFragment, args);
         }
 
         public new TrackInfo GetSingle (string selectFragment, string fromFragment, string conditionOrderFragment, params object [] args)
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/IDatabaseTrackModelCache.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/IDatabaseTrackModelCache.cs
index 1649f67..69b66f1 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/IDatabaseTrackModelCache.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/IDatabaseTrackModelCache.cs
@@ -46,7 +46,7 @@ namespace Banshee.Collection.Database
         long IndexOf (Hyena.Data.ICacheableItem item);
         long IndexOf (object item_entry_id);
         TrackInfo GetSingle (string selectFragment, string fromFragment, string conditionOrderFragment, params object [] args);
-        TrackInfo GetSingle (string conditionOrderFragment, params object [] args);
+        TrackInfo GetSingleWhere (string conditionOrderFragment, params object [] args);
         TrackInfo GetValue (long index);
         long CacheId { get; }
         event Action<IDataReader> AggregatesUpdated;
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs
index 800f40f..17398e9 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs
@@ -82,7 +82,7 @@ namespace Banshee.Collection.Database
 
         public override TrackInfo GetPlaybackTrack (DateTime after)
         {
-            return album_id == null ? null : Cache.GetSingle (last_played_condition, (int)album_id, after, after);
+            return album_id == null ? null : Cache.GetSingleWhere (last_played_condition, (int)album_id, after, after);
         }
 
         public override DatabaseTrackInfo GetShufflerTrack (DateTime after)
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs
index b5d60e7..d4e196b 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs
@@ -81,7 +81,7 @@ namespace Banshee.Collection.Database
 
         public override TrackInfo GetPlaybackTrack (DateTime after)
         {
-            return id == null ? null : Cache.GetSingle (track_condition, (int)id, after, after);
+            return id == null ? null : Cache.GetSingleWhere (track_condition, (int)id, after, after);
         }
 
         public override DatabaseTrackInfo GetShufflerTrack (DateTime after)
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs
index 2b95e3c..57e61d3 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs
@@ -53,7 +53,7 @@ namespace Banshee.Collection.Database
 
         public override TrackInfo GetPlaybackTrack (DateTime after)
         {
-            var track = !IsReady ? null : Cache.GetSingle (track_condition, slot + 1, slot + 1, after, after);
+            var track = !IsReady ? null : Cache.GetSingleWhere (track_condition, slot + 1, slot + 1, after, after);
             Reset ();
             return track;
         }
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs
index 34204df..ec61ce6 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs
@@ -52,7 +52,7 @@ namespace Banshee.Collection.Database
             int min = slot * 100 / Slots + 1;
             int max = (slot + 1) * 100 / Slots;
 
-            var track = !IsReady ? null : Cache.GetSingle (track_condition, min, max, max, after, after);
+            var track = !IsReady ? null : Cache.GetSingleWhere (track_condition, min, max, max, after, after);
             Reset ();
             return track;
         }
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs
index 9edc2fb..24b133f 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs
@@ -59,7 +59,7 @@ namespace Banshee.Collection.Database
 
         public override TrackInfo GetPlaybackTrack (DateTime after)
         {
-            return Cache.GetSingle (track_condition, after, after);
+            return Cache.GetSingleWhere (track_condition, after, after);
         }
 
         public override DatabaseTrackInfo GetShufflerTrack (DateTime after)
diff --git a/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs b/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs
index d7fec3c..c877c28 100644
--- a/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs
+++ b/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs
@@ -291,7 +291,7 @@ namespace Hyena.Data.Sqlite
             }
         }
 
-        public T GetSingle (string conditionOrderFragment, params object [] args)
+        public T GetSingleWhere (string conditionOrderFragment, params object [] args)
         {
             return GetSingle (null, null, conditionOrderFragment, args);
         }
@@ -497,4 +497,4 @@ namespace Hyena.Data.Sqlite
             checked_cache_table = CacheTableName;
         }
     }
-}
\ No newline at end of file
+}