Various small changes.

Author: KN4CK3R

CodeGenerator/CSharpCodeGenerator.cs

@@ -87,13 +87,13 @@ private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNod
 
 			foreach (var member in members.WhereNot(n => n is BaseHexNode))
 			{
-				if (member is BitFieldNode)
+				var bitFieldNode = member as BitFieldNode;
+				if (bitFieldNode != null)
 				{
 					string type;
-					switch (((BitFieldNode)member).Bits)
+					switch (bitFieldNode.Bits)
 					{
 						default:
-						case 8:
 							type = typeToTypedefMap[typeof(UInt8Node)];
 							break;
 						case 16:

CodeGenerator/CppCodeGenerator.cs

@@ -43,13 +43,15 @@ class CppCodeGenerator : ICodeGenerator
 
 		public string GenerateCode(IEnumerable<ClassNode> classes, ILogger logger)
 		{
+			var classNodes = classes as IList<ClassNode> ?? classes.ToList();
+
 			var sb = new StringBuilder();
 			sb.AppendLine($"// Created with {Constants.ApplicationName} by {Constants.Author}");
 			sb.AppendLine();
 			sb.AppendLine(
 				string.Join(
 					"\n\n",
-					OrderByInheritance(classes.Where(c => c.Nodes.None(n => n is FunctionNode))).Select(c =>
+					OrderByInheritance(classNodes.Where(c => c.Nodes.None(n => n is FunctionNode))).Select(c =>
 					{
 						var csb = new StringBuilder();
 						csb.Append($"class {c.Name}");
@@ -81,26 +83,26 @@ public string GenerateCode(IEnumerable<ClassNode> classes, ILogger logger)
 							)
 						);
 
-						var vtables = c.Nodes.OfType<VTableNode>();
-						if (vtables.Any())
+						var vTableNodes = c.Nodes.OfType<VTableNode>().ToList();
+						if (vTableNodes.Any())
 						{
 							csb.AppendLine();
 							csb.AppendLine(
 								string.Join(
 									"\n",
-									vtables.SelectMany(vt => vt.Nodes).OfType<VMethodNode>().Select(m => $"\tvirtual void {m.MethodName}();")
+									vTableNodes.SelectMany(vt => vt.Nodes).OfType<VMethodNode>().Select(m => $"\tvirtual void {m.MethodName}();")
 								)
 							);
 						}
 
-						var functions = classes.SelectMany(c2 => c2.Nodes).OfType<FunctionNode>().Where(f => f.BelongsToClass == c);
-						if (functions.Any())
+						var functionNodes = classNodes.SelectMany(c2 => c2.Nodes).OfType<FunctionNode>().Where(f => f.BelongsToClass == c).ToList();
+						if (functionNodes.Any())
 						{
 							csb.AppendLine();
 							csb.AppendLine(
 								string.Join(
 									"\n",
-									functions.Select(f => $"\t{f.Signature} {{ }}")
+									functionNodes.Select(f => $"\t{f.Signature} {{ }}")
 								)
 							);
 						}
@@ -139,7 +141,7 @@ private IEnumerable<ClassNode> YieldReversedHierarchy(ClassNode node, HashSet<Cl
 
 			foreach (var referenceNode in node.Nodes.OfType<BaseReferenceNode>())
 			{
-				foreach (var referencedNode in YieldReversedHierarchy(referenceNode.InnerNode as ClassNode, alreadySeen))
+				foreach (var referencedNode in YieldReversedHierarchy(referenceNode.InnerNode, alreadySeen))
 				{
 					yield return referencedNode;
 				}
@@ -181,11 +183,7 @@ private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNod
 				string type;
 				if (typeToTypedefMap.TryGetValue(member.GetType(), out type))
 				{
-					int count = 0;
-					if (member is BaseTextNode)
-					{
-						count = ((BaseTextNode)member).Length;
-					}
+					var count = (member as BaseTextNode)?.Length ?? 0;
 
 					yield return new MemberDefinition(member, type, count);
 				}
@@ -257,10 +255,7 @@ private string MemberDefinitionToString(MemberDefinition member)
 			{
 				return $"{member.Type} {member.Name}[{member.ArrayCount}]; //0x{member.Offset:X04} {member.Comment}".Trim();
 			}
-			else
-			{
-				return $"{member.Type} {member.Name}; //0x{member.Offset:X04} {member.Comment}".Trim();
-			}
+			return $"{member.Type} {member.Name}; //0x{member.Offset:X04} {member.Comment}".Trim();
 		}
 	}
 }

DataExchange/ReClassFile.cs

@@ -10,7 +10,7 @@
 
 namespace ReClassNET.DataExchange
 {
-	partial class ReClassFile : IReClassImport
+	class ReClassFile : IReClassImport
 	{
 		public const string FormatName = "ReClass File";
 		public const string FileExtension = ".reclass";

Debugger/RemoteDebugger.Thread.cs

@@ -11,7 +11,7 @@ public partial class RemoteDebugger
 		private Thread thread;
 
 		private volatile bool running = true;
-		private volatile bool isAttached = false;
+		private volatile bool isAttached;
 
 		public bool IsAttached => isAttached;
 

Debugger/RemoteDebugger.cs

@@ -174,8 +174,6 @@ private List<BreakpointSplit> SplitBreakpoint(IntPtr address, int size)
 
 					address += 1;
 					size -= 1;
-
-					continue;
 				}
 			}
 

Debugger/SoftwareBreakpoint.cs

@@ -36,7 +36,7 @@ public bool Set(RemoteProcess process)
 
 		public void Remove(RemoteProcess process)
 		{
-			process.WriteRemoteMemory(Address, new byte[] { orig });
+			process.WriteRemoteMemory(Address, new[] { orig });
 		}
 
 		public void Handler(ref DebugEvent evt)

Forms/MainForm.cs

@@ -24,7 +24,6 @@ public partial class MainForm : IconForm
 		private readonly CoreFunctionsManager coreFunctions;
 
 		private readonly RemoteProcess remoteProcess;
-		private readonly MemoryBuffer memory;
 
 		private readonly PluginManager pluginManager;
 
@@ -41,7 +40,6 @@ public MainForm(CoreFunctionsManager coreFunctions)
 		{
 			Contract.Requires(coreFunctions != null);
 			Contract.Ensures(remoteProcess != null);
-			Contract.Ensures(memory != null);
 			Contract.Ensures(pluginManager != null);
 			Contract.Ensures(currentProject != null);
 
@@ -66,13 +64,11 @@ public MainForm(CoreFunctionsManager coreFunctions)
 				processInfoToolStripStatusLabel.Text = "No process selected";
 			};
 
-			memory = new MemoryBuffer
+			memoryViewControl.Memory = new MemoryBuffer
 			{
 				Process = remoteProcess
 			};
 
-			memoryViewControl.Memory = memory;
-
 			pluginManager = new PluginManager(new DefaultPluginHost(this, remoteProcess, Program.Logger), coreFunctions);
 
 			SetProject(new ReClassNetProject());
@@ -95,7 +91,7 @@ protected override void OnFormClosed(FormClosedEventArgs e)
 
 			GlobalWindowManager.RemoveWindow(this);
 
-			base.OnClosed(e);
+			base.OnFormClosed(e);
 		}
 
 		#region Event Handler

Forms/PluginForm.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Data;
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Drawing;

Native/NativeMethods.cs

@@ -20,7 +20,7 @@ static NativeMethods()
 			}
 		}
 
-		private static bool? isUnix = null;
+		private static bool? isUnix;
 		public static bool IsUnix()
 		{
 			if (isUnix.HasValue)
@@ -35,7 +35,7 @@ public static bool IsUnix()
 			return isUnix.Value;
 		}
 
-		private static PlatformID? plattformId = null;
+		private static PlatformID? plattformId;
 		public static PlatformID GetPlatformID()
 		{
 			if (plattformId.HasValue)

NativeCore/Windows/DisassembleCode.cpp

@@ -1,6 +1,4 @@
 #include <windows.h>
-#include <vector>
-#include <cstdint>
 #include <beaengine/BeaEngine.h>
 
 #include "NativeCore.hpp"