misc cleanups

BizHawk.Client.Common/SystemInfo.cs

@@ -8,17 +8,11 @@ namespace BizHawk.Client.Common
 	/// </summary>
 	public sealed class SystemInfo
 	{
-		#region Fields
-
 		private const JoypadButton UpDownLeftRight = JoypadButton.Up | JoypadButton.Down | JoypadButton.Left | JoypadButton.Right;
 		private const JoypadButton StandardButtons = JoypadButton.A | JoypadButton.B | JoypadButton.Start | JoypadButton.Select | UpDownLeftRight;
 
 		private static readonly List<SystemInfo> AllSystemInfos = new List<SystemInfo>();
 
-		#endregion
-
-		#region cTor(s)
-
 		/// <summary>
 		/// Initializes a new instance of the <see cref="SystemInfo"/> class
 		/// </summary>
@@ -36,8 +30,6 @@ namespace BizHawk.Client.Common
 			AllSystemInfos.Add(this);
 		}
 
-		#endregion
-
 		#region Methods
 
 		#region Get SystemInfo
@@ -268,23 +260,11 @@ namespace BizHawk.Client.Common
 			return base.Equals(obj);
 		}
 
-		/// <summary>
-		/// Gets the hashcode for current instance
-		/// </summary>
-		/// <returns>This instance hashcode</returns>
-		public override int GetHashCode()
-		{
-			return base.GetHashCode();
-		}
-
 		/// <summary>
 		/// Returns a <see cref="string"/> representation of current <see cref="SystemInfo"/>
 		/// In fact, return the same as DisplayName property
 		/// </summary>
-		public override string ToString()
+		public override string ToString() => DisplayName;
-		{
-			return DisplayName;
-		}
 
 		/// <summary>
 		/// Determine if two <see cref="SystemInfo"/> are equals.

BizHawk.Client.Common/movie/import/FcmImport.cs

@@ -108,7 +108,7 @@ namespace BizHawk.Client.Common.movie.import
 
 			// 020 16-byte md5sum of the ROM used
 			byte[] md5 = r.ReadBytes(16);
-			Result.Movie.HeaderEntries[MD5] = md5.BytesToHexString().ToLower();
+			Result.Movie.HeaderEntries[Md5] = md5.BytesToHexString().ToLower();
 
 			// 030 4-byte little-endian unsigned int: version of the emulator used
 			uint emuVersion = r.ReadUInt32();

BizHawk.Client.Common/movie/import/Fm2Import.cs

@@ -85,7 +85,7 @@ namespace BizHawk.Client.Common
 					byte[] md5 = DecodeBlob(blob);
 					if (md5 != null && md5.Length == 16)
 					{
-						Result.Movie.HeaderEntries[MD5] = md5.BytesToHexString().ToLower();
+						Result.Movie.HeaderEntries[Md5] = md5.BytesToHexString().ToLower();
 					}
 					else
 					{

BizHawk.Client.Common/movie/import/IMovieImport.cs

@@ -13,7 +13,7 @@ namespace BizHawk.Client.Common
 	internal abstract class MovieImporter : IMovieImport
 	{
 		protected const string EmulationOrigin = "emuOrigin";
-		protected const string MD5 = "MD5";
+		protected const string Md5 = "MD5";
 		protected const string MovieOrigin = "MovieOrigin";
 
 		public ImportResult Import(string path)

BizHawk.Client.Common/movie/import/MmvImport.cs

@@ -91,7 +91,7 @@ namespace BizHawk.Client.Common.movie.import
 
 			// 00e4-00f3: binary: rom MD5 digest
 			byte[] md5 = r.ReadBytes(16);
-			Result.Movie.HeaderEntries[MD5] = md5.BytesToHexString().ToLower();
+			Result.Movie.HeaderEntries[Md5] = md5.BytesToHexString().ToLower();
 
 			var ss = new SMS.SmsSyncSettings
 			{

BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs

@@ -32,15 +32,9 @@ namespace BizHawk.Client.Common
 
 		public string Message { get; set; }
 
-		public override string ToString()
+		public override string ToString() => Frame.ToString() + '\t' + Message;
-		{
-			return Frame.ToString() + '\t' + Message;
-		}
 
-		public override int GetHashCode()
+		public override int GetHashCode() => Frame.GetHashCode();
-		{
-			return Frame.GetHashCode();
-		}
 
 		public override bool Equals(object obj)
 		{

BizHawk.Client.Common/tools/CheatList.cs

@@ -114,7 +114,7 @@ namespace BizHawk.Client.Common
 				cheat.Changed += CheatChanged;
 				if (Contains(cheat))
 				{
-					_cheatList.Remove(Global.CheatList.FirstOrDefault(c => c.Domain == cheat.Domain && c.Address == cheat.Address));
+					_cheatList.Remove(this.FirstOrDefault(c => c.Domain == cheat.Domain && c.Address == cheat.Address));
 				}
 
 				_cheatList.Add(cheat);

BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs

@@ -87,10 +87,7 @@ namespace BizHawk.Client.Common
 		/// <summary>
 		/// Ignore that stuff
 		/// </summary>
-		public override bool Poke(string value)
+		public override bool Poke(string value) => false;
-		{
-			return false;
-		}
 
 		/// <summary>
 		/// Ignore that stuff

BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs

@@ -45,17 +45,17 @@ namespace BizHawk.Client.Common
 		/// </summary>
 		static WatchList()
 		{
-			// Initialize mapping of columns to comparers for sorting.
+			// Initialize mapping of columns to comparer for sorting.
 			WatchComparers = new Dictionary<string, IComparer<Watch>>
 			{
-				{ Address, new WatchAddressComparer() },
+				[Address] = new WatchAddressComparer(),
-				{ Value, new WatchValueComparer() },
+				[Value] = new WatchValueComparer(),
-				{ Prev, new WatchPreviousValueComparer() },
+				[Prev] = new WatchPreviousValueComparer(),
-				{ ChangesCol, new WatchChangeCountComparer() },
+				[ChangesCol] = new WatchChangeCountComparer(),
-				{ Diff, new WatchValueDifferenceComparer() },
+				[Diff] = new WatchValueDifferenceComparer(),
-				{ Type, new WatchFullDisplayTypeComparer() },
+				[Type] = new WatchFullDisplayTypeComparer(),
-				{ Domain, new WatchDomainComparer() },
+				[Domain] = new WatchDomainComparer(),
-				{ Notes, new WatchNoteComparer() }
+				[Notes] = new WatchNoteComparer()
 			};
 		}
 
@@ -410,114 +410,111 @@ namespace BizHawk.Client.Common
 			}
 
 			var isBizHawkWatch = true; // Hack to support .wch files from other emulators
-			using (var sr = file.OpenText())
+			using var sr = file.OpenText();
-			{
+			string line;
-				string line;
 
-				if (!append)
+			if (!append)
+			{
+				Clear();
+			}
+
+			while ((line = sr.ReadLine()) != null)
+			{
+				// .wch files from other emulators start with a number representing the number of watch, that line can be discarded here
+				// Any properly formatted line couldn't possibly be this short anyway, this also takes care of any garbage lines that might be in a file
+				if (line.Length < 5)
 				{
-					Clear();
+					isBizHawkWatch = false;
+					continue;
 				}
 
-				while ((line = sr.ReadLine()) != null)
+				if (line.Length >= 6 && line.Substring(0, 6) == "Domain")
 				{
-					// .wch files from other emulators start with a number representing the number of watch, that line can be discarded here
+					isBizHawkWatch = true;
-					// Any properly formatted line couldn't possibly be this short anyway, this also takes care of any garbage lines that might be in a file
+				}
-					if (line.Length < 5)
-					{
-						isBizHawkWatch = false;
-						continue;
-					}
 
-					if (line.Length >= 6 && line.Substring(0, 6) == "Domain")
+				if (line.Length >= 8 && line.Substring(0, 8) == "SystemID")
-					{
+				{
-						isBizHawkWatch = true;
+					continue;
-					}
+				}
 
-					if (line.Length >= 8 && line.Substring(0, 8) == "SystemID")
+				var numColumns = line.HowMany('\t');
+				int startIndex;
+				if (numColumns == 5)
+				{
+					// If 5, then this is a post 1.0.5 .wch file
+					if (isBizHawkWatch)
 					{
-						continue;
+						// Do nothing here
-					}
-
-					var numColumns = line.HowMany('\t');
-					int startIndex;
-					if (numColumns == 5)
-					{
-						// If 5, then this is a post 1.0.5 .wch file
-						if (isBizHawkWatch)
-						{
-							// Do nothing here
-						}
-						else
-						{
-							startIndex = line.IndexOf('\t') + 1;
-							line = line.Substring(startIndex, line.Length - startIndex);   // 5 digit value representing the watch position number
-						}
 					}
 					else
-					{
-						continue;   // If not 4, something is wrong with this line, ignore it
-					}
-
-					// Temporary, rename if kept
-					int addr;
-					var memDomain = _memoryDomains.MainMemory;
-
-					var temp = line.Substring(0, line.IndexOf('\t'));
-					try
-					{
-						addr = int.Parse(temp, NumberStyles.HexNumber);
-					}
-					catch
-					{
-						continue;
-					}
-
-					startIndex = line.IndexOf('\t') + 1;
-					line = line.Substring(startIndex, line.Length - startIndex);   // Type
-					var size = Watch.SizeFromChar(line[0]);
-
-					startIndex = line.IndexOf('\t') + 1;
-					line = line.Substring(startIndex, line.Length - startIndex);   // Signed
-					var type = Watch.DisplayTypeFromChar(line[0]);
-
-					startIndex = line.IndexOf('\t') + 1;
-					line = line.Substring(startIndex, line.Length - startIndex);   // Endian
-					try
-					{
-						startIndex = short.Parse(line[0].ToString());
-					}
-					catch
-					{
-						continue;
-					}
-
-					var bigEndian = startIndex != 0;
-
-					if (isBizHawkWatch)
 					{
 						startIndex = line.IndexOf('\t') + 1;
-						line = line.Substring(startIndex, line.Length - startIndex);   // Domain
+						line = line.Substring(startIndex, line.Length - startIndex);   // 5 digit value representing the watch position number
-						temp = line.Substring(0, line.IndexOf('\t'));
-						memDomain = _memoryDomains[temp] ?? _memoryDomains.MainMemory;
 					}
-
+				}
-					startIndex = line.IndexOf('\t') + 1;
+				else
-					var notes = line.Substring(startIndex, line.Length - startIndex);
+				{
-
+					continue;   // If not 4, something is wrong with this line, ignore it
-					_watchList.Add(
-						Watch.GenerateWatch(
-							memDomain,
-							addr,
-							size,
-							type,
-							bigEndian,
-							notes));
 				}
 
-				CurrentFileName = path;
+				// Temporary, rename if kept
+				int addr;
+				var memDomain = _memoryDomains.MainMemory;
+
+				var temp = line.Substring(0, line.IndexOf('\t'));
+				try
+				{
+					addr = int.Parse(temp, NumberStyles.HexNumber);
+				}
+				catch
+				{
+					continue;
+				}
+
+				startIndex = line.IndexOf('\t') + 1;
+				line = line.Substring(startIndex, line.Length - startIndex);   // Type
+				var size = Watch.SizeFromChar(line[0]);
+
+				startIndex = line.IndexOf('\t') + 1;
+				line = line.Substring(startIndex, line.Length - startIndex);   // Signed
+				var type = Watch.DisplayTypeFromChar(line[0]);
+
+				startIndex = line.IndexOf('\t') + 1;
+				line = line.Substring(startIndex, line.Length - startIndex);   // Endian
+				try
+				{
+					startIndex = short.Parse(line[0].ToString());
+				}
+				catch
+				{
+					continue;
+				}
+
+				var bigEndian = startIndex != 0;
+
+				if (isBizHawkWatch)
+				{
+					startIndex = line.IndexOf('\t') + 1;
+					line = line.Substring(startIndex, line.Length - startIndex);   // Domain
+					temp = line.Substring(0, line.IndexOf('\t'));
+					memDomain = _memoryDomains[temp] ?? _memoryDomains.MainMemory;
+				}
+
+				startIndex = line.IndexOf('\t') + 1;
+				var notes = line.Substring(startIndex, line.Length - startIndex);
+
+				_watchList.Add(
+					Watch.GenerateWatch(
+						memDomain,
+						addr,
+						size,
+						type,
+						bigEndian,
+						notes));
 			}
 
+			CurrentFileName = path;
 			Changes = append;
 
 			return true;