Maintenance: clean up some warnings.

uxmal · Aug 8, 2023 · 991aac8 · 991aac8
1 parent 723e338
commit 991aac8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/src/Gui/TextViewing/AbstractProcedureCodeModel.cs b/src/Gui/TextViewing/AbstractProcedureCodeModel.cs
@@ -34,7 +34,7 @@ public abstract class AbstractProcedureCodeModel : ITextViewModel
         private readonly Procedure proc;
         private int position;
         private LineSpan[]? lines;      // The procedure, rendered into line spans
-        private int numLines;
+        private readonly int numLines;
         private readonly ISelectedAddressService selSvc;
 
         public AbstractProcedureCodeModel(Procedure proc, ISelectedAddressService selSvc)
@@ -65,7 +65,7 @@ public LineSpan[] GetLineSpans(int count)
             int p = (int)position;
             int c = Math.Min(count, LineCount - p);
             if (c <= 0)
-                return new LineSpan[0];
+                return Array.Empty<LineSpan>();
             var spans = new LineSpan[c];
             for (int i = 0; i < c; ++i)
             {

diff --git a/src/Gui/TextViewing/AbstractTextSpanFormatter.cs b/src/Gui/TextViewing/AbstractTextSpanFormatter.cs
@@ -183,7 +183,7 @@ private StringBuilder EnsureSpan()
 
         private class TextSpanModel : ITextViewModel
         {
-            private LineSpan[] lines;
+            private readonly LineSpan[] lines;
             private int position;
 
             public TextSpanModel(LineSpan[] lines)

diff --git a/src/UserInterfaces/AvaloniaUI/Views/Tools/SearchResultsToolView.axaml.cs b/src/UserInterfaces/AvaloniaUI/Views/Tools/SearchResultsToolView.axaml.cs
@@ -19,14 +19,10 @@
 #endregion
 
 using Avalonia.Controls;
-using Avalonia.Controls.Templates;
-using Avalonia.Data;
 using Avalonia.Markup.Xaml;
-using AvaloniaEdit.Utils;
 using Reko.Gui;
 using Reko.UserInterfaces.AvaloniaUI.ViewModels.Tools;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace Reko.UserInterfaces.AvaloniaUI.Views.Tools

diff --git a/src/UserInterfaces/WindowsForms/WindowsFormsDialogFactory.cs b/src/UserInterfaces/WindowsForms/WindowsFormsDialogFactory.cs
@@ -109,7 +109,7 @@ public IKeyBindingsDialog CreateKeyBindingsDialog(Dictionary<string, Dictionary<
             return dlg;
         }
 
-        public IDialog<LoadDetails?> CreateOpenAsDialog(string initialFilename)
+        public IDialog<LoadDetails> CreateOpenAsDialog(string initialFilename)
         {
             var dlg = new OpenAsDialog
             {