From de4d2390d3e9b6caa6670508023361e01ca274e3 Mon Sep 17 00:00:00 2001 From: robloo Date: Wed, 15 Mar 2023 19:37:15 -0400 Subject: [PATCH] Remove IsEmpty and Empty members These were only removed for relevant/discussed types. Collections and some other lesser used types still have IsEmpty properties. --- src/Avalonia.Base/CornerRadius.cs | 4 ---- src/Avalonia.Base/Media/BoxShadow.cs | 4 ---- src/Avalonia.Base/PixelRect.cs | 10 ---------- src/Avalonia.Base/Rect.cs | 10 ---------- src/Avalonia.Base/Size.cs | 6 ------ src/Avalonia.Base/Thickness.cs | 4 ---- 6 files changed, 38 deletions(-) diff --git a/src/Avalonia.Base/CornerRadius.cs b/src/Avalonia.Base/CornerRadius.cs index 1666fac2e1..ed499244a1 100644 --- a/src/Avalonia.Base/CornerRadius.cs +++ b/src/Avalonia.Base/CornerRadius.cs @@ -65,10 +65,6 @@ namespace Avalonia /// public bool IsDefault => TopLeft == 0 && TopRight == 0 && BottomLeft == 0 && BottomRight == 0; - /// - [Obsolete("Use IsDefault instead.")] - public bool IsEmpty => IsDefault; - /// /// Gets a value indicating whether all corner radii are equal. /// diff --git a/src/Avalonia.Base/Media/BoxShadow.cs b/src/Avalonia.Base/Media/BoxShadow.cs index dd2c23f4ae..adf80a4467 100644 --- a/src/Avalonia.Base/Media/BoxShadow.cs +++ b/src/Avalonia.Base/Media/BoxShadow.cs @@ -50,10 +50,6 @@ namespace Avalonia.Media /// public bool IsDefault => OffsetX == 0 && OffsetY == 0 && Blur == 0 && Spread == 0; - /// - [Obsolete("Use IsDefault instead.")] - public bool IsEmpty => IsDefault; - private readonly static char[] s_Separator = new char[] { ' ', '\t' }; struct ArrayReader diff --git a/src/Avalonia.Base/PixelRect.cs b/src/Avalonia.Base/PixelRect.cs index ef207a3dae..d6560080e2 100644 --- a/src/Avalonia.Base/PixelRect.cs +++ b/src/Avalonia.Base/PixelRect.cs @@ -9,12 +9,6 @@ namespace Avalonia /// public readonly struct PixelRect : IEquatable { - /// - /// An empty rectangle. - /// - [Obsolete("Use the default keyword instead.")] - public static readonly PixelRect Empty = default; - /// /// Initializes a new instance of the structure. /// @@ -138,10 +132,6 @@ namespace Avalonia /// public bool IsDefault => Width == 0 && Height == 0; - /// - [Obsolete("Use IsDefault instead.")] - public bool IsEmpty => IsDefault; - /// /// Checks for equality between two s. /// diff --git a/src/Avalonia.Base/Rect.cs b/src/Avalonia.Base/Rect.cs index 49dc087933..6c77008feb 100644 --- a/src/Avalonia.Base/Rect.cs +++ b/src/Avalonia.Base/Rect.cs @@ -16,12 +16,6 @@ namespace Avalonia Animation.Animation.RegisterAnimator(prop => typeof(Rect).IsAssignableFrom(prop.PropertyType)); } - /// - /// An empty rectangle. - /// - [Obsolete("Use the default keyword instead.")] - public static readonly Rect Empty = default; - /// /// The X position. /// @@ -177,10 +171,6 @@ namespace Avalonia public bool IsDefault => _width == 0 && _height == 0; // ReSharper restore CompareOfFloatsByEqualityOperator - /// - [Obsolete("Use IsDefault instead.")] - public bool IsEmpty => IsDefault; - /// /// Checks for equality between two s. /// diff --git a/src/Avalonia.Base/Size.cs b/src/Avalonia.Base/Size.cs index aec237afae..184bb1f378 100644 --- a/src/Avalonia.Base/Size.cs +++ b/src/Avalonia.Base/Size.cs @@ -27,12 +27,6 @@ namespace Avalonia /// public static readonly Size Infinity = new Size(double.PositiveInfinity, double.PositiveInfinity); - /// - /// A size representing zero. - /// - [Obsolete("Use the default keyword instead.")] - public static readonly Size Empty = new Size(0, 0); - /// /// The width. /// diff --git a/src/Avalonia.Base/Thickness.cs b/src/Avalonia.Base/Thickness.cs index f9e4355edd..9a419ad5b1 100644 --- a/src/Avalonia.Base/Thickness.cs +++ b/src/Avalonia.Base/Thickness.cs @@ -97,10 +97,6 @@ namespace Avalonia /// public double Bottom => _bottom; - /// - [Obsolete("Use IsDefault instead.")] - public bool IsEmpty => IsDefault; - /// /// Gets a value indicating whether all sides are equal. ///