From 7cccc6bda01d47d2d26bfbcd27806740d1dad90d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Mon, 1 Jan 2018 21:51:55 +0000 Subject: [PATCH] Use nameof where possible. --- src/Avalonia.Controls/Carousel.cs | 2 +- src/Avalonia.Controls/ColumnDefinition.cs | 6 +++--- src/Avalonia.Controls/DropDown.cs | 2 +- .../Primitives/HeaderedContentControl.cs | 2 +- .../Primitives/TemplatedControl.cs | 2 +- src/Avalonia.Controls/Primitives/Thumb.cs | 6 +++--- src/Avalonia.Controls/RowDefinition.cs | 6 +++--- src/Avalonia.Controls/Shapes/Line.cs | 4 ++-- src/Avalonia.Controls/Shapes/Path.cs | 2 +- src/Avalonia.Controls/Shapes/Shape.cs | 8 ++++---- src/Avalonia.Controls/TextBox.cs | 10 +++++----- .../Views/ControlDetailsView.cs | 2 +- src/Avalonia.HtmlRenderer/HtmlControl.cs | 16 ++++++++-------- src/Avalonia.Input/InputElement.cs | 18 +++++++++--------- src/Avalonia.Input/KeyBinding.cs | 6 +++--- src/Avalonia.Visuals/Media/Geometry.cs | 2 +- src/Avalonia.Visuals/Media/ImageBrush.cs | 2 +- src/Avalonia.Visuals/Media/MatrixTransform.cs | 2 +- src/Avalonia.Visuals/Media/RotateTransform.cs | 2 +- .../Media/TranslateTransform.cs | 4 ++-- src/Avalonia.Visuals/Media/VisualBrush.cs | 2 +- .../AvaloniaObjectTests_Direct.cs | 6 +++--- .../AvaloniaObjectTests_GetSubject.cs | 2 +- .../DirectPropertyTests.cs | 2 +- ...ExpressionObserverTests_AttachedProperty.cs | 2 +- .../Data/BindingTests.cs | 2 +- .../Xaml/NonControl.cs | 6 +++--- tests/Avalonia.Styling.UnitTests/StyleTests.cs | 2 +- 28 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/Avalonia.Controls/Carousel.cs b/src/Avalonia.Controls/Carousel.cs index 71446c627f..e7c934091a 100644 --- a/src/Avalonia.Controls/Carousel.cs +++ b/src/Avalonia.Controls/Carousel.cs @@ -24,7 +24,7 @@ namespace Avalonia.Controls /// Defines the property. /// public static readonly StyledProperty TransitionProperty = - AvaloniaProperty.Register("Transition"); + AvaloniaProperty.Register(nameof(Transition)); /// /// The default value of for diff --git a/src/Avalonia.Controls/ColumnDefinition.cs b/src/Avalonia.Controls/ColumnDefinition.cs index 36fadd0f05..a6b34f8a16 100644 --- a/src/Avalonia.Controls/ColumnDefinition.cs +++ b/src/Avalonia.Controls/ColumnDefinition.cs @@ -12,19 +12,19 @@ namespace Avalonia.Controls /// Defines the property. /// public static readonly StyledProperty MaxWidthProperty = - AvaloniaProperty.Register("MaxWidth", double.PositiveInfinity); + AvaloniaProperty.Register(nameof(MaxWidth), double.PositiveInfinity); /// /// Defines the property. /// public static readonly StyledProperty MinWidthProperty = - AvaloniaProperty.Register("MinWidth"); + AvaloniaProperty.Register(nameof(MinWidth)); /// /// Defines the property. /// public static readonly StyledProperty WidthProperty = - AvaloniaProperty.Register("Width", new GridLength(1, GridUnitType.Star)); + AvaloniaProperty.Register(nameof(Width), new GridLength(1, GridUnitType.Star)); /// /// Initializes a new instance of the class. diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs index 6b27c479ba..a7ea2da4a4 100644 --- a/src/Avalonia.Controls/DropDown.cs +++ b/src/Avalonia.Controls/DropDown.cs @@ -38,7 +38,7 @@ namespace Avalonia.Controls /// Defines the property. /// public static readonly DirectProperty SelectionBoxItemProperty = - AvaloniaProperty.RegisterDirect("SelectionBoxItem", o => o.SelectionBoxItem); + AvaloniaProperty.RegisterDirect(nameof(SelectionBoxItem), o => o.SelectionBoxItem); private bool _isDropDownOpen; private Popup _popup; diff --git a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs index a2de1fbf0e..d67ebfd489 100644 --- a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs +++ b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs @@ -12,7 +12,7 @@ namespace Avalonia.Controls.Primitives /// Defines the property. /// public static readonly StyledProperty HeaderProperty = - AvaloniaProperty.Register("Header"); + AvaloniaProperty.Register(nameof(Header)); /// /// Gets or sets the header content. diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs index 1ddfb97c14..6deef7c7b9 100644 --- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs +++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs @@ -75,7 +75,7 @@ namespace Avalonia.Controls.Primitives /// Defines the property. /// public static readonly StyledProperty TemplateProperty = - AvaloniaProperty.Register("Template"); + AvaloniaProperty.Register(nameof(Template)); /// /// Defines the IsTemplateFocusTarget attached property. diff --git a/src/Avalonia.Controls/Primitives/Thumb.cs b/src/Avalonia.Controls/Primitives/Thumb.cs index 065b1aedbe..da4dc63d1e 100644 --- a/src/Avalonia.Controls/Primitives/Thumb.cs +++ b/src/Avalonia.Controls/Primitives/Thumb.cs @@ -11,13 +11,13 @@ namespace Avalonia.Controls.Primitives public class Thumb : TemplatedControl { public static readonly RoutedEvent DragStartedEvent = - RoutedEvent.Register("DragStarted", RoutingStrategies.Bubble); + RoutedEvent.Register(nameof(DragStarted), RoutingStrategies.Bubble); public static readonly RoutedEvent DragDeltaEvent = - RoutedEvent.Register("DragDelta", RoutingStrategies.Bubble); + RoutedEvent.Register(nameof(DragDelta), RoutingStrategies.Bubble); public static readonly RoutedEvent DragCompletedEvent = - RoutedEvent.Register("DragCompleted", RoutingStrategies.Bubble); + RoutedEvent.Register(nameof(DragCompleted), RoutingStrategies.Bubble); private Point? _lastPoint; diff --git a/src/Avalonia.Controls/RowDefinition.cs b/src/Avalonia.Controls/RowDefinition.cs index 265cede17f..7307843417 100644 --- a/src/Avalonia.Controls/RowDefinition.cs +++ b/src/Avalonia.Controls/RowDefinition.cs @@ -12,19 +12,19 @@ namespace Avalonia.Controls /// Defines the property. /// public static readonly StyledProperty MaxHeightProperty = - AvaloniaProperty.Register("MaxHeight", double.PositiveInfinity); + AvaloniaProperty.Register(nameof(MaxHeight), double.PositiveInfinity); /// /// Defines the property. /// public static readonly StyledProperty MinHeightProperty = - AvaloniaProperty.Register("MinHeight"); + AvaloniaProperty.Register(nameof(MinHeight)); /// /// Defines the property. /// public static readonly StyledProperty HeightProperty = - AvaloniaProperty.Register("Height", new GridLength(1, GridUnitType.Star)); + AvaloniaProperty.Register(nameof(Height), new GridLength(1, GridUnitType.Star)); /// /// Initializes a new instance of the class. diff --git a/src/Avalonia.Controls/Shapes/Line.cs b/src/Avalonia.Controls/Shapes/Line.cs index 922597e5bf..b06fe40710 100644 --- a/src/Avalonia.Controls/Shapes/Line.cs +++ b/src/Avalonia.Controls/Shapes/Line.cs @@ -8,10 +8,10 @@ namespace Avalonia.Controls.Shapes public class Line : Shape { public static readonly StyledProperty StartPointProperty = - AvaloniaProperty.Register("StartPoint"); + AvaloniaProperty.Register(nameof(StartPoint)); public static readonly StyledProperty EndPointProperty = - AvaloniaProperty.Register("EndPoint"); + AvaloniaProperty.Register(nameof(EndPoint)); static Line() { diff --git a/src/Avalonia.Controls/Shapes/Path.cs b/src/Avalonia.Controls/Shapes/Path.cs index a337e7c6de..08bed79b3a 100644 --- a/src/Avalonia.Controls/Shapes/Path.cs +++ b/src/Avalonia.Controls/Shapes/Path.cs @@ -9,7 +9,7 @@ namespace Avalonia.Controls.Shapes public class Path : Shape { public static readonly StyledProperty DataProperty = - AvaloniaProperty.Register("Data"); + AvaloniaProperty.Register(nameof(Data)); static Path() { diff --git a/src/Avalonia.Controls/Shapes/Shape.cs b/src/Avalonia.Controls/Shapes/Shape.cs index 73b89ca4b7..2ea681891d 100644 --- a/src/Avalonia.Controls/Shapes/Shape.cs +++ b/src/Avalonia.Controls/Shapes/Shape.cs @@ -12,19 +12,19 @@ namespace Avalonia.Controls.Shapes public abstract class Shape : Control { public static readonly StyledProperty FillProperty = - AvaloniaProperty.Register("Fill"); + AvaloniaProperty.Register(nameof(Fill)); public static readonly StyledProperty StretchProperty = - AvaloniaProperty.Register("Stretch"); + AvaloniaProperty.Register(nameof(Stretch)); public static readonly StyledProperty StrokeProperty = - AvaloniaProperty.Register("Stroke"); + AvaloniaProperty.Register(nameof(Stroke)); public static readonly StyledProperty> StrokeDashArrayProperty = AvaloniaProperty.Register>("StrokeDashArray"); public static readonly StyledProperty StrokeThicknessProperty = - AvaloniaProperty.Register("StrokeThickness"); + AvaloniaProperty.Register(nameof(StrokeThickness)); private Matrix _transform = Matrix.Identity; private Geometry _definingGeometry; diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs index 36ef8d05c3..1a663ed3b6 100644 --- a/src/Avalonia.Controls/TextBox.cs +++ b/src/Avalonia.Controls/TextBox.cs @@ -21,13 +21,13 @@ namespace Avalonia.Controls public class TextBox : TemplatedControl, UndoRedoHelper.IUndoRedoHost { public static readonly StyledProperty AcceptsReturnProperty = - AvaloniaProperty.Register("AcceptsReturn"); + AvaloniaProperty.Register(nameof(AcceptsReturn)); public static readonly StyledProperty AcceptsTabProperty = - AvaloniaProperty.Register("AcceptsTab"); + AvaloniaProperty.Register(nameof(AcceptsTab)); public static readonly DirectProperty CanScrollHorizontallyProperty = - AvaloniaProperty.RegisterDirect("CanScrollHorizontally", o => o.CanScrollHorizontally); + AvaloniaProperty.RegisterDirect(nameof(CanScrollHorizontally), o => o.CanScrollHorizontally); public static readonly DirectProperty CaretIndexProperty = AvaloniaProperty.RegisterDirect( @@ -69,10 +69,10 @@ namespace Avalonia.Controls TextBlock.TextWrappingProperty.AddOwner(); public static readonly StyledProperty WatermarkProperty = - AvaloniaProperty.Register("Watermark"); + AvaloniaProperty.Register(nameof(Watermark)); public static readonly StyledProperty UseFloatingWatermarkProperty = - AvaloniaProperty.Register("UseFloatingWatermark"); + AvaloniaProperty.Register(nameof(UseFloatingWatermark)); struct UndoRedoState : IEquatable { diff --git a/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs b/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs index e58818d31d..381b2e04b4 100644 --- a/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs +++ b/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs @@ -14,7 +14,7 @@ namespace Avalonia.Diagnostics.Views internal class ControlDetailsView : UserControl { private static readonly StyledProperty ViewModelProperty = - AvaloniaProperty.Register("ViewModel"); + AvaloniaProperty.Register(nameof(ViewModel)); private SimpleGrid _grid; public ControlDetailsView() diff --git a/src/Avalonia.HtmlRenderer/HtmlControl.cs b/src/Avalonia.HtmlRenderer/HtmlControl.cs index 0051f6427b..94b2d56f5f 100644 --- a/src/Avalonia.HtmlRenderer/HtmlControl.cs +++ b/src/Avalonia.HtmlRenderer/HtmlControl.cs @@ -74,29 +74,29 @@ namespace Avalonia.Controls.Html protected Point _lastScrollOffset; public static readonly AvaloniaProperty AvoidImagesLateLoadingProperty = - PropertyHelper.Register("AvoidImagesLateLoading", false, OnAvaloniaProperty_valueChanged); + PropertyHelper.Register(nameof(AvoidImagesLateLoading), false, OnAvaloniaProperty_valueChanged); public static readonly AvaloniaProperty IsSelectionEnabledProperty = - PropertyHelper.Register("IsSelectionEnabled", true, OnAvaloniaProperty_valueChanged); + PropertyHelper.Register(nameof(IsSelectionEnabled), true, OnAvaloniaProperty_valueChanged); public static readonly AvaloniaProperty IsContextMenuEnabledProperty = - PropertyHelper.Register("IsContextMenuEnabled", true, OnAvaloniaProperty_valueChanged); + PropertyHelper.Register(nameof(IsContextMenuEnabled), true, OnAvaloniaProperty_valueChanged); public static readonly AvaloniaProperty BaseStylesheetProperty = - PropertyHelper.Register("BaseStylesheet", null, OnAvaloniaProperty_valueChanged); + PropertyHelper.Register(nameof(BaseStylesheet), null, OnAvaloniaProperty_valueChanged); public static readonly AvaloniaProperty TextProperty = - PropertyHelper.Register("Text", null, OnAvaloniaProperty_valueChanged); + PropertyHelper.Register(nameof(Text), null, OnAvaloniaProperty_valueChanged); public static readonly StyledProperty BackgroundProperty = Border.BackgroundProperty.AddOwner(); public static readonly AvaloniaProperty BorderThicknessProperty = - AvaloniaProperty.Register("BorderThickness", new Thickness(0)); + AvaloniaProperty.Register(nameof(BorderThickness), new Thickness(0)); public static readonly AvaloniaProperty BorderBrushProperty = - AvaloniaProperty.Register("BorderBrush"); + AvaloniaProperty.Register(nameof(BorderBrush)); public static readonly AvaloniaProperty PaddingProperty = - AvaloniaProperty.Register("Padding", new Thickness(0)); + AvaloniaProperty.Register(nameof(Padding), new Thickness(0)); public static readonly RoutedEvent LoadCompleteEvent = RoutedEvent.Register("LoadComplete", RoutingStrategies.Bubble, typeof(HtmlControl)); diff --git a/src/Avalonia.Input/InputElement.cs b/src/Avalonia.Input/InputElement.cs index 6385f7197b..8ac49df4cd 100644 --- a/src/Avalonia.Input/InputElement.cs +++ b/src/Avalonia.Input/InputElement.cs @@ -31,43 +31,43 @@ namespace Avalonia.Input /// Defines the property. /// public static readonly StyledProperty IsEnabledCoreProperty = - AvaloniaProperty.Register("IsEnabledCore", true); + AvaloniaProperty.Register(nameof(IsEnabledCore), true); /// /// Gets or sets associated mouse cursor. /// public static readonly StyledProperty CursorProperty = - AvaloniaProperty.Register("Cursor", null, true); + AvaloniaProperty.Register(nameof(Cursor), null, true); /// /// Defines the property. /// public static readonly DirectProperty IsFocusedProperty = - AvaloniaProperty.RegisterDirect("IsFocused", o => o.IsFocused); + AvaloniaProperty.RegisterDirect(nameof(IsFocused), o => o.IsFocused); /// /// Defines the property. /// public static readonly StyledProperty IsHitTestVisibleProperty = - AvaloniaProperty.Register("IsHitTestVisible", true); + AvaloniaProperty.Register(nameof(IsHitTestVisible), true); /// /// Defines the property. /// public static readonly DirectProperty IsPointerOverProperty = - AvaloniaProperty.RegisterDirect("IsPointerOver", o => o.IsPointerOver); + AvaloniaProperty.RegisterDirect(nameof(IsPointerOver), o => o.IsPointerOver); /// /// Defines the event. /// public static readonly RoutedEvent GotFocusEvent = - RoutedEvent.Register("GotFocus", RoutingStrategies.Bubble); + RoutedEvent.Register(nameof(GotFocus), RoutingStrategies.Bubble); /// /// Defines the event. /// public static readonly RoutedEvent LostFocusEvent = - RoutedEvent.Register("LostFocus", RoutingStrategies.Bubble); + RoutedEvent.Register(nameof(LostFocus), RoutingStrategies.Bubble); /// /// Defines the event. @@ -97,13 +97,13 @@ namespace Avalonia.Input /// Defines the event. /// public static readonly RoutedEvent PointerEnterEvent = - RoutedEvent.Register("PointerEnter", RoutingStrategies.Direct); + RoutedEvent.Register(nameof(PointerEnter), RoutingStrategies.Direct); /// /// Defines the event. /// public static readonly RoutedEvent PointerLeaveEvent = - RoutedEvent.Register("PointerLeave", RoutingStrategies.Direct); + RoutedEvent.Register(nameof(PointerLeave), RoutingStrategies.Direct); /// /// Defines the event. diff --git a/src/Avalonia.Input/KeyBinding.cs b/src/Avalonia.Input/KeyBinding.cs index a14f87beb1..035b6978f4 100644 --- a/src/Avalonia.Input/KeyBinding.cs +++ b/src/Avalonia.Input/KeyBinding.cs @@ -10,7 +10,7 @@ namespace Avalonia.Input public class KeyBinding : AvaloniaObject { public static readonly StyledProperty CommandProperty = - AvaloniaProperty.Register("Command"); + AvaloniaProperty.Register(nameof(Command)); public ICommand Command { @@ -19,7 +19,7 @@ namespace Avalonia.Input } public static readonly StyledProperty CommandParameterProperty = - AvaloniaProperty.Register("CommandParameter"); + AvaloniaProperty.Register(nameof(CommandParameter)); public object CommandParameter { @@ -28,7 +28,7 @@ namespace Avalonia.Input } public static readonly StyledProperty GestureProperty = - AvaloniaProperty.Register("Gesture"); + AvaloniaProperty.Register(nameof(Gesture)); public KeyGesture Gesture { diff --git a/src/Avalonia.Visuals/Media/Geometry.cs b/src/Avalonia.Visuals/Media/Geometry.cs index 591c7d0468..d27626bcc1 100644 --- a/src/Avalonia.Visuals/Media/Geometry.cs +++ b/src/Avalonia.Visuals/Media/Geometry.cs @@ -15,7 +15,7 @@ namespace Avalonia.Media /// Defines the property. /// public static readonly StyledProperty TransformProperty = - AvaloniaProperty.Register("Transform"); + AvaloniaProperty.Register(nameof(Transform)); /// /// Initializes static members of the class. diff --git a/src/Avalonia.Visuals/Media/ImageBrush.cs b/src/Avalonia.Visuals/Media/ImageBrush.cs index 69b98fd35c..fa491ed3e1 100644 --- a/src/Avalonia.Visuals/Media/ImageBrush.cs +++ b/src/Avalonia.Visuals/Media/ImageBrush.cs @@ -14,7 +14,7 @@ namespace Avalonia.Media /// Defines the property. /// public static readonly StyledProperty SourceProperty = - AvaloniaProperty.Register("Source"); + AvaloniaProperty.Register(nameof(Source)); /// /// Initializes a new instance of the class. diff --git a/src/Avalonia.Visuals/Media/MatrixTransform.cs b/src/Avalonia.Visuals/Media/MatrixTransform.cs index 1507720305..247a26dac1 100644 --- a/src/Avalonia.Visuals/Media/MatrixTransform.cs +++ b/src/Avalonia.Visuals/Media/MatrixTransform.cs @@ -15,7 +15,7 @@ namespace Avalonia.Media /// Defines the property. /// public static readonly StyledProperty MatrixProperty = - AvaloniaProperty.Register("Matrix", Matrix.Identity); + AvaloniaProperty.Register(nameof(Matrix), Matrix.Identity); /// /// Initializes a new instance of the class. diff --git a/src/Avalonia.Visuals/Media/RotateTransform.cs b/src/Avalonia.Visuals/Media/RotateTransform.cs index 41f2335ced..4fe615a6df 100644 --- a/src/Avalonia.Visuals/Media/RotateTransform.cs +++ b/src/Avalonia.Visuals/Media/RotateTransform.cs @@ -15,7 +15,7 @@ namespace Avalonia.Media /// Defines the property. /// public static readonly StyledProperty AngleProperty = - AvaloniaProperty.Register("Angle"); + AvaloniaProperty.Register(nameof(Angle)); /// /// Initializes a new instance of the class. diff --git a/src/Avalonia.Visuals/Media/TranslateTransform.cs b/src/Avalonia.Visuals/Media/TranslateTransform.cs index 0c9ca5debc..b66ca7939c 100644 --- a/src/Avalonia.Visuals/Media/TranslateTransform.cs +++ b/src/Avalonia.Visuals/Media/TranslateTransform.cs @@ -15,13 +15,13 @@ namespace Avalonia.Media /// Defines the property. /// public static readonly StyledProperty XProperty = - AvaloniaProperty.Register("X"); + AvaloniaProperty.Register(nameof(X)); /// /// Defines the property. /// public static readonly StyledProperty YProperty = - AvaloniaProperty.Register("Y"); + AvaloniaProperty.Register(nameof(Y)); /// /// Initializes a new instance of the class. diff --git a/src/Avalonia.Visuals/Media/VisualBrush.cs b/src/Avalonia.Visuals/Media/VisualBrush.cs index a6d2b8ae8f..435f4ba1b1 100644 --- a/src/Avalonia.Visuals/Media/VisualBrush.cs +++ b/src/Avalonia.Visuals/Media/VisualBrush.cs @@ -14,7 +14,7 @@ namespace Avalonia.Media /// Defines the property. /// public static readonly StyledProperty VisualProperty = - AvaloniaProperty.Register("Visual"); + AvaloniaProperty.Register(nameof(Visual)); /// /// Initializes a new instance of the class. diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs index f415d845ce..5cc5bae8b0 100644 --- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs +++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs @@ -506,17 +506,17 @@ namespace Avalonia.Base.UnitTests { public static readonly DirectProperty FooProperty = AvaloniaProperty.RegisterDirect( - "Foo", + nameof(Foo), o => o.Foo, (o, v) => o.Foo = v, unsetValue: "unset"); public static readonly DirectProperty BarProperty = - AvaloniaProperty.RegisterDirect("Bar", o => o.Bar); + AvaloniaProperty.RegisterDirect(nameof(Bar), o => o.Bar); public static readonly DirectProperty BazProperty = AvaloniaProperty.RegisterDirect( - "Bar", + nameof(Baz), o => o.Baz, (o, v) => o.Baz = v, unsetValue: -1); diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs index ec872e7cc0..bb6df0e4fb 100644 --- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs +++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs @@ -37,7 +37,7 @@ namespace Avalonia.Base.UnitTests private class Class1 : AvaloniaObject { public static readonly StyledProperty FooProperty = - AvaloniaProperty.Register("Foo", "foodefault"); + AvaloniaProperty.Register(nameof(Foo), "foodefault"); public string Foo { diff --git a/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs b/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs index 84ff492512..fe7186e417 100644 --- a/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs +++ b/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs @@ -85,7 +85,7 @@ namespace Avalonia.Base.UnitTests private class Class1 : AvaloniaObject { public static readonly DirectProperty FooProperty = - AvaloniaProperty.RegisterDirect("Foo", o => o.Foo, (o, v) => o.Foo = v); + AvaloniaProperty.RegisterDirect(nameof(Foo), o => o.Foo, (o, v) => o.Foo = v); private string _foo = "foo"; diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs index a8069cb75c..5ddff63a0c 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs @@ -136,7 +136,7 @@ namespace Avalonia.Markup.UnitTests.Data private class Class1 : AvaloniaObject { public static readonly StyledProperty NextProperty = - AvaloniaProperty.Register("Next"); + AvaloniaProperty.Register(nameof(Next)); public Class1 Next { diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs index 71c5385c23..c6f89e07a6 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs @@ -558,7 +558,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data private class InheritanceTest : Decorator { public static readonly StyledProperty BazProperty = - AvaloniaProperty.Register("Baz", defaultValue: 6, inherits: true); + AvaloniaProperty.Register(nameof(Baz), defaultValue: 6, inherits: true); public int Baz { diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs index 7562084072..7a728203e6 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs @@ -8,10 +8,10 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml public class NonControl : AvaloniaObject { public static readonly StyledProperty ControlProperty = - AvaloniaProperty.Register("Control"); + AvaloniaProperty.Register(nameof(Control)); public static readonly StyledProperty StringProperty = - AvaloniaProperty.Register("String"); + AvaloniaProperty.Register(nameof(String)); //No getter or setter Avalonia property public static readonly StyledProperty FooProperty = @@ -19,7 +19,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml //getter only Avalonia property public static readonly StyledProperty BarProperty = - AvaloniaProperty.Register("Bar"); + AvaloniaProperty.Register(nameof(Bar)); public Control Control { diff --git a/tests/Avalonia.Styling.UnitTests/StyleTests.cs b/tests/Avalonia.Styling.UnitTests/StyleTests.cs index d9756ebc4b..a7c559668b 100644 --- a/tests/Avalonia.Styling.UnitTests/StyleTests.cs +++ b/tests/Avalonia.Styling.UnitTests/StyleTests.cs @@ -170,7 +170,7 @@ namespace Avalonia.Styling.UnitTests private class Class1 : Control { public static readonly StyledProperty FooProperty = - AvaloniaProperty.Register("Foo", "foodefault"); + AvaloniaProperty.Register(nameof(Foo), "foodefault"); public string Foo {