From 0a24d188b43aabaf63b8736c97c1a2763da7912e Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 10 Jan 2019 14:32:16 +0900 Subject: [PATCH] Remove TryGetValue as it won't work --- osu.Game/Skinning/ISkinSource.cs | 2 -- osu.Game/Skinning/LocalSkinOverrideContainer.cs | 16 ---------------- osu.Game/Skinning/Skin.cs | 10 ---------- osu.Game/Skinning/SkinManager.cs | 2 -- 4 files changed, 30 deletions(-) diff --git a/osu.Game/Skinning/ISkinSource.cs b/osu.Game/Skinning/ISkinSource.cs index 8ec8db6b64..53ac4c3454 100644 --- a/osu.Game/Skinning/ISkinSource.cs +++ b/osu.Game/Skinning/ISkinSource.cs @@ -22,7 +22,5 @@ namespace osu.Game.Skinning SampleChannel GetSample(string sampleName); TValue GetValue(Func query) where TConfiguration : SkinConfiguration; - - bool TryGetValue(Func query, out TValue val) where TConfiguration : SkinConfiguration; } } diff --git a/osu.Game/Skinning/LocalSkinOverrideContainer.cs b/osu.Game/Skinning/LocalSkinOverrideContainer.cs index 78e9822fb6..2dab671936 100644 --- a/osu.Game/Skinning/LocalSkinOverrideContainer.cs +++ b/osu.Game/Skinning/LocalSkinOverrideContainer.cs @@ -53,22 +53,6 @@ namespace osu.Game.Skinning return fallbackSource == null ? default : fallbackSource.GetValue(query); } - public bool TryGetValue(Func query, out TValue val) where TConfiguration : SkinConfiguration - { - val = default; - - if ((source as Skin)?.Configuration is TConfiguration conf) - if (beatmapSkins && query(conf, val)) - return true; - - if (fallbackSource == null) - { - return false; - } - - return fallbackSource.TryGetValue(query, out val); - } - private readonly ISkinSource source; private ISkinSource fallbackSource; diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs index a4c99a8b95..21027ff4ab 100644 --- a/osu.Game/Skinning/Skin.cs +++ b/osu.Game/Skinning/Skin.cs @@ -25,16 +25,6 @@ namespace osu.Game.Skinning public TValue GetValue(Func query) where TConfiguration : SkinConfiguration => Configuration is TConfiguration conf ? query.Invoke(conf) : default; - public bool TryGetValue(Func query, out TValue val) where TConfiguration : SkinConfiguration - { - val = default; - - if (Configuration is TConfiguration conf) - return query(conf, val); - - return false; - } - protected Skin(SkinInfo skin) { SkinInfo = skin; diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs index b3b2521489..454e80d8c6 100644 --- a/osu.Game/Skinning/SkinManager.cs +++ b/osu.Game/Skinning/SkinManager.cs @@ -117,7 +117,5 @@ namespace osu.Game.Skinning public SampleChannel GetSample(string sampleName) => CurrentSkin.Value.GetSample(sampleName); public TValue GetValue(Func query) where TConfiguration : SkinConfiguration => CurrentSkin.Value.GetValue(query); - - public bool TryGetValue(Func query, out TValue val) where TConfiguration : SkinConfiguration => CurrentSkin.Value.TryGetValue(query, out val); } }