Misc cleanup (#708)

* Fix typos

* Remove unneeded using statements

* Enforce var style more

* Remove redundant qualifiers

* Fix some indentation

* Disable naming warnings on files with external enum names

* Fix build

* Mass find & replace for comments with no spacing

* Standardize todo capitalization and for/if spacing

13 files changed, 25 insertions, 42 deletions

diff --git a/Ryujinx.Profiler/InternalProfile.cs b/Ryujinx.Profiler/InternalProfile.cs
index bd522b00..46984601 100644
--- a/Ryujinx.Profiler/InternalProfile.cs
+++ b/Ryujinx.Profiler/InternalProfile.cs
@@ -80,7 +80,7 @@ namespace Ryujinx.Profiler
                     Monitor.Exit(_timerQueueClearLock);
                 }
 
-                // Only sleep if queue was sucessfully cleared
+                // Only sleep if queue was successfully cleared
                 if (queueCleared)
                 {
                     Thread.Sleep(5);
@@ -92,9 +92,9 @@ namespace Ryujinx.Profiler
         {
             int count = 0;
 
-            while (_timerQueue.TryDequeue(out var item))
+            while (_timerQueue.TryDequeue(out TimerQueueValue item))
             {
-                if (!Timers.TryGetValue(item.Config, out var value))
+                if (!Timers.TryGetValue(item.Config, out TimingInfo value))
                 {
                     value = new TimingInfo();
                     Timers.Add(item.Config, value);
@@ -206,9 +206,9 @@ namespace Ryujinx.Profiler
             return (_timingFlagAverages, _timingFlagLastDelta);
         }
 
-        public void RegisterFlagReciever(Action<TimingFlag> reciever)
+        public void RegisterFlagReceiver(Action<TimingFlag> receiver)
         {
-            _timingFlagCallback = reciever;
+            _timingFlagCallback = receiver;
         }
 
         public void Dispose()
diff --git a/Ryujinx.Profiler/Profile.cs b/Ryujinx.Profiler/Profile.cs
index 7af73a52..4dba6ea5 100644
--- a/Ryujinx.Profiler/Profile.cs
+++ b/Ryujinx.Profiler/Profile.cs
@@ -17,7 +17,7 @@ namespace Ryujinx.Profiler
         private static ProfilerSettings _settings;
 
         [Conditional("USE_PROFILING")]
-        public static void Initalize()
+        public static void Initialize()
         {
             var config = ProfilerConfiguration.Load(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ProfilerConfig.jsonc"));
 
@@ -70,11 +70,11 @@ namespace Ryujinx.Profiler
         }
 
         [Conditional("USE_PROFILING")]
-        public static void RegisterFlagReciever(Action<TimingFlag> reciever)
+        public static void RegisterFlagReceiver(Action<TimingFlag> receiver)
         {
             if (!ProfilingEnabled())
                 return;
-            _profileInstance.RegisterFlagReciever(reciever);
+            _profileInstance.RegisterFlagReceiver(receiver);
         }
 
         [Conditional("USE_PROFILING")]
diff --git a/Ryujinx.Profiler/ProfilerConfiguration.cs b/Ryujinx.Profiler/ProfilerConfiguration.cs
index b4d629e4..4fe616fa 100644
--- a/Ryujinx.Profiler/ProfilerConfiguration.cs
+++ b/Ryujinx.Profiler/ProfilerConfiguration.cs
@@ -1,9 +1,6 @@
 using OpenTK.Input;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Text;
-using System.Threading.Tasks;
 using Utf8Json;
 using Utf8Json.Resolvers;
 
@@ -58,7 +55,7 @@ namespace Ryujinx.Profiler
                     return default(T);
                 }
 
-                var enumName = formatterResolver.GetFormatterWithVerify<string>()
+                string enumName = formatterResolver.GetFormatterWithVerify<string>()
                     .Deserialize(ref reader, formatterResolver);
 
                 if (Enum.TryParse<T>(enumName, out T result))
diff --git a/Ryujinx.Profiler/ProfilerKeyboardHandler.cs b/Ryujinx.Profiler/ProfilerKeyboardHandler.cs
index e1075c8d..e6207e89 100644
--- a/Ryujinx.Profiler/ProfilerKeyboardHandler.cs
+++ b/Ryujinx.Profiler/ProfilerKeyboardHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenTK.Input;
+using OpenTK.Input;
 
 namespace Ryujinx.Profiler
 {
diff --git a/Ryujinx.Profiler/Settings.cs b/Ryujinx.Profiler/Settings.cs
index c0393545..f0c851b2 100644
--- a/Ryujinx.Profiler/Settings.cs
+++ b/Ryujinx.Profiler/Settings.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Ryujinx.Profiler
+namespace Ryujinx.Profiler
 {
     public class ProfilerSettings
     {
diff --git a/Ryujinx.Profiler/TimingFlag.cs b/Ryujinx.Profiler/TimingFlag.cs
index 7d7c715f..0cf55bdf 100644
--- a/Ryujinx.Profiler/TimingFlag.cs
+++ b/Ryujinx.Profiler/TimingFlag.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Text;
-
-namespace Ryujinx.Profiler
+namespace Ryujinx.Profiler
 {
     public enum TimingFlagType
     {
diff --git a/Ryujinx.Profiler/TimingInfo.cs b/Ryujinx.Profiler/TimingInfo.cs
index e444e423..6058ddbd 100644
--- a/Ryujinx.Profiler/TimingInfo.cs
+++ b/Ryujinx.Profiler/TimingInfo.cs
@@ -107,7 +107,7 @@ namespace Ryujinx.Profiler
                 _timestamps.Add(_currentTimestamp);
             }
 
-            var delta  = _currentTimestamp.EndTime - _currentTimestamp.BeginTime;
+            long delta = _currentTimestamp.EndTime - _currentTimestamp.BeginTime;
             TotalTime += delta;
             Instant   += delta;
 
diff --git a/Ryujinx.Profiler/UI/ProfileSorters.cs b/Ryujinx.Profiler/UI/ProfileSorters.cs
index 2d06f426..9f66de22 100644
--- a/Ryujinx.Profiler/UI/ProfileSorters.cs
+++ b/Ryujinx.Profiler/UI/ProfileSorters.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace Ryujinx.Profiler.UI
 {
diff --git a/Ryujinx.Profiler/UI/ProfileWindow.cs b/Ryujinx.Profiler/UI/ProfileWindow.cs
index c58b9235..1db70bc7 100644
--- a/Ryujinx.Profiler/UI/ProfileWindow.cs
+++ b/Ryujinx.Profiler/UI/ProfileWindow.cs
@@ -98,7 +98,7 @@ namespace Ryujinx.Profiler.UI
         private readonly object _profileDataLock = new object();
 
         public ProfileWindow()
-                               // Graphigs mode enables 2xAA
+                               // Graphics mode enables 2xAA
             : base(1280, 720, new GraphicsMode(new ColorFormat(8, 8, 8, 8), 1, 1, 2))
         {
             Title    = "Profiler";
@@ -108,7 +108,7 @@ namespace Ryujinx.Profiler.UI
             if (Profile.UpdateRate <= 0)
             {
                 // Perform step regardless of flag type
-                Profile.RegisterFlagReciever((t) =>
+                Profile.RegisterFlagReceiver((t) =>
                 {
                     if (!_paused)
                     {
@@ -146,7 +146,7 @@ namespace Ryujinx.Profiler.UI
         {
             GL.ClearColor(Color.Black);
             _fontService = new FontService();
-            _fontService.InitalizeTextures();
+            _fontService.InitializeTextures();
             _fontService.UpdateScreenHeight(Height);
 
             _buttons = new ProfileButton[(int)ButtonIndex.Count];
diff --git a/Ryujinx.Profiler/UI/ProfileWindowBars.cs b/Ryujinx.Profiler/UI/ProfileWindowBars.cs
index b1955a07..ab5b4fd1 100644
--- a/Ryujinx.Profiler/UI/ProfileWindowBars.cs
+++ b/Ryujinx.Profiler/UI/ProfileWindowBars.cs
@@ -18,7 +18,7 @@ namespace Ryujinx.Profiler.UI
                 float barHeight   = (LineHeight - LinePadding) / 3.0f;
 
                 // Get max values
-                var maxInstant = maxAverage = maxTotal = 0;
+                long maxInstant = maxAverage = maxTotal = 0;
                 foreach (KeyValuePair<ProfileConfig, TimingInfo> kvp in _sortedProfileData)
                 {
                     maxInstant = Math.Max(maxInstant, kvp.Value.Instant);
diff --git a/Ryujinx.Profiler/UI/ProfileWindowGraph.cs b/Ryujinx.Profiler/UI/ProfileWindowGraph.cs
index 9d34be97..6a4a52a9 100644
--- a/Ryujinx.Profiler/UI/ProfileWindowGraph.cs
+++ b/Ryujinx.Profiler/UI/ProfileWindowGraph.cs
@@ -7,8 +7,8 @@ namespace Ryujinx.Profiler.UI
 {
     public partial class ProfileWindow
     {
-        // Colour index equal to timing flag type as int
-        private Color[] _timingFlagColours = new[]
+        // Color index equal to timing flag type as int
+        private Color[] _timingFlagColors = new[]
         {
             new Color(150, 25, 25, 50), // FrameSwap   = 0
             new Color(25, 25, 150, 50), // SystemFrame = 1
@@ -62,7 +62,7 @@ namespace Ryujinx.Profiler.UI
                         if (prevType != timingFlag.FlagType)
                         {
                             prevType = timingFlag.FlagType;
-                            GL.Color4(_timingFlagColours[(int)prevType]);
+                            GL.Color4(_timingFlagColors[(int)prevType]);
                         }
 
                         int x = (int)(graphRight - ((graphPositionTicks - timingFlag.Timestamp) / timeWidthTicks) * width);
diff --git a/Ryujinx.Profiler/UI/ProfileWindowManager.cs b/Ryujinx.Profiler/UI/ProfileWindowManager.cs
index 4ba0c881..c6a65a31 100644
--- a/Ryujinx.Profiler/UI/ProfileWindowManager.cs
+++ b/Ryujinx.Profiler/UI/ProfileWindowManager.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using System.Threading;
+using System.Threading;
 using OpenTK;
 using OpenTK.Input;
 using Ryujinx.Common;
diff --git a/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs b/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs
index e64c9da3..32846977 100644
--- a/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs
+++ b/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs
@@ -36,7 +36,7 @@ namespace Ryujinx.Profiler.UI.SharpFontHelpers
 
         private string GetFontPath()
         {
-            string fontFolder = System.Environment.GetFolderPath(Environment.SpecialFolder.Fonts);
+            string fontFolder = Environment.GetFolderPath(Environment.SpecialFolder.Fonts);
 
             // Only uses Arial, add more fonts here if wanted
             string path = Path.Combine(fontFolder, "arial.ttf");
@@ -48,7 +48,7 @@ namespace Ryujinx.Profiler.UI.SharpFontHelpers
             throw new Exception($"Profiler exception. Required font Courier New or Arial not installed to {fontFolder}");
         }
 
-        public void InitalizeTextures()
+        public void InitializeTextures()
         {
             // Create and init some vars
             uint[] rawCharacterSheet = new uint[SheetWidth * SheetHeight];
@@ -66,7 +66,7 @@ namespace Ryujinx.Profiler.UI.SharpFontHelpers
             // Update raw data for each character
             for (int i = 0; i < 94; i++)
             {
-                var surface = RenderSurface((char)(i + 33), font, out var xBearing, out var yBearing, out var advance);
+                var surface = RenderSurface((char)(i + 33), font, out float xBearing, out float yBearing, out float advance);
 
                 characters[i] = UpdateTexture(surface, ref rawCharacterSheet, ref x, ref y, ref lineOffset);
                 characters[i].BearingX = xBearing;
@@ -217,7 +217,7 @@ namespace Ryujinx.Profiler.UI.SharpFontHelpers
                 lineOffset = 0;
             }
 
-            // Update lineoffset
+            // Update lineOffset
             if (lineOffset < height)
             {
                 lineOffset = height + 1;