From 708b10544fe00a43af50ecec1bd3b57e439e50e2 Mon Sep 17 00:00:00 2001 From: shahid-pk Date: Tue, 15 Sep 2015 15:03:54 +0500 Subject: [PATCH] consistent names for xaml type converters --- .../Perspex.Markup.Xaml/Context/PerspexWiringContext.cs | 6 +++--- .../{BitmapConverter.cs => BitmapTypeConverter.cs} | 2 +- .../Converters/{BrushConverter.cs => BrushTypeConverter.cs} | 2 +- .../{ThicknessConverter.cs => ThicknessTypeConverter.cs} | 2 +- src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) rename src/Markup/Perspex.Markup.Xaml/Converters/{BitmapConverter.cs => BitmapTypeConverter.cs} (94%) rename src/Markup/Perspex.Markup.Xaml/Converters/{BrushConverter.cs => BrushTypeConverter.cs} (94%) rename src/Markup/Perspex.Markup.Xaml/Converters/{ThicknessConverter.cs => ThicknessTypeConverter.cs} (94%) diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs index 7ab5758f41..7fa4822da3 100644 --- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs +++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs @@ -80,12 +80,12 @@ namespace Perspex.Markup.Xaml.Context var typeConverterProvider = new TypeConverterProvider(); var converters = new[] { - new TypeConverterRegistration(typeof(Bitmap), new BitmapConverter()), - new TypeConverterRegistration(typeof(Brush), new BrushConverter()), + new TypeConverterRegistration(typeof(Bitmap), new BitmapTypeConverter()), + new TypeConverterRegistration(typeof(Brush), new BrushTypeConverter()), new TypeConverterRegistration(typeof(ColumnDefinitions), new ColumnDefinitionsTypeConverter()), new TypeConverterRegistration(typeof(GridLength), new GridLengthTypeConverter()), new TypeConverterRegistration(typeof(RowDefinitions), new RowDefinitionsTypeConverter()), - new TypeConverterRegistration(typeof(Thickness), new ThicknessConverter()), + new TypeConverterRegistration(typeof(Thickness), new ThicknessTypeConverter()), }; typeConverterProvider.AddAll(converters); diff --git a/src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs similarity index 94% rename from src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs rename to src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs index 392da12630..1aa1660079 100644 --- a/src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs +++ b/src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs @@ -8,7 +8,7 @@ using Perspex.Media.Imaging; namespace Perspex.Markup.Xaml.Converters { - public class BitmapConverter : ITypeConverter + public class BitmapTypeConverter : ITypeConverter { public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType) { diff --git a/src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/BrushTypeConverter.cs similarity index 94% rename from src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs rename to src/Markup/Perspex.Markup.Xaml/Converters/BrushTypeConverter.cs index d734caf37a..197cb20a8d 100644 --- a/src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs +++ b/src/Markup/Perspex.Markup.Xaml/Converters/BrushTypeConverter.cs @@ -8,7 +8,7 @@ using Perspex.Media; namespace Perspex.Markup.Xaml.Converters { - public class BrushConverter : ITypeConverter + public class BrushTypeConverter : ITypeConverter { public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType) { diff --git a/src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/ThicknessTypeConverter.cs similarity index 94% rename from src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs rename to src/Markup/Perspex.Markup.Xaml/Converters/ThicknessTypeConverter.cs index a001913711..1e33525494 100644 --- a/src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs +++ b/src/Markup/Perspex.Markup.Xaml/Converters/ThicknessTypeConverter.cs @@ -7,7 +7,7 @@ using OmniXaml.TypeConversion; namespace Perspex.Markup.Xaml.Converters { - public class ThicknessConverter : ITypeConverter + public class ThicknessTypeConverter : ITypeConverter { public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType) { diff --git a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj index e146cac468..d2aaa43766 100644 --- a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj +++ b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj @@ -40,11 +40,11 @@ - + - - + +