From dd44ec7ac112cf4f06ffd54d4118a9282919870e Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 29 Sep 2021 10:28:15 -0700
Subject: [PATCH] Clean up usings

---
 MPF.Library/Aaru/Converters.cs               | 1 -
 MPF.Library/Converters/EnumConverter.cs      | 2 --
 MPF.Library/Converters/MediaTypeConverter.cs | 2 --
 MPF.Library/DD/Converters.cs                 | 1 -
 MPF.Library/Data/DumpEnvironment.cs          | 2 --
 MPF.Library/DiscImageCreator/Converters.cs   | 1 -
 MPF.Library/Hashing/Hasher.cs                | 1 -
 MPF.Library/Utilities/EnumExtensions.cs      | 3 +--
 MPF.Library/Utilities/Logging.cs             | 9 ++++-----
 9 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/MPF.Library/Aaru/Converters.cs b/MPF.Library/Aaru/Converters.cs
index 48aa3e09..5d1ac170 100644
--- a/MPF.Library/Aaru/Converters.cs
+++ b/MPF.Library/Aaru/Converters.cs
@@ -1,4 +1,3 @@
-using MPF.Data;
 using RedumpLib.Data;
 
 namespace MPF.Aaru
diff --git a/MPF.Library/Converters/EnumConverter.cs b/MPF.Library/Converters/EnumConverter.cs
index 6d40d88e..6c0dbf00 100644
--- a/MPF.Library/Converters/EnumConverter.cs
+++ b/MPF.Library/Converters/EnumConverter.cs
@@ -6,8 +6,6 @@ using MPF.Data;
 #if NET_FRAMEWORK
 using IMAPI2;
 #endif
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using RedumpLib.Data;
 
 namespace MPF.Converters
diff --git a/MPF.Library/Converters/MediaTypeConverter.cs b/MPF.Library/Converters/MediaTypeConverter.cs
index 3dd7d4d9..c040b102 100644
--- a/MPF.Library/Converters/MediaTypeConverter.cs
+++ b/MPF.Library/Converters/MediaTypeConverter.cs
@@ -1,6 +1,4 @@
 using System;
-using MPF.Data;
-using MPF.Utilities;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using RedumpLib.Data;
diff --git a/MPF.Library/DD/Converters.cs b/MPF.Library/DD/Converters.cs
index 22a2eeda..5e576d27 100644
--- a/MPF.Library/DD/Converters.cs
+++ b/MPF.Library/DD/Converters.cs
@@ -1,4 +1,3 @@
-using MPF.Data;
 using RedumpLib.Data;
 
 namespace MPF.DD
diff --git a/MPF.Library/Data/DumpEnvironment.cs b/MPF.Library/Data/DumpEnvironment.cs
index fa4d17e3..299f4164 100644
--- a/MPF.Library/Data/DumpEnvironment.cs
+++ b/MPF.Library/Data/DumpEnvironment.cs
@@ -12,8 +12,6 @@ using BurnOutSharp;
 using MPF.Converters;
 using MPF.Utilities;
 using Newtonsoft.Json;
-using RedumpLib.Attributes;
-using RedumpLib.Converters;
 using RedumpLib.Data;
 using RedumpLib.Web;
 
diff --git a/MPF.Library/DiscImageCreator/Converters.cs b/MPF.Library/DiscImageCreator/Converters.cs
index 49655db2..0c6c8a57 100644
--- a/MPF.Library/DiscImageCreator/Converters.cs
+++ b/MPF.Library/DiscImageCreator/Converters.cs
@@ -1,4 +1,3 @@
-using MPF.Data;
 using RedumpLib.Data;
 
 namespace MPF.DiscImageCreator
diff --git a/MPF.Library/Hashing/Hasher.cs b/MPF.Library/Hashing/Hasher.cs
index 47ed40a8..4badfbf3 100644
--- a/MPF.Library/Hashing/Hasher.cs
+++ b/MPF.Library/Hashing/Hasher.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Security.Cryptography;
 using MPF.Data;
-using OptimizedCRC;
 
 namespace MPF.Hashing
 {
diff --git a/MPF.Library/Utilities/EnumExtensions.cs b/MPF.Library/Utilities/EnumExtensions.cs
index e12d7f10..0eedd505 100644
--- a/MPF.Library/Utilities/EnumExtensions.cs
+++ b/MPF.Library/Utilities/EnumExtensions.cs
@@ -1,5 +1,4 @@
-using MPF.Data;
-using RedumpLib.Data;
+using RedumpLib.Data;
 
 namespace MPF.Utilities
 {
diff --git a/MPF.Library/Utilities/Logging.cs b/MPF.Library/Utilities/Logging.cs
index 5b9eb4b0..fa0d73a0 100644
--- a/MPF.Library/Utilities/Logging.cs
+++ b/MPF.Library/Utilities/Logging.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -38,15 +37,15 @@ namespace MPF.Utilities
                     string line = new string(buffer, 0, read);
 
                     // If we have no newline characters, store in the string builder
-                    if (!line.Contains('\r') && !line.Contains('\n'))
+                    if (!line.Contains("\r") && !line.Contains("\n"))
                         sb.Append(line);
 
                     // If we have a newline, append and log
-                    else if (line.Contains('\n') || line.Contains("\r\n"))
+                    else if (line.Contains("\n") || line.Contains("\r\n"))
                         ProcessNewLines(sb, line, baseClass, handler);
 
                     // If we have a carriage return only, append and log first and last instances
-                    else if (line.Contains('\r'))
+                    else if (line.Contains("\r"))
                         ProcessCarriageReturns(sb, line, baseClass, handler);
                 }
             }
@@ -71,7 +70,7 @@ namespace MPF.Utilities
             for (int i = 0; i < split.Length; i++)
             {
                 // If the chunk contains a carriage return, handle it like a separate line
-                if (split[i].Contains('\r'))
+                if (split[i].Contains("\r"))
                 {
                     ProcessCarriageReturns(sb, split[i], baseClass, handler);
                     continue;