Merge pull request #12150 from Lehonti/master

Changed null checks to make use of nameof()
AvaloniaUI · Jul 12, 2023 · b173419 · b173419
2 parents 54158b4 + ddfe89f
commit b173419
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/Avalonia.Base/Threading/Dispatcher.Invoke.cs b/src/Avalonia.Base/Threading/Dispatcher.Invoke.cs
@@ -90,7 +90,7 @@ public void Invoke(Action callback, DispatcherPriority priority, CancellationTok
     {
         if (callback == null)
         {
-            throw new ArgumentNullException("callback");
+            throw new ArgumentNullException(nameof(callback));
         }
 
         DispatcherPriority.Validate(priority, "priority");
@@ -212,7 +212,7 @@ public TResult Invoke<TResult>(Func<TResult> callback, DispatcherPriority priori
     {
         if (callback == null)
         {
-            throw new ArgumentNullException("callback");
+            throw new ArgumentNullException(nameof(callback));
         }
 
         DispatcherPriority.Validate(priority, "priority");
@@ -304,7 +304,7 @@ public DispatcherOperation InvokeAsync(Action callback, DispatcherPriority prior
     {
         if (callback == null)
         {
-            throw new ArgumentNullException("callback");
+            throw new ArgumentNullException(nameof(callback));
         }
 
         DispatcherPriority.Validate(priority, "priority");
@@ -379,7 +379,7 @@ public DispatcherOperation<TResult> InvokeAsync<TResult>(Func<TResult> callback,
     {
         if (callback == null)
         {
-            throw new ArgumentNullException("callback");
+            throw new ArgumentNullException(nameof(callback));
         }
 
         DispatcherPriority.Validate(priority, "priority");

diff --git a/src/Avalonia.Base/Threading/DispatcherTimer.cs b/src/Avalonia.Base/Threading/DispatcherTimer.cs
@@ -62,7 +62,7 @@ public DispatcherTimer(TimeSpan interval, DispatcherPriority priority, EventHand
     {
         if (callback == null)
         {
-            throw new ArgumentNullException("callback");
+            throw new ArgumentNullException(nameof(callback));
         }
 
         Tick += callback;
@@ -253,7 +253,7 @@ internal DispatcherTimer(Dispatcher dispatcher, DispatcherPriority priority, Tim
     {
         if (dispatcher == null)
         {
-            throw new ArgumentNullException("dispatcher");
+            throw new ArgumentNullException(nameof(dispatcher));
         }
 
         DispatcherPriority.Validate(priority, "priority");

diff --git a/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
@@ -222,7 +222,7 @@ protected internal override void RefreshCellContent(Control element, string prop
         {
             if (element == null)
             {
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
             }
             if (element is CheckBox checkBox)
             {

diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs b/src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs
@@ -191,7 +191,7 @@ protected override void InsertItem(int columnIndex, DataGridColumn dataGridColum
                 }
                 if (dataGridColumn == null)
                 {
-                    throw new ArgumentNullException("dataGridColumn");
+                    throw new ArgumentNullException(nameof(dataGridColumn));
                 }
 
                 int columnIndexWithFiller = columnIndex;

diff --git a/src/Avalonia.Controls.DataGrid/DataGridLength.cs b/src/Avalonia.Controls.DataGrid/DataGridLength.cs
@@ -499,7 +499,7 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
         {
             if (destinationType == null)
             {
-                throw new ArgumentNullException("destinationType");
+                throw new ArgumentNullException(nameof(destinationType));
             }
             if (destinationType != typeof(string))
             {

diff --git a/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
@@ -18,7 +18,7 @@ public class ControlAutomationPeer : AutomationPeer
 
         public ControlAutomationPeer(Control owner)
         {
-            Owner = owner ?? throw new ArgumentNullException("owner");
+            Owner = owner ?? throw new ArgumentNullException(nameof(owner));
             Initialize();
         }