From c836c7700220e786ece045a868003eefdae49932 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sat, 6 Jul 2019 21:18:45 -0700 Subject: [PATCH] Make SourceMode internal since it doesn't need to be public. --- .../MarkupExtensions/CompiledBindingExtension.cs | 7 ++----- .../CompiledBindings/CompiledBindingPath.cs | 7 +++---- .../Markup/Parsers/BindingExpressionGrammar.cs | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs index bc1e2cdd36..5c3628fd22 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs @@ -1,13 +1,10 @@ -extern alias Markup; -using System; +using System; using Avalonia.Data; using Avalonia.Controls; using Avalonia.Styling; using Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings; using Avalonia.Data.Core; - -using SourceMode = Markup::Avalonia.Markup.Parsers.SourceMode; -using Avalonia.Data.Converters; +using Avalonia.Markup.Parsers; namespace Avalonia.Markup.Xaml.MarkupExtensions { diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs index 81b9bd29b9..7daa90ec44 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs @@ -1,10 +1,9 @@ -extern alias Markup; -using System; +using System; using System.Collections.Generic; using Avalonia.Data.Core; using Avalonia.Data.Core.Plugins; +using Avalonia.Markup.Parsers; using Avalonia.Markup.Parsers.Nodes; -using SourceMode = Markup::Avalonia.Markup.Parsers.SourceMode; namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings { @@ -56,7 +55,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings return pathRoot ?? new EmptyExpressionNode(); } - public SourceMode SourceMode => _elements.Count > 0 && _elements[0] is IControlSourceBindingPathElement ? SourceMode.Control : SourceMode.Data; + internal SourceMode SourceMode => _elements.Count > 0 && _elements[0] is IControlSourceBindingPathElement ? SourceMode.Control : SourceMode.Data; } public class CompiledBindingPathBuilder diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs index 7181bbaa69..a58068cc5b 100644 --- a/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs +++ b/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; namespace Avalonia.Markup.Parsers { - public enum SourceMode + internal enum SourceMode { Data, Control