From 13431044c167748cd2d37c4b017999305ccd2d04 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 17 Nov 2019 07:04:21 +0100
Subject: [PATCH] Remove TryGetValueUntyped.

---
 src/Avalonia.Base/ValueStore.cs | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Base/ValueStore.cs b/src/Avalonia.Base/ValueStore.cs
index f6f489ef2c..c3309bf52c 100644
--- a/src/Avalonia.Base/ValueStore.cs
+++ b/src/Avalonia.Base/ValueStore.cs
@@ -34,38 +34,27 @@ namespace Avalonia
         }
 
         public bool IsSet(AvaloniaProperty property)
-        {
-            return TryGetValueUntyped(property, out _);
-        }
-
-        public bool TryGetValue<T>(StyledPropertyBase<T> property, out T value)
         {
             if (_values.TryGetValue(property, out var slot))
             {
-                if (slot is IValue<T> v)
+                if (slot is IValue v)
                 {
-                    if (v.Value.HasValue)
-                    {
-                        value = v.Value.Value;
-                        return true;
-                    }
+                    return v.Value.HasValue;
                 }
                 else
                 {
-                    value = (T)slot;
                     return true;
                 }
             }
 
-            value = default!;
             return false;
         }
 
-        public bool TryGetValueUntyped(AvaloniaProperty property, out object? value)
+        public bool TryGetValue<T>(StyledPropertyBase<T> property, out T value)
         {
             if (_values.TryGetValue(property, out var slot))
             {
-                if (slot is IValue v)
+                if (slot is IValue<T> v)
                 {
                     if (v.Value.HasValue)
                     {
@@ -75,12 +64,12 @@ namespace Avalonia
                 }
                 else
                 {
-                    value = slot;
+                    value = (T)slot;
                     return true;
                 }
             }
 
-            value = default;
+            value = default!;
             return false;
         }