From d80cfbca18f9cd1266d5d0fbe1168a536b209b9d Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 31 Jan 2022 08:43:39 +0100 Subject: [PATCH] Remove #nullable directives. --- src/Avalonia.Controls/Application.cs | 1 - src/Avalonia.Controls/Chrome/CaptionButtons.cs | 2 -- src/Avalonia.Controls/Chrome/TitleBar.cs | 2 -- src/Avalonia.Controls/ContextMenu.cs | 2 -- src/Avalonia.Controls/ContextRequestedEventArgs.cs | 2 -- src/Avalonia.Controls/Control.cs | 2 -- .../Converters/CornerRadiusFilterConverter.cs | 3 +-- src/Avalonia.Controls/DefinitionList.cs | 2 -- src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs | 2 -- src/Avalonia.Controls/Diagnostics/ToolTipDiagnostics.cs | 4 +--- src/Avalonia.Controls/Expander.cs | 3 --- src/Avalonia.Controls/Flyouts/Flyout.cs | 2 -- src/Avalonia.Controls/Flyouts/FlyoutBase.cs | 2 -- src/Avalonia.Controls/Flyouts/MenuFlyout.cs | 2 -- src/Avalonia.Controls/IControl.cs | 2 -- src/Avalonia.Controls/IMenuElement.cs | 2 -- src/Avalonia.Controls/IMenuItem.cs | 4 +--- src/Avalonia.Controls/IScrollAnchorProvider.cs | 4 +--- src/Avalonia.Controls/ItemsSourceView.cs | 2 -- src/Avalonia.Controls/MaskedTextBox.cs | 2 -- src/Avalonia.Controls/Menu.cs | 2 -- src/Avalonia.Controls/MenuBase.cs | 2 -- src/Avalonia.Controls/MenuItem.cs | 2 -- .../Platform/DefaultMenuInteractionHandler.cs | 2 -- src/Avalonia.Controls/Platform/ISystemDialogImpl.cs | 2 -- src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs | 2 -- src/Avalonia.Controls/Platform/ITrayIconImpl.cs | 2 -- src/Avalonia.Controls/Platform/IWindowingPlatform.cs | 2 -- src/Avalonia.Controls/Platform/PlatformManager.cs | 2 -- src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs | 2 -- src/Avalonia.Controls/Primitives/AdornerLayer.cs | 2 -- src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs | 2 -- src/Avalonia.Controls/Primitives/HeaderedContentControl.cs | 2 -- src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs | 2 -- src/Avalonia.Controls/Primitives/Popup.cs | 2 -- src/Avalonia.Controls/Primitives/SelectingItemsControl.cs | 2 -- src/Avalonia.Controls/Primitives/TemplatedControl.cs | 2 -- src/Avalonia.Controls/RelativePanel.AttachedProperties.cs | 2 -- src/Avalonia.Controls/RelativePanel.cs | 2 -- src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs | 2 -- src/Avalonia.Controls/Selection/ISelectionModel.cs | 2 -- src/Avalonia.Controls/Selection/IndexRange.cs | 2 -- src/Avalonia.Controls/Selection/InternalSelectionModel.cs | 2 -- src/Avalonia.Controls/Selection/SelectedIndexes.cs | 2 -- src/Avalonia.Controls/Selection/SelectedItems.cs | 2 -- src/Avalonia.Controls/Selection/SelectionModel.cs | 2 -- .../Selection/SelectionModelIndexesChangedEventArgs.cs | 2 -- .../Selection/SelectionModelSelectionChangedEventArgs.cs | 2 -- src/Avalonia.Controls/Selection/SelectionNodeBase.cs | 2 -- src/Avalonia.Controls/Shapes/Shape.cs | 2 -- src/Avalonia.Controls/SystemDialog.cs | 2 -- src/Avalonia.Controls/Templates/DataTemplateExtensions.cs | 2 -- src/Avalonia.Controls/Templates/FuncTemplate`2.cs | 2 -- src/Avalonia.Controls/Templates/IDataTemplate.cs | 2 -- src/Avalonia.Controls/Templates/IRecyclingDataTemplate.cs | 4 +--- src/Avalonia.Controls/ToolTip.cs | 1 - src/Avalonia.Controls/TrayIcon.cs | 2 -- src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs | 2 -- 58 files changed, 5 insertions(+), 119 deletions(-) diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs index 9f7f54d293..69fd6cabf8 100644 --- a/src/Avalonia.Controls/Application.cs +++ b/src/Avalonia.Controls/Application.cs @@ -13,7 +13,6 @@ using Avalonia.Platform; using Avalonia.Rendering; using Avalonia.Styling; using Avalonia.Threading; -#nullable enable namespace Avalonia { diff --git a/src/Avalonia.Controls/Chrome/CaptionButtons.cs b/src/Avalonia.Controls/Chrome/CaptionButtons.cs index be15d3d444..1cad1a4c69 100644 --- a/src/Avalonia.Controls/Chrome/CaptionButtons.cs +++ b/src/Avalonia.Controls/Chrome/CaptionButtons.cs @@ -3,8 +3,6 @@ using System.Reactive.Disposables; using Avalonia.Controls.Metadata; using Avalonia.Controls.Primitives; -#nullable enable - namespace Avalonia.Controls.Chrome { /// diff --git a/src/Avalonia.Controls/Chrome/TitleBar.cs b/src/Avalonia.Controls/Chrome/TitleBar.cs index 52fbee6952..4da50e7220 100644 --- a/src/Avalonia.Controls/Chrome/TitleBar.cs +++ b/src/Avalonia.Controls/Chrome/TitleBar.cs @@ -3,8 +3,6 @@ using System.Reactive.Disposables; using Avalonia.Controls.Metadata; using Avalonia.Controls.Primitives; -#nullable enable - namespace Avalonia.Controls.Chrome { /// diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs index d5cadc16e9..dff06a6369 100644 --- a/src/Avalonia.Controls/ContextMenu.cs +++ b/src/Avalonia.Controls/ContextMenu.cs @@ -14,8 +14,6 @@ using Avalonia.Interactivity; using Avalonia.Layout; using Avalonia.Styling; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/ContextRequestedEventArgs.cs b/src/Avalonia.Controls/ContextRequestedEventArgs.cs index 8dc798245c..ad5ffef267 100644 --- a/src/Avalonia.Controls/ContextRequestedEventArgs.cs +++ b/src/Avalonia.Controls/ContextRequestedEventArgs.cs @@ -1,8 +1,6 @@ using Avalonia.Input; using Avalonia.Interactivity; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs index 807e992d55..d988569375 100644 --- a/src/Avalonia.Controls/Control.cs +++ b/src/Avalonia.Controls/Control.cs @@ -9,8 +9,6 @@ using Avalonia.Rendering; using Avalonia.Styling; using Avalonia.VisualTree; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs b/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs index 7587a9dacb..643c30178e 100644 --- a/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs +++ b/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs @@ -1,5 +1,4 @@ -#nullable enable -using System; +using System; using System.Globalization; using Avalonia.Data.Converters; diff --git a/src/Avalonia.Controls/DefinitionList.cs b/src/Avalonia.Controls/DefinitionList.cs index c8b4fe4db4..c850647bf4 100644 --- a/src/Avalonia.Controls/DefinitionList.cs +++ b/src/Avalonia.Controls/DefinitionList.cs @@ -2,8 +2,6 @@ using System.Collections; using System.Collections.Specialized; using Avalonia.Collections; -#nullable enable - namespace Avalonia.Controls { public abstract class DefinitionList : AvaloniaList where T : DefinitionBase diff --git a/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs b/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs index 11d3b1792a..45cd1d727e 100644 --- a/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs +++ b/src/Avalonia.Controls/Diagnostics/IPopupHostProvider.cs @@ -1,8 +1,6 @@ using System; using Avalonia.Controls.Primitives; -#nullable enable - namespace Avalonia.Controls.Diagnostics { /// diff --git a/src/Avalonia.Controls/Diagnostics/ToolTipDiagnostics.cs b/src/Avalonia.Controls/Diagnostics/ToolTipDiagnostics.cs index 4acf2a217f..9fddb91231 100644 --- a/src/Avalonia.Controls/Diagnostics/ToolTipDiagnostics.cs +++ b/src/Avalonia.Controls/Diagnostics/ToolTipDiagnostics.cs @@ -1,6 +1,4 @@ -#nullable enable - -namespace Avalonia.Controls.Diagnostics +namespace Avalonia.Controls.Diagnostics { /// /// Helper class to provide diagnostics information for . diff --git a/src/Avalonia.Controls/Expander.cs b/src/Avalonia.Controls/Expander.cs index b9c79e5749..020b162864 100644 --- a/src/Avalonia.Controls/Expander.cs +++ b/src/Avalonia.Controls/Expander.cs @@ -1,11 +1,8 @@ using System.Threading; - using Avalonia.Animation; using Avalonia.Controls.Metadata; using Avalonia.Controls.Primitives; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/Flyouts/Flyout.cs b/src/Avalonia.Controls/Flyouts/Flyout.cs index 974f1418b2..df3fe28a29 100644 --- a/src/Avalonia.Controls/Flyouts/Flyout.cs +++ b/src/Avalonia.Controls/Flyouts/Flyout.cs @@ -1,8 +1,6 @@ using Avalonia.Controls.Primitives; using Avalonia.Metadata; -#nullable enable - namespace Avalonia.Controls { public class Flyout : FlyoutBase diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs index 657d0450e6..d024f86b32 100644 --- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs +++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs @@ -8,8 +8,6 @@ using Avalonia.Input.Raw; using Avalonia.Layout; using Avalonia.Logging; -#nullable enable - namespace Avalonia.Controls.Primitives { public abstract class FlyoutBase : AvaloniaObject, IPopupHostProvider diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs index 001a3dc3d2..97fda68051 100644 --- a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs +++ b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs @@ -4,8 +4,6 @@ using Avalonia.Controls.Primitives; using Avalonia.Controls.Templates; using Avalonia.Metadata; -#nullable enable - namespace Avalonia.Controls { public class MenuFlyout : FlyoutBase diff --git a/src/Avalonia.Controls/IControl.cs b/src/Avalonia.Controls/IControl.cs index 598e6b6f4e..b501bc15a7 100644 --- a/src/Avalonia.Controls/IControl.cs +++ b/src/Avalonia.Controls/IControl.cs @@ -3,8 +3,6 @@ using Avalonia.Input; using Avalonia.Layout; using Avalonia.VisualTree; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/IMenuElement.cs b/src/Avalonia.Controls/IMenuElement.cs index 426f265084..a3200d2b1b 100644 --- a/src/Avalonia.Controls/IMenuElement.cs +++ b/src/Avalonia.Controls/IMenuElement.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using Avalonia.Input; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/IMenuItem.cs b/src/Avalonia.Controls/IMenuItem.cs index d92625218a..35e36eb0f4 100644 --- a/src/Avalonia.Controls/IMenuItem.cs +++ b/src/Avalonia.Controls/IMenuItem.cs @@ -1,6 +1,4 @@ -#nullable enable - -namespace Avalonia.Controls +namespace Avalonia.Controls { /// /// Represents a . diff --git a/src/Avalonia.Controls/IScrollAnchorProvider.cs b/src/Avalonia.Controls/IScrollAnchorProvider.cs index 7ba02e99ea..b3ce7ef9e8 100644 --- a/src/Avalonia.Controls/IScrollAnchorProvider.cs +++ b/src/Avalonia.Controls/IScrollAnchorProvider.cs @@ -1,6 +1,4 @@ -#nullable enable - -namespace Avalonia.Controls +namespace Avalonia.Controls { /// /// Specifies a contract for a scrolling control that supports scroll anchoring. diff --git a/src/Avalonia.Controls/ItemsSourceView.cs b/src/Avalonia.Controls/ItemsSourceView.cs index 611f3424fd..945035ab5e 100644 --- a/src/Avalonia.Controls/ItemsSourceView.cs +++ b/src/Avalonia.Controls/ItemsSourceView.cs @@ -10,8 +10,6 @@ using System.Collections.Specialized; using System.Linq; using Avalonia.Controls.Utils; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/MaskedTextBox.cs b/src/Avalonia.Controls/MaskedTextBox.cs index 866291f95b..ad64c61ebe 100644 --- a/src/Avalonia.Controls/MaskedTextBox.cs +++ b/src/Avalonia.Controls/MaskedTextBox.cs @@ -8,8 +8,6 @@ using Avalonia.Input.Platform; using Avalonia.Interactivity; using Avalonia.Styling; -#nullable enable - namespace Avalonia.Controls { public class MaskedTextBox : TextBox, IStyleable diff --git a/src/Avalonia.Controls/Menu.cs b/src/Avalonia.Controls/Menu.cs index 706be376a9..cc89677f82 100644 --- a/src/Avalonia.Controls/Menu.cs +++ b/src/Avalonia.Controls/Menu.cs @@ -5,8 +5,6 @@ using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.Layout; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/MenuBase.cs b/src/Avalonia.Controls/MenuBase.cs index 0c89a017e5..c36fbcc51f 100644 --- a/src/Avalonia.Controls/MenuBase.cs +++ b/src/Avalonia.Controls/MenuBase.cs @@ -8,8 +8,6 @@ using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.LogicalTree; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs index 79b3e8e7f3..9540ab05f9 100644 --- a/src/Avalonia.Controls/MenuItem.cs +++ b/src/Avalonia.Controls/MenuItem.cs @@ -14,8 +14,6 @@ using Avalonia.Interactivity; using Avalonia.LogicalTree; using Avalonia.VisualTree; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs index ecbce8851b..23ecdb2e7b 100644 --- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs +++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs @@ -9,8 +9,6 @@ using Avalonia.Rendering; using Avalonia.Threading; using Avalonia.VisualTree; -#nullable enable - namespace Avalonia.Controls.Platform { /// diff --git a/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs b/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs index 7bd13ecdb1..1685a6a38c 100644 --- a/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs +++ b/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs @@ -1,7 +1,5 @@ using System.Threading.Tasks; -#nullable enable - namespace Avalonia.Controls.Platform { /// diff --git a/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs b/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs index 3358e83663..9e72a40439 100644 --- a/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs +++ b/src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs @@ -1,8 +1,6 @@ using System; using Avalonia.Platform; -#nullable enable - namespace Avalonia.Controls.Platform { public interface INativeMenuExporter diff --git a/src/Avalonia.Controls/Platform/ITrayIconImpl.cs b/src/Avalonia.Controls/Platform/ITrayIconImpl.cs index 9768d149f0..289b569645 100644 --- a/src/Avalonia.Controls/Platform/ITrayIconImpl.cs +++ b/src/Avalonia.Controls/Platform/ITrayIconImpl.cs @@ -1,8 +1,6 @@ using System; using Avalonia.Controls.Platform; -#nullable enable - namespace Avalonia.Platform { public interface ITrayIconImpl : IDisposable diff --git a/src/Avalonia.Controls/Platform/IWindowingPlatform.cs b/src/Avalonia.Controls/Platform/IWindowingPlatform.cs index 21882b1271..fa26fe8fdd 100644 --- a/src/Avalonia.Controls/Platform/IWindowingPlatform.cs +++ b/src/Avalonia.Controls/Platform/IWindowingPlatform.cs @@ -1,5 +1,3 @@ -#nullable enable - namespace Avalonia.Platform { public interface IWindowingPlatform diff --git a/src/Avalonia.Controls/Platform/PlatformManager.cs b/src/Avalonia.Controls/Platform/PlatformManager.cs index 8e9f64b3ad..ee62316922 100644 --- a/src/Avalonia.Controls/Platform/PlatformManager.cs +++ b/src/Avalonia.Controls/Platform/PlatformManager.cs @@ -2,8 +2,6 @@ using System; using System.Reactive.Disposables; using Avalonia.Platform; -#nullable enable - namespace Avalonia.Controls.Platform { public static partial class PlatformManager diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs index 61a7e7ae1d..97fb4c3f43 100644 --- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs +++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs @@ -7,8 +7,6 @@ using Avalonia.Controls.Primitives; using Avalonia.Input; using Avalonia.VisualTree; -#nullable enable - namespace Avalonia.Controls.Presenters { /// diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs index c53a16f6ff..353f12118f 100644 --- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs +++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs @@ -4,8 +4,6 @@ using Avalonia.Media; using Avalonia.Rendering; using Avalonia.VisualTree; -#nullable enable - namespace Avalonia.Controls.Primitives { /// diff --git a/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs b/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs index 7171ecc302..a774368af6 100644 --- a/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs +++ b/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs @@ -2,8 +2,6 @@ using Avalonia.Rendering; using Avalonia.VisualTree; -#nullable enable - namespace Avalonia.Controls.Primitives { public class ChromeOverlayLayer : Panel, ICustomSimpleHitTest diff --git a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs index e55bdbb0eb..d44ef5666c 100644 --- a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs +++ b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs @@ -2,8 +2,6 @@ using Avalonia.Controls.Presenters; using Avalonia.Controls.Templates; using Avalonia.LogicalTree; -#nullable enable - namespace Avalonia.Controls.Primitives { /// diff --git a/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs b/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs index 3d62297abb..04c30b0f33 100644 --- a/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs +++ b/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs @@ -7,8 +7,6 @@ using Avalonia.Rendering; using Avalonia.Styling; using Avalonia.VisualTree; -#nullable enable - namespace Avalonia.Controls.Primitives { /// diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs index 8d005b2fdc..f3fec95bcc 100644 --- a/src/Avalonia.Controls/Primitives/Popup.cs +++ b/src/Avalonia.Controls/Primitives/Popup.cs @@ -14,8 +14,6 @@ using Avalonia.Metadata; using Avalonia.Platform; using Avalonia.VisualTree; -#nullable enable - namespace Avalonia.Controls.Primitives { /// diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs index 8c0ae609e4..31de6f6398 100644 --- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs +++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs @@ -13,8 +13,6 @@ using Avalonia.Interactivity; using Avalonia.Threading; using Avalonia.VisualTree; -#nullable enable - namespace Avalonia.Controls.Primitives { /// diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs index a777b522ad..af681d6930 100644 --- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs +++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs @@ -6,8 +6,6 @@ using Avalonia.LogicalTree; using Avalonia.Media; using Avalonia.Styling; -#nullable enable - namespace Avalonia.Controls.Primitives { /// diff --git a/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs b/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs index 562b104b04..18cf96ddca 100644 --- a/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs +++ b/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs @@ -1,7 +1,5 @@ using Avalonia.Layout; -#nullable enable - namespace Avalonia.Controls { public partial class RelativePanel diff --git a/src/Avalonia.Controls/RelativePanel.cs b/src/Avalonia.Controls/RelativePanel.cs index c5de004f09..1125f0eb0e 100644 --- a/src/Avalonia.Controls/RelativePanel.cs +++ b/src/Avalonia.Controls/RelativePanel.cs @@ -4,8 +4,6 @@ using System.Collections.Generic; using System.Linq; using Avalonia.Layout; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs b/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs index 877df3741e..c1baa66433 100644 --- a/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs +++ b/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Linq; using Avalonia.Controls.Templates; -#nullable enable - namespace Avalonia.Controls { public class SelectTemplateEventArgs : EventArgs diff --git a/src/Avalonia.Controls/Selection/ISelectionModel.cs b/src/Avalonia.Controls/Selection/ISelectionModel.cs index 3b8fd0c8b7..3f4ae48263 100644 --- a/src/Avalonia.Controls/Selection/ISelectionModel.cs +++ b/src/Avalonia.Controls/Selection/ISelectionModel.cs @@ -3,8 +3,6 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; -#nullable enable - namespace Avalonia.Controls.Selection { public interface ISelectionModel : INotifyPropertyChanged diff --git a/src/Avalonia.Controls/Selection/IndexRange.cs b/src/Avalonia.Controls/Selection/IndexRange.cs index fa7b44faea..dd3445fb70 100644 --- a/src/Avalonia.Controls/Selection/IndexRange.cs +++ b/src/Avalonia.Controls/Selection/IndexRange.cs @@ -6,8 +6,6 @@ using System; using System.Collections.Generic; -#nullable enable - namespace Avalonia.Controls.Selection { internal readonly struct IndexRange : IEquatable diff --git a/src/Avalonia.Controls/Selection/InternalSelectionModel.cs b/src/Avalonia.Controls/Selection/InternalSelectionModel.cs index edef0a9ff5..40c6f63ed8 100644 --- a/src/Avalonia.Controls/Selection/InternalSelectionModel.cs +++ b/src/Avalonia.Controls/Selection/InternalSelectionModel.cs @@ -6,8 +6,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Avalonia.Collections; -#nullable enable - namespace Avalonia.Controls.Selection { internal class InternalSelectionModel : SelectionModel diff --git a/src/Avalonia.Controls/Selection/SelectedIndexes.cs b/src/Avalonia.Controls/Selection/SelectedIndexes.cs index 36df175ed2..a65f45e64f 100644 --- a/src/Avalonia.Controls/Selection/SelectedIndexes.cs +++ b/src/Avalonia.Controls/Selection/SelectedIndexes.cs @@ -3,8 +3,6 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -#nullable enable - namespace Avalonia.Controls.Selection { internal class SelectedIndexes : IReadOnlyList diff --git a/src/Avalonia.Controls/Selection/SelectedItems.cs b/src/Avalonia.Controls/Selection/SelectedItems.cs index 92781fd54a..4fbcfde438 100644 --- a/src/Avalonia.Controls/Selection/SelectedItems.cs +++ b/src/Avalonia.Controls/Selection/SelectedItems.cs @@ -3,8 +3,6 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -#nullable enable - namespace Avalonia.Controls.Selection { internal class SelectedItems : IReadOnlyList diff --git a/src/Avalonia.Controls/Selection/SelectionModel.cs b/src/Avalonia.Controls/Selection/SelectionModel.cs index 20d5293f8b..154f1868f3 100644 --- a/src/Avalonia.Controls/Selection/SelectionModel.cs +++ b/src/Avalonia.Controls/Selection/SelectionModel.cs @@ -6,8 +6,6 @@ using System.ComponentModel; using System.Diagnostics.CodeAnalysis; using System.Linq; -#nullable enable - namespace Avalonia.Controls.Selection { public class SelectionModel : SelectionNodeBase, ISelectionModel diff --git a/src/Avalonia.Controls/Selection/SelectionModelIndexesChangedEventArgs.cs b/src/Avalonia.Controls/Selection/SelectionModelIndexesChangedEventArgs.cs index a1fef578a2..621fba48e8 100644 --- a/src/Avalonia.Controls/Selection/SelectionModelIndexesChangedEventArgs.cs +++ b/src/Avalonia.Controls/Selection/SelectionModelIndexesChangedEventArgs.cs @@ -1,7 +1,5 @@ using System; -#nullable enable - namespace Avalonia.Controls.Selection { public class SelectionModelIndexesChangedEventArgs : EventArgs diff --git a/src/Avalonia.Controls/Selection/SelectionModelSelectionChangedEventArgs.cs b/src/Avalonia.Controls/Selection/SelectionModelSelectionChangedEventArgs.cs index 396943592d..64c1b14253 100644 --- a/src/Avalonia.Controls/Selection/SelectionModelSelectionChangedEventArgs.cs +++ b/src/Avalonia.Controls/Selection/SelectionModelSelectionChangedEventArgs.cs @@ -3,8 +3,6 @@ using System.Collections; using System.Collections.Generic; using Avalonia.Controls.Selection; -#nullable enable - namespace Avalonia.Controls.Selection { public abstract class SelectionModelSelectionChangedEventArgs : EventArgs diff --git a/src/Avalonia.Controls/Selection/SelectionNodeBase.cs b/src/Avalonia.Controls/Selection/SelectionNodeBase.cs index 6840821589..5994025d56 100644 --- a/src/Avalonia.Controls/Selection/SelectionNodeBase.cs +++ b/src/Avalonia.Controls/Selection/SelectionNodeBase.cs @@ -5,8 +5,6 @@ using System.Collections.Specialized; using System.Linq; using Avalonia.Controls.Utils; -#nullable enable - namespace Avalonia.Controls.Selection { public abstract class SelectionNodeBase : ICollectionChangedListener diff --git a/src/Avalonia.Controls/Shapes/Shape.cs b/src/Avalonia.Controls/Shapes/Shape.cs index 0d1d9e3ffe..1a7218ff2a 100644 --- a/src/Avalonia.Controls/Shapes/Shape.cs +++ b/src/Avalonia.Controls/Shapes/Shape.cs @@ -3,8 +3,6 @@ using Avalonia.Collections; using Avalonia.Media; using Avalonia.Media.Immutable; -#nullable enable - namespace Avalonia.Controls.Shapes { /// diff --git a/src/Avalonia.Controls/SystemDialog.cs b/src/Avalonia.Controls/SystemDialog.cs index 3487f427d7..4d217d7459 100644 --- a/src/Avalonia.Controls/SystemDialog.cs +++ b/src/Avalonia.Controls/SystemDialog.cs @@ -4,8 +4,6 @@ using System.Linq; using System.Threading.Tasks; using Avalonia.Controls.Platform; -#nullable enable - namespace Avalonia.Controls { /// diff --git a/src/Avalonia.Controls/Templates/DataTemplateExtensions.cs b/src/Avalonia.Controls/Templates/DataTemplateExtensions.cs index 49184bf7df..1dce00d510 100644 --- a/src/Avalonia.Controls/Templates/DataTemplateExtensions.cs +++ b/src/Avalonia.Controls/Templates/DataTemplateExtensions.cs @@ -1,7 +1,5 @@ using Avalonia.LogicalTree; -#nullable enable - namespace Avalonia.Controls.Templates { /// diff --git a/src/Avalonia.Controls/Templates/FuncTemplate`2.cs b/src/Avalonia.Controls/Templates/FuncTemplate`2.cs index c310386c77..a7288aba3e 100644 --- a/src/Avalonia.Controls/Templates/FuncTemplate`2.cs +++ b/src/Avalonia.Controls/Templates/FuncTemplate`2.cs @@ -1,7 +1,5 @@ using System; -#nullable enable - namespace Avalonia.Controls.Templates { /// diff --git a/src/Avalonia.Controls/Templates/IDataTemplate.cs b/src/Avalonia.Controls/Templates/IDataTemplate.cs index 3d54eeb613..c81e429293 100644 --- a/src/Avalonia.Controls/Templates/IDataTemplate.cs +++ b/src/Avalonia.Controls/Templates/IDataTemplate.cs @@ -1,7 +1,5 @@ using System; -#nullable enable - namespace Avalonia.Controls.Templates { /// diff --git a/src/Avalonia.Controls/Templates/IRecyclingDataTemplate.cs b/src/Avalonia.Controls/Templates/IRecyclingDataTemplate.cs index aafee33199..c9f3fcc836 100644 --- a/src/Avalonia.Controls/Templates/IRecyclingDataTemplate.cs +++ b/src/Avalonia.Controls/Templates/IRecyclingDataTemplate.cs @@ -1,6 +1,4 @@ -#nullable enable - -namespace Avalonia.Controls.Templates +namespace Avalonia.Controls.Templates { /// /// An that supports recycling existing elements. diff --git a/src/Avalonia.Controls/ToolTip.cs b/src/Avalonia.Controls/ToolTip.cs index 95011a4425..91c93c87c8 100644 --- a/src/Avalonia.Controls/ToolTip.cs +++ b/src/Avalonia.Controls/ToolTip.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using Avalonia.Controls.Diagnostics; using Avalonia.Controls.Metadata; diff --git a/src/Avalonia.Controls/TrayIcon.cs b/src/Avalonia.Controls/TrayIcon.cs index 02ab6228fa..b8ab48a2b7 100644 --- a/src/Avalonia.Controls/TrayIcon.cs +++ b/src/Avalonia.Controls/TrayIcon.cs @@ -8,8 +8,6 @@ using Avalonia.Controls.Platform; using Avalonia.Platform; using Avalonia.Utilities; -#nullable enable - namespace Avalonia.Controls { public sealed class TrayIcons : AvaloniaList diff --git a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs index 74705a0262..0b1c4fc90e 100644 --- a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs +++ b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs @@ -6,8 +6,6 @@ using System.Runtime.CompilerServices; using Avalonia.Threading; using Avalonia.Utilities; -#nullable enable - namespace Avalonia.Controls.Utils { internal interface ICollectionChangedListener