From e0da7792f400b42fcff5912309a208aaad0c013b Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 12 Nov 2013 18:55:09 +0000
Subject: [PATCH] Emulation - move Calculator folder up one level to be equal
 to console and computer, fix namespaces accordingly

---
 BizHawk.Client.EmuHawk/MainForm.Events.cs           | 2 +-
 BizHawk.Client.EmuHawk/MainForm.cs                  | 2 +-
 BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs     | 2 +-
 BizHawk.Client.EmuHawk/tools/ToolBox.cs             | 2 +-
 BizHawk.Emulation/BizHawk.Emulation.csproj          | 2 +-
 BizHawk.Emulation/{Consoles => }/Calculator/TI83.cs | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename BizHawk.Emulation/{Consoles => }/Calculator/TI83.cs (96%)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 991c3011e2..41bf014c5f 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -6,7 +6,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Consoles.Calculator;
+using BizHawk.Emulation.Calculator;
 using BizHawk.Emulation.Consoles.GB;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index d19627f29b..9bdc1cdbe4 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -13,7 +13,7 @@ using BizHawk.Client.Common;
 using BizHawk.Emulation;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Computers.Commodore64;
-using BizHawk.Emulation.Consoles.Calculator;
+using BizHawk.Emulation.Calculator;
 using BizHawk.Emulation.Consoles.Coleco;
 using BizHawk.Emulation.Consoles.GB;
 using BizHawk.Emulation.Consoles.Intellivision;
diff --git a/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs b/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
index af2669a518..a826fad828 100644
--- a/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
+++ b/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-using BizHawk.Emulation.Consoles.Calculator;
+using BizHawk.Emulation.Calculator;
 using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index 04b978dad8..1768150755 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -4,7 +4,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Nintendo;
-using BizHawk.Emulation.Consoles.Calculator;
+using BizHawk.Emulation.Calculator;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Emulation.Consoles.Sega;
 
diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj
index 6adec76d8a..c16f88f9fa 100644
--- a/BizHawk.Emulation/BizHawk.Emulation.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation.csproj
@@ -82,6 +82,7 @@
     <Compile Include="..\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Calculator\TI83.cs" />
     <Compile Include="Computers\Commodore64\C64.Core.cs" />
     <Compile Include="Computers\Commodore64\C64.cs" />
     <Compile Include="Computers\Commodore64\C64.Motherboard.cs" />
@@ -201,7 +202,6 @@
     <Compile Include="Consoles\Atari\7800\Atari7800.Core.cs" />
     <Compile Include="Consoles\Atari\7800\Atari7800.cs" />
     <Compile Include="Consoles\Atari\7800\Atari7800Control.cs" />
-    <Compile Include="Consoles\Calculator\TI83.cs" />
     <Compile Include="Consoles\Coleco\ColecoVision.cs" />
     <Compile Include="Consoles\Coleco\Input.cs" />
     <Compile Include="Consoles\Coleco\MemoryMap.cs" />
diff --git a/BizHawk.Emulation/Consoles/Calculator/TI83.cs b/BizHawk.Emulation/Calculator/TI83.cs
similarity index 96%
rename from BizHawk.Emulation/Consoles/Calculator/TI83.cs
rename to BizHawk.Emulation/Calculator/TI83.cs
index 2c651fe74f..8c73e741b7 100644
--- a/BizHawk.Emulation/Consoles/Calculator/TI83.cs
+++ b/BizHawk.Emulation/Calculator/TI83.cs
@@ -9,7 +9,7 @@ using BizHawk.Emulation.CPUs.Z80;
 
 //http://www.ticalc.org/pub/text/calcinfo/
 
-namespace BizHawk.Emulation.Consoles.Calculator
+namespace BizHawk.Emulation.Calculator
 {
 	public class TI83 : IEmulator
 	{