From 656f2b814e7683be3ae61f896a1acb874ff87a9d Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 15 Feb 2020 12:33:15 -0600 Subject: [PATCH] Move IEmulator extensions to the Emulation.Common namespace, the intent is that these are used and serve as built in functionality, so it's overly tedious to when most situations require both Common and an additional extensions namespace --- BizHawk.Client.ApiHawk/Classes/ClientApi.cs | 5 ++--- BizHawk.Client.Common/Api/Classes/EmuApi.cs | 1 - BizHawk.Client.Common/Api/Classes/MemApi.cs | 1 - BizHawk.Client.Common/Api/Classes/MemEventsApi.cs | 1 - BizHawk.Client.Common/PathManager.cs | 1 - BizHawk.Client.Common/SaveSlotManager.cs | 2 +- BizHawk.Client.Common/SavestateManager.cs | 1 - BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs | 1 - BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs | 1 - BizHawk.Client.Common/lua/LuaFunctionList.cs | 2 +- .../movie/conversions/MovieConversionExtensions.cs | 1 - BizHawk.Client.Common/movie/tasproj/TasLagLog.cs | 2 +- BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs | 1 - BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 1 - BizHawk.Client.Common/movie/tasproj/TasStateManager.cs | 1 - BizHawk.Client.Common/rewind/Rewinder.cs | 3 +-- BizHawk.Client.Common/tools/CheatList.cs | 1 - BizHawk.Client.EmuHawk/Communication.cs | 1 - BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs | 1 - BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs | 1 - BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs | 1 - BizHawk.Client.EmuHawk/LogWindow.cs | 1 - BizHawk.Client.EmuHawk/MainForm.Events.cs | 1 - BizHawk.Client.EmuHawk/MainForm.FileLoader.cs | 2 +- BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 2 +- BizHawk.Client.EmuHawk/MainForm.Movie.cs | 1 - BizHawk.Client.EmuHawk/MainForm.cs | 1 - BizHawk.Client.EmuHawk/Sound/Sound.cs | 1 - .../Sound/Utilities/SoundOutputProvider.cs | 1 - BizHawk.Client.EmuHawk/movie/RecordMovie.cs | 1 - BizHawk.Client.EmuHawk/tools/BatchRunner.cs | 1 - BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs | 3 +-- BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs | 1 - BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 1 - BizHawk.Client.EmuHawk/tools/ToolManager.cs | 1 - BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs | 7 ++----- BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 1 - .../Base Implementations/CallbackBasedTraceBuffer.cs | 1 - BizHawk.Emulation.Common/Extensions.cs | 4 ++-- BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs | 1 - BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs | 1 - BizHawk.sln.DotSettings | 1 + 42 files changed, 14 insertions(+), 50 deletions(-) diff --git a/BizHawk.Client.ApiHawk/Classes/ClientApi.cs b/BizHawk.Client.ApiHawk/Classes/ClientApi.cs index 104747ca8f..3f56f0bed8 100644 --- a/BizHawk.Client.ApiHawk/Classes/ClientApi.cs +++ b/BizHawk.Client.ApiHawk/Classes/ClientApi.cs @@ -1,17 +1,16 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Reflection; using System.Threading.Tasks; using System.Windows.Forms; using BizHawk.Client.Common; +using BizHawk.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Nintendo.Gameboy; using BizHawk.Emulation.Cores.PCEngine; using BizHawk.Emulation.Cores.Sega.MasterSystem; -using System.IO; -using BizHawk.Emulation.Common.IEmulatorExtensions; -using BizHawk.Common; // ReSharper disable UnusedMember.Global namespace BizHawk.Client.ApiHawk diff --git a/BizHawk.Client.Common/Api/Classes/EmuApi.cs b/BizHawk.Client.Common/Api/Classes/EmuApi.cs index 81380d4265..78c184e218 100644 --- a/BizHawk.Client.Common/Api/Classes/EmuApi.cs +++ b/BizHawk.Client.Common/Api/Classes/EmuApi.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.ComponentModel; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; using BizHawk.Emulation.Cores.Nintendo.NES; diff --git a/BizHawk.Client.Common/Api/Classes/MemApi.cs b/BizHawk.Client.Common/Api/Classes/MemApi.cs index 491fb1ff15..c76dd0edb9 100644 --- a/BizHawk.Client.Common/Api/Classes/MemApi.cs +++ b/BizHawk.Client.Common/Api/Classes/MemApi.cs @@ -6,7 +6,6 @@ using System.Security.Cryptography; using BizHawk.Common; using BizHawk.Common.BufferExtensions; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs b/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs index cdf7a410d4..dccbd4cdda 100644 --- a/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs +++ b/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs @@ -1,5 +1,4 @@ using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/PathManager.cs b/BizHawk.Client.Common/PathManager.cs index fdf74b52bd..e49338dea0 100644 --- a/BizHawk.Client.Common/PathManager.cs +++ b/BizHawk.Client.Common/PathManager.cs @@ -6,7 +6,6 @@ using System.Reflection; using BizHawk.Common; using BizHawk.Common.StringExtensions; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Nintendo.SNES9X; diff --git a/BizHawk.Client.Common/SaveSlotManager.cs b/BizHawk.Client.Common/SaveSlotManager.cs index 6f197ade78..503c1ed61f 100644 --- a/BizHawk.Client.Common/SaveSlotManager.cs +++ b/BizHawk.Client.Common/SaveSlotManager.cs @@ -1,7 +1,7 @@ using System.IO; using BizHawk.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; +using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/SavestateManager.cs b/BizHawk.Client.Common/SavestateManager.cs index 0420b359fa..80386a062b 100644 --- a/BizHawk.Client.Common/SavestateManager.cs +++ b/BizHawk.Client.Common/SavestateManager.cs @@ -4,7 +4,6 @@ using System.Linq; using BizHawk.Common; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs index 9a8edc8ab1..8cf070fc84 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs @@ -4,7 +4,6 @@ using System.ComponentModel; using NLua; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; // ReSharper disable UnusedMember.Global // ReSharper disable UnusedAutoPropertyAccessor.Local diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs index e8f19d3cdb..8969a929de 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs @@ -2,7 +2,6 @@ using System.ComponentModel; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using NLua; diff --git a/BizHawk.Client.Common/lua/LuaFunctionList.cs b/BizHawk.Client.Common/lua/LuaFunctionList.cs index 4983c3b783..218b7673dc 100644 --- a/BizHawk.Client.Common/lua/LuaFunctionList.cs +++ b/BizHawk.Client.Common/lua/LuaFunctionList.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -using BizHawk.Emulation.Common.IEmulatorExtensions; +using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs index 2dd076ede3..75eff16637 100644 --- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs +++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs @@ -7,7 +7,6 @@ using BizHawk.Emulation.Cores.Nintendo.Gameboy; using BizHawk.Emulation.Cores.Nintendo.GBHawk; using BizHawk.Emulation.Cores.Nintendo.SubNESHawk; using BizHawk.Emulation.Cores.Sega.MasterSystem; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; using BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive; diff --git a/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs b/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs index 7101dca7af..4421b81251 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using Newtonsoft.Json; -using BizHawk.Emulation.Common.IEmulatorExtensions; +using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs index 70fbd444af..f16fa296cd 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs @@ -2,7 +2,6 @@ using System.Linq; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index 2570c39d92..1f33d8634f 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -6,7 +6,6 @@ using System.IO; using System.Linq; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs index b55c5bedb8..a1a8974ea4 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs @@ -5,7 +5,6 @@ using System.Linq; using BizHawk.Common.NumberExtensions; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/rewind/Rewinder.cs b/BizHawk.Client.Common/rewind/Rewinder.cs index ba2e71c25b..5295f387a3 100644 --- a/BizHawk.Client.Common/rewind/Rewinder.cs +++ b/BizHawk.Client.Common/rewind/Rewinder.cs @@ -1,7 +1,6 @@ using System; using System.IO; - -using BizHawk.Emulation.Common.IEmulatorExtensions; +using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/tools/CheatList.cs b/BizHawk.Client.Common/tools/CheatList.cs index 98fb330d37..bdfced2a42 100644 --- a/BizHawk.Client.Common/tools/CheatList.cs +++ b/BizHawk.Client.Common/tools/CheatList.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Text; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.EmuHawk/Communication.cs b/BizHawk.Client.EmuHawk/Communication.cs index 07e4be4cd6..ca177ab6a9 100644 --- a/BizHawk.Client.EmuHawk/Communication.cs +++ b/BizHawk.Client.EmuHawk/Communication.cs @@ -10,7 +10,6 @@ using BizHawk.Bizware.BizwareGL; using System.Drawing; using BizHawk.Emulation.Common; using BizHawk.Client.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs b/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs index e261a23530..f8ea328934 100644 --- a/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs +++ b/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs @@ -7,7 +7,6 @@ using System.Reflection; using BizHawk.Client.Common; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs index bd6503a531..a9786af00e 100644 --- a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs +++ b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs @@ -5,7 +5,6 @@ using System.Drawing; using System.Collections.Generic; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; using BizHawk.Client.Common.InputAdapterExtensions; diff --git a/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs index cfe30f3ade..114e3e9e3d 100644 --- a/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs +++ b/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs @@ -1,7 +1,6 @@ using System.Drawing; using BizHawk.Client.Common; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; using BizHawk.Emulation.Cores.Nintendo.SNES; diff --git a/BizHawk.Client.EmuHawk/LogWindow.cs b/BizHawk.Client.EmuHawk/LogWindow.cs index 272aa0c40d..8ecc7be4c3 100644 --- a/BizHawk.Client.EmuHawk/LogWindow.cs +++ b/BizHawk.Client.EmuHawk/LogWindow.cs @@ -6,7 +6,6 @@ using System.Windows.Forms; using BizHawk.Common; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; // todo - perks - pause, copy to clipboard, backlog length limiting diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 97b82bc063..eb8aacc4b6 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -4,7 +4,6 @@ using System.IO; using System.Windows.Forms; using System.Collections.Generic; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Emulation.Cores.Calculators; using BizHawk.Emulation.Cores.ColecoVision; using BizHawk.Emulation.Cores.Nintendo.NES; diff --git a/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs b/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs index a71cd5246f..23239c657b 100644 --- a/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs +++ b/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Collections.Generic; using BizHawk.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; +using BizHawk.Emulation.Common; using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index 7d7a3e66ed..045c049fcc 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -1,7 +1,7 @@ using System.Linq; using BizHawk.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; +using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Nintendo.Gameboy; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs index c7a6684f33..1ab510dd54 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs @@ -4,7 +4,6 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index e0d7570d9d..90905d0bd6 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -18,7 +18,6 @@ using BizHawk.Client.Common; using BizHawk.Bizware.BizwareGL; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; using BizHawk.Emulation.Cores.Nintendo.GBA; using BizHawk.Emulation.Cores.Nintendo.NES; diff --git a/BizHawk.Client.EmuHawk/Sound/Sound.cs b/BizHawk.Client.EmuHawk/Sound/Sound.cs index 0c99b6e0f1..cb92869efb 100644 --- a/BizHawk.Client.EmuHawk/Sound/Sound.cs +++ b/BizHawk.Client.EmuHawk/Sound/Sound.cs @@ -2,7 +2,6 @@ using System.Threading; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; using BizHawk.Common; diff --git a/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs b/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs index d734ac50c2..5bd78d85d0 100644 --- a/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs +++ b/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs @@ -4,7 +4,6 @@ using System.Linq; using BizHawk.Client.Common; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs index 8054e5bd41..db53487a8d 100644 --- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs +++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs @@ -4,7 +4,6 @@ using System.Windows.Forms; using System.Linq; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; using BizHawk.Client.Common.MovieConversionExtensions; diff --git a/BizHawk.Client.EmuHawk/tools/BatchRunner.cs b/BizHawk.Client.EmuHawk/tools/BatchRunner.cs index d01c974c14..e3a0d681c3 100644 --- a/BizHawk.Client.EmuHawk/tools/BatchRunner.cs +++ b/BizHawk.Client.EmuHawk/tools/BatchRunner.cs @@ -4,7 +4,6 @@ using System.IO; using BizHawk.Common; using BizHawk.Client.Common; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Emulation.Cores.Nintendo.GBA; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs index b6e48a5617..2b100126ea 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Windows.Forms; using BizHawk.Client.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using Emu = BizHawk.Emulation.Common; @@ -42,7 +41,7 @@ namespace BizHawk.Client.EmuHawk { DomainDropDown.Items.Clear(); DomainDropDown.Items.AddRange(MemoryDomains - .Where(d => d.CanPoke()) + .Where(d => d.Writable) .Select(d => d.ToString()) .ToArray()); diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index 68c7f3139b..ef366b3ab0 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -13,7 +13,6 @@ using BizHawk.Common.NumberExtensions; using BizHawk.Common.StringExtensions; using BizHawk.Common.IOExtensions; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.ToolExtensions; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index a11cc5bab6..b301b5f9ff 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -7,7 +7,6 @@ using System.Windows.Forms; using System.ComponentModel; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; using BizHawk.Client.Common.MovieConversionExtensions; diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs index 742dd73a9c..3f61756b52 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -14,7 +14,6 @@ using BizHawk.Client.EmuHawk.CoreExtensions; using BizHawk.Common; using BizHawk.Common.ReflectionExtensions; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 89c4f5626c..524dad7566 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -9,13 +9,10 @@ using System.Reflection; using System.Text; using System.Windows.Forms; -using BizHawk.Common.NumberExtensions; - -using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; - using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.ToolExtensions; +using BizHawk.Common.NumberExtensions; +using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index f83d47fc53..d71fe4db1c 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -8,7 +8,6 @@ using System.Text; using System.Windows.Forms; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.ToolExtensions; diff --git a/BizHawk.Emulation.Common/Base Implementations/CallbackBasedTraceBuffer.cs b/BizHawk.Emulation.Common/Base Implementations/CallbackBasedTraceBuffer.cs index e2bd12d69d..077d3444fe 100644 --- a/BizHawk.Emulation.Common/Base Implementations/CallbackBasedTraceBuffer.cs +++ b/BizHawk.Emulation.Common/Base Implementations/CallbackBasedTraceBuffer.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Emulation.Common { diff --git a/BizHawk.Emulation.Common/Extensions.cs b/BizHawk.Emulation.Common/Extensions.cs index 29ca2fe57c..4af01c1aef 100644 --- a/BizHawk.Emulation.Common/Extensions.cs +++ b/BizHawk.Emulation.Common/Extensions.cs @@ -3,9 +3,9 @@ using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; -namespace BizHawk.Emulation.Common.IEmulatorExtensions +namespace BizHawk.Emulation.Common { - public static class Extensions + public static class EmulatorExtensions { public static CoreAttribute Attributes(this IEmulator core) { diff --git a/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs index b56e502935..5b54902378 100644 --- a/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs +++ b/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs @@ -8,7 +8,6 @@ using System.Dynamic; using BizHawk.Common; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; namespace BizHawk.Emulation.Cores.Arcades.MAME { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs index 342eaef8c4..2de5cc5f6c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs @@ -2,7 +2,6 @@ using System.Threading; using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Emulation.Cores.Nintendo.N64.NativeApi; namespace BizHawk.Emulation.Cores.Nintendo.N64 diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings index 47528f4054..32cf84435c 100644 --- a/BizHawk.sln.DotSettings +++ b/BizHawk.sln.DotSettings @@ -364,6 +364,7 @@ True True True + True True True True