From 71a05f06d773387da1e9a2c018bd28435a31bf3c Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 26 May 2018 19:55:50 +0800
Subject: [PATCH] Merge Conflict fix

---
 .../AvaloniaDefaultTypeConverters.cs          | 86 -------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs

diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs
deleted file mode 100644
index b3009dc140..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Markup.Xaml.Converters;
-using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using Avalonia.Styling;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Collections;
-using Avalonia.Controls.Templates;
-
-namespace Avalonia.Markup.Xaml.PortableXaml
-{
-    public class AvaloniaDefaultTypeConverters
-    {
-        private static Dictionary<Type, Type> _defaultConverters = new Dictionary<Type, Type>()
-        {
-            //avalonia default converters
-            { typeof(IBitmap), typeof(BitmapTypeConverter)},
-            { typeof(IBrush), typeof(BrushTypeConverter) },
-            { typeof(Color), typeof(ColorTypeConverter) },
-            { typeof(Classes), typeof(ClassesTypeConverter) },
-            { typeof(ColumnDefinitions), typeof(ColumnDefinitionsTypeConverter) },
-            //{ typeof(DateTime), typeof(DateTimeTypeConverter) },
-            { typeof(Geometry), typeof(GeometryTypeConverter) },
-            { typeof(GridLength), typeof(GridLengthTypeConverter) },
-            { typeof(KeyGesture), typeof(KeyGestureConverter) },
-            { typeof(AvaloniaList<double>), typeof(AvaloniaListTypeConverter<double>) },
-            { typeof(IMemberSelector), typeof(MemberSelectorTypeConverter) },
-            { typeof(Point), typeof(PointTypeConverter) },
-            { typeof(Matrix), typeof(MatrixTypeConverter) },
-            { typeof(IList<Point>), typeof(PointsListTypeConverter) },
-            { typeof(AvaloniaProperty), typeof(AvaloniaPropertyTypeConverter) },
-            { typeof(RelativePoint), typeof(RelativePointTypeConverter) },
-            { typeof(RelativeRect), typeof(RelativeRectTypeConverter) },
-            { typeof(RowDefinitions), typeof(RowDefinitionsTypeConverter) },
-            { typeof(Size), typeof(SizeTypeConverter) },
-            { typeof(Rect), typeof(RectTypeConverter) },
-            { typeof(Selector), typeof(SelectorTypeConverter)},
-            { typeof(SolidColorBrush), typeof(BrushTypeConverter) },
-            { typeof(Thickness), typeof(ThicknessTypeConverter) },
-            { typeof(CornerRadius), typeof(CornerRadiusTypeConverter) },
-            { typeof(TimeSpan), typeof(TimeSpanTypeConverter) },
-            //{ typeof(Uri), typeof(Converters.UriTypeConverter) },
-            { typeof(Cursor), typeof(CursorTypeConverter) },
-            { typeof(WindowIcon), typeof(IconTypeConverter) },
-            //{ typeof(FontWeight), typeof(FontWeightConverter) },
-            { typeof(FontFamily), typeof(FontFamilyTypeConverter)}
-        };
-
-        public static Type GetTypeConverter(Type type)
-        {
-            Type converterType;
-
-            if (_defaultConverters.TryGetValue(type, out converterType))
-            {
-                return converterType;
-            }
-
-            //TODO: probably a smarter way to handle types
-            //is it needed ??
-            //Type curType = type;
-
-            //while (curType != null)
-            //{
-            //    if (_defaultConverters.TryGetValue(curType, out converterType))
-            //    {
-            //        if (curType != type)
-            //        {
-            //            _defaultConverters[curType] = converterType;
-            //        }
-            //        return converterType;
-            //    }
-            //    else
-            //    {
-            //        _defaultConverters[curType] = null;
-            //    }
-            //    curType = curType.GetTypeInfo().BaseType;
-            //}
-
-
-
-            return null;
-        }
-    }
-}
\ No newline at end of file