From f1818e7f7ea116be287674bf7a8af8aa396f9a74 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 11 Jun 2020 17:40:39 -0500 Subject: [PATCH] add Api suffix to ApiHawk interfaces, so they will stop colliding with non-api interfaces --- .../Api/APISubsetContainer.cs | 16 ++++++------- .../Api/Classes/MemApi.cs | 2 +- .../Api/Classes/MemEventsApi.cs | 2 +- .../Api/Classes/MemorySaveStateApi.cs | 2 +- .../Api/Classes/SqlApi.cs | 2 +- .../Api/Interfaces/{IComm.cs => ICommApi.cs} | 2 +- .../Api/Interfaces/{IEmu.cs => IEmuApi.cs} | 2 +- .../{IGameInfo.cs => IGameInfoApi.cs} | 0 .../Api/Interfaces/{IGui.cs => IGuiApi.cs} | 2 +- .../Interfaces/{IInput.cs => IInputApi.cs} | 2 +- .../{IInputMovie.cs => IInputMovieApi.cs} | 2 +- .../Interfaces/{IJoypad.cs => IJoypadApi.cs} | 2 +- .../Api/Interfaces/{IMem.cs => IMemApi.cs} | 2 +- .../{IMemEvents.cs => IMemEventsApi.cs} | 24 +++++++++---------- ...orySavestate.cs => IMemorySaveStateApi.cs} | 2 +- .../{ISaveState.cs => ISaveStateApi.cs} | 2 +- .../Api/Interfaces/{ISql.cs => ISqlApi.cs} | 2 +- .../Api/Interfaces/{ITool.cs => IToolApi.cs} | 2 +- .../{IUserData.cs => IUserDataApi.cs} | 2 +- .../AVOut/SynclessRecordingTools.cs | 1 - .../Api/ApiContainer.cs | 10 ++++---- .../Api/Libraries/CommApi.cs | 2 +- .../Api/Libraries/EmuApi.cs | 4 ++-- .../Api/Libraries/GuiApi.cs | 2 +- .../Api/Libraries/InputApi.cs | 2 +- .../Api/Libraries/JoypadApi.cs | 2 +- .../Api/Libraries/MovieApi.cs | 2 +- .../Api/Libraries/SaveStateAPI.cs | 2 +- .../Api/Libraries/ToolApi.cs | 2 +- src/BizHawk.Client.EmuHawk/Api/UserDataApi.cs | 2 +- 30 files changed, 51 insertions(+), 52 deletions(-) rename src/BizHawk.Client.Common/Api/Interfaces/{IComm.cs => ICommApi.cs} (94%) rename src/BizHawk.Client.Common/Api/Interfaces/{IEmu.cs => IEmuApi.cs} (95%) rename src/BizHawk.Client.Common/Api/Interfaces/{IGameInfo.cs => IGameInfoApi.cs} (100%) rename src/BizHawk.Client.Common/Api/Interfaces/{IGui.cs => IGuiApi.cs} (98%) rename src/BizHawk.Client.Common/Api/Interfaces/{IInput.cs => IInputApi.cs} (78%) rename src/BizHawk.Client.Common/Api/Interfaces/{IInputMovie.cs => IInputMovieApi.cs} (93%) rename src/BizHawk.Client.Common/Api/Interfaces/{IJoypad.cs => IJoypadApi.cs} (92%) rename src/BizHawk.Client.Common/Api/Interfaces/{IMem.cs => IMemApi.cs} (97%) rename src/BizHawk.Client.Common/Api/Interfaces/{IMemEvents.cs => IMemEventsApi.cs} (87%) rename src/BizHawk.Client.Common/Api/Interfaces/{IMemorySavestate.cs => IMemorySaveStateApi.cs} (78%) rename src/BizHawk.Client.Common/Api/Interfaces/{ISaveState.cs => ISaveStateApi.cs} (84%) rename src/BizHawk.Client.Common/Api/Interfaces/{ISql.cs => ISqlApi.cs} (83%) rename src/BizHawk.Client.Common/Api/Interfaces/{ITool.cs => IToolApi.cs} (87%) rename src/BizHawk.Client.Common/Api/Interfaces/{IUserData.cs => IUserDataApi.cs} (80%) diff --git a/src/BizHawk.Client.Common/Api/APISubsetContainer.cs b/src/BizHawk.Client.Common/Api/APISubsetContainer.cs index aa2e943d58..c79f888702 100644 --- a/src/BizHawk.Client.Common/Api/APISubsetContainer.cs +++ b/src/BizHawk.Client.Common/Api/APISubsetContainer.cs @@ -7,15 +7,15 @@ namespace BizHawk.Client.Common { public Dictionary Libraries { get; set; } - public IEmu Emu => (IEmu) Libraries[typeof(IEmu)]; + public IEmuApi Emu => (IEmuApi) Libraries[typeof(IEmuApi)]; public IGameInfoApi GameInfo => (IGameInfoApi) Libraries[typeof(IGameInfoApi)]; - public IJoypad Joypad => (IJoypad) Libraries[typeof(IJoypad)]; - public IMem Mem => (IMem) Libraries[typeof(IMem)]; - public IMemEvents MemEvents => (IMemEvents) Libraries[typeof(IMemEvents)]; - public IMemorySaveState MemorySaveState => (IMemorySaveState) Libraries[typeof(IMemorySaveState)]; - public IInputMovie Movie => (IInputMovie) Libraries[typeof(IInputMovie)]; - public ISql Sql => (ISql) Libraries[typeof(ISql)]; - public IUserData UserData => (IUserData) Libraries[typeof(IUserData)]; + public IJoypadApi Joypad => (IJoypadApi) Libraries[typeof(IJoypadApi)]; + public IMemApi Mem => (IMemApi) Libraries[typeof(IMemApi)]; + public IMemEventsApi MemEvents => (IMemEventsApi) Libraries[typeof(IMemEventsApi)]; + public IMemorySaveStateApi MemorySaveState => (IMemorySaveStateApi) Libraries[typeof(IMemorySaveStateApi)]; + public IInputMovieApi Movie => (IInputMovieApi) Libraries[typeof(IInputMovieApi)]; + public ISqlApi Sql => (ISqlApi) Libraries[typeof(ISqlApi)]; + public IUserDataApi UserData => (IUserDataApi) Libraries[typeof(IUserDataApi)]; public ApiSubsetContainer(Dictionary libs) { diff --git a/src/BizHawk.Client.Common/Api/Classes/MemApi.cs b/src/BizHawk.Client.Common/Api/Classes/MemApi.cs index e367530271..b2915bb878 100644 --- a/src/BizHawk.Client.Common/Api/Classes/MemApi.cs +++ b/src/BizHawk.Client.Common/Api/Classes/MemApi.cs @@ -9,7 +9,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { - public sealed class MemApi : IMem + public sealed class MemApi : IMemApi { [RequiredService] private IEmulator Emulator { get; set; } diff --git a/src/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs b/src/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs index dccbd4cdda..37a2243291 100644 --- a/src/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs +++ b/src/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs @@ -2,7 +2,7 @@ namespace BizHawk.Client.Common { - public sealed class MemEventsApi : IMemEvents + public sealed class MemEventsApi : IMemEventsApi { [RequiredService] private IDebuggable DebuggableCore { get; set; } diff --git a/src/BizHawk.Client.Common/Api/Classes/MemorySaveStateApi.cs b/src/BizHawk.Client.Common/Api/Classes/MemorySaveStateApi.cs index 8c56d3f252..06a2be5d94 100644 --- a/src/BizHawk.Client.Common/Api/Classes/MemorySaveStateApi.cs +++ b/src/BizHawk.Client.Common/Api/Classes/MemorySaveStateApi.cs @@ -4,7 +4,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { - public sealed class MemorySaveStateApi : IMemorySaveState + public sealed class MemorySaveStateApi : IMemorySaveStateApi { [RequiredService] private IStatable StatableCore { get; set; } diff --git a/src/BizHawk.Client.Common/Api/Classes/SqlApi.cs b/src/BizHawk.Client.Common/Api/Classes/SqlApi.cs index 043a6c09fc..9e90d9126f 100644 --- a/src/BizHawk.Client.Common/Api/Classes/SqlApi.cs +++ b/src/BizHawk.Client.Common/Api/Classes/SqlApi.cs @@ -4,7 +4,7 @@ using System.Data.SQLite; namespace BizHawk.Client.Common { - public sealed class SqlApi : ISql + public sealed class SqlApi : ISqlApi { private SQLiteConnection _dbConnection; diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IComm.cs b/src/BizHawk.Client.Common/Api/Interfaces/ICommApi.cs similarity index 94% rename from src/BizHawk.Client.Common/Api/Interfaces/IComm.cs rename to src/BizHawk.Client.Common/Api/Interfaces/ICommApi.cs index c8f9f236e0..5c46fc2fdf 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IComm.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/ICommApi.cs @@ -1,6 +1,6 @@ namespace BizHawk.Client.Common { - public interface IComm : IExternalApi + public interface ICommApi : IExternalApi { string SocketServerScreenShot(); string SocketServerScreenShotResponse(); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IEmu.cs b/src/BizHawk.Client.Common/Api/Interfaces/IEmuApi.cs similarity index 95% rename from src/BizHawk.Client.Common/Api/Interfaces/IEmu.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IEmuApi.cs index e7f9a7b9dd..f3ce76e0f5 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IEmu.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IEmuApi.cs @@ -4,7 +4,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { - public interface IEmu : IExternalApi + public interface IEmuApi : IExternalApi { Action FrameAdvanceCallback { get; set; } Action YieldCallback { get; set; } diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IGameInfo.cs b/src/BizHawk.Client.Common/Api/Interfaces/IGameInfoApi.cs similarity index 100% rename from src/BizHawk.Client.Common/Api/Interfaces/IGameInfo.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IGameInfoApi.cs diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IGui.cs b/src/BizHawk.Client.Common/Api/Interfaces/IGuiApi.cs similarity index 98% rename from src/BizHawk.Client.Common/Api/Interfaces/IGui.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IGuiApi.cs index f21879e6e7..d268e39a19 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IGui.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IGuiApi.cs @@ -4,7 +4,7 @@ using System.Drawing.Imaging; namespace BizHawk.Client.Common { - public interface IGui : IDisposable, IExternalApi + public interface IGuiApi : IDisposable, IExternalApi { void ToggleCompositingMode(); ImageAttributes GetAttributes(); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IInput.cs b/src/BizHawk.Client.Common/Api/Interfaces/IInputApi.cs similarity index 78% rename from src/BizHawk.Client.Common/Api/Interfaces/IInput.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IInputApi.cs index f89cfe455f..e756540fe3 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IInput.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IInputApi.cs @@ -2,7 +2,7 @@ namespace BizHawk.Client.Common { - public interface IInput : IExternalApi + public interface IInputApi : IExternalApi { Dictionary Get(); Dictionary GetMouse(); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IInputMovie.cs b/src/BizHawk.Client.Common/Api/Interfaces/IInputMovieApi.cs similarity index 93% rename from src/BizHawk.Client.Common/Api/Interfaces/IInputMovie.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IInputMovieApi.cs index f9144e4bff..c36ff6c369 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IInputMovie.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IInputMovieApi.cs @@ -2,7 +2,7 @@ namespace BizHawk.Client.Common { - public interface IInputMovie : IExternalApi + public interface IInputMovieApi : IExternalApi { bool StartsFromSavestate(); bool StartsFromSaveram(); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IJoypad.cs b/src/BizHawk.Client.Common/Api/Interfaces/IJoypadApi.cs similarity index 92% rename from src/BizHawk.Client.Common/Api/Interfaces/IJoypad.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IJoypadApi.cs index d5bcd781f1..9209bded97 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IJoypad.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IJoypadApi.cs @@ -2,7 +2,7 @@ namespace BizHawk.Client.Common { - public interface IJoypad : IExternalApi + public interface IJoypadApi : IExternalApi { IDictionary Get(int? controller = null); IDictionary GetImmediate(int? controller = null); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IMem.cs b/src/BizHawk.Client.Common/Api/Interfaces/IMemApi.cs similarity index 97% rename from src/BizHawk.Client.Common/Api/Interfaces/IMem.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IMemApi.cs index e35824d8f5..be7d6c37b1 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IMem.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IMemApi.cs @@ -2,7 +2,7 @@ namespace BizHawk.Client.Common { - public interface IMem : IExternalApi + public interface IMemApi : IExternalApi { void SetBigEndian(bool enabled = true); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IMemEvents.cs b/src/BizHawk.Client.Common/Api/Interfaces/IMemEventsApi.cs similarity index 87% rename from src/BizHawk.Client.Common/Api/Interfaces/IMemEvents.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IMemEventsApi.cs index 07a1dd2aaa..f17a8e2d51 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IMemEvents.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IMemEventsApi.cs @@ -1,12 +1,12 @@ -using BizHawk.Emulation.Common; - -namespace BizHawk.Client.Common -{ - public interface IMemEvents : IExternalApi - { - void AddReadCallback(MemoryCallbackDelegate cb, uint? address, string domain); - void AddWriteCallback(MemoryCallbackDelegate cb, uint? address, string domain); - void AddExecCallback(MemoryCallbackDelegate cb, uint? address, string domain); - void RemoveMemoryCallback(MemoryCallbackDelegate cb); - } -} +using BizHawk.Emulation.Common; + +namespace BizHawk.Client.Common +{ + public interface IMemEventsApi : IExternalApi + { + void AddReadCallback(MemoryCallbackDelegate cb, uint? address, string domain); + void AddWriteCallback(MemoryCallbackDelegate cb, uint? address, string domain); + void AddExecCallback(MemoryCallbackDelegate cb, uint? address, string domain); + void RemoveMemoryCallback(MemoryCallbackDelegate cb); + } +} diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IMemorySavestate.cs b/src/BizHawk.Client.Common/Api/Interfaces/IMemorySaveStateApi.cs similarity index 78% rename from src/BizHawk.Client.Common/Api/Interfaces/IMemorySavestate.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IMemorySaveStateApi.cs index bb00f01989..46e9033d86 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IMemorySavestate.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IMemorySaveStateApi.cs @@ -1,6 +1,6 @@ namespace BizHawk.Client.Common { - public interface IMemorySaveState : IExternalApi + public interface IMemorySaveStateApi : IExternalApi { string SaveCoreStateToMemory(); void LoadCoreStateFromMemory(string identifier); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/ISaveState.cs b/src/BizHawk.Client.Common/Api/Interfaces/ISaveStateApi.cs similarity index 84% rename from src/BizHawk.Client.Common/Api/Interfaces/ISaveState.cs rename to src/BizHawk.Client.Common/Api/Interfaces/ISaveStateApi.cs index bd9d3ed423..f1fe18a6a3 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/ISaveState.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/ISaveStateApi.cs @@ -1,6 +1,6 @@ namespace BizHawk.Client.Common { - public interface ISaveState : IExternalApi + public interface ISaveStateApi : IExternalApi { void Load(string path, bool suppressOSD = false); void LoadSlot(int slotNum, bool suppressOSD = false); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/ISql.cs b/src/BizHawk.Client.Common/Api/Interfaces/ISqlApi.cs similarity index 83% rename from src/BizHawk.Client.Common/Api/Interfaces/ISql.cs rename to src/BizHawk.Client.Common/Api/Interfaces/ISqlApi.cs index a93de46500..f6c3f41d4a 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/ISql.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/ISqlApi.cs @@ -1,6 +1,6 @@ namespace BizHawk.Client.Common { - public interface ISql : IExternalApi + public interface ISqlApi : IExternalApi { string CreateDatabase(string name); string OpenDatabase(string name); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/ITool.cs b/src/BizHawk.Client.Common/Api/Interfaces/IToolApi.cs similarity index 87% rename from src/BizHawk.Client.Common/Api/Interfaces/ITool.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IToolApi.cs index 979be4d928..f41fbbb388 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/ITool.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IToolApi.cs @@ -1,7 +1,7 @@ using System; namespace BizHawk.Client.Common { - public interface ITool : IExternalApi + public interface IToolApi : IExternalApi { Type GetTool(string name); object CreateInstance(string name); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IUserData.cs b/src/BizHawk.Client.Common/Api/Interfaces/IUserDataApi.cs similarity index 80% rename from src/BizHawk.Client.Common/Api/Interfaces/IUserData.cs rename to src/BizHawk.Client.Common/Api/Interfaces/IUserDataApi.cs index fc4ca78013..840c894078 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IUserData.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IUserDataApi.cs @@ -1,6 +1,6 @@ namespace BizHawk.Client.Common { - public interface IUserData : IExternalApi + public interface IUserDataApi : IExternalApi { void Set(string name, object value); object Get(string key); diff --git a/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs b/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs index 95d11463d5..3d7ad27f89 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs @@ -7,7 +7,6 @@ using System.Windows.Forms; using BizHawk.Bizware.BizwareGL; using BizHawk.Client.Common; using BizHawk.Emulation.Common; -using IGameInfo = BizHawk.Emulation.Common.IGameInfo; namespace BizHawk.Client.EmuHawk { diff --git a/src/BizHawk.Client.EmuHawk/Api/ApiContainer.cs b/src/BizHawk.Client.EmuHawk/Api/ApiContainer.cs index 25bd548b5c..a0d1c587ad 100644 --- a/src/BizHawk.Client.EmuHawk/Api/ApiContainer.cs +++ b/src/BizHawk.Client.EmuHawk/Api/ApiContainer.cs @@ -7,11 +7,11 @@ namespace BizHawk.Client.EmuHawk { public sealed class ApiContainer : ApiSubsetContainer { - public IComm Comm => (IComm) Libraries[typeof(IComm)]; - public IGui Gui => (IGui) Libraries[typeof(IGui)]; - public IInput Input => (IInput) Libraries[typeof(IInput)]; - public ISaveState SaveState => (ISaveState) Libraries[typeof(ISaveState)]; - public ITool Tool => (ITool) Libraries[typeof(ITool)]; + public ICommApi Comm => (ICommApi) Libraries[typeof(ICommApi)]; + public IGuiApi Gui => (IGuiApi) Libraries[typeof(IGuiApi)]; + public IInputApi Input => (IInputApi) Libraries[typeof(IInputApi)]; + public ISaveStateApi SaveState => (ISaveStateApi) Libraries[typeof(ISaveStateApi)]; + public IToolApi Tool => (IToolApi) Libraries[typeof(IToolApi)]; public ApiContainer(Dictionary libs) : base(libs) {} } diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs index 6d36ad333c..7a4f711a3a 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs @@ -4,7 +4,7 @@ using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk { - public sealed class CommApi : IComm + public sealed class CommApi : ICommApi { public string SocketServerScreenShot() => GlobalWin.socketServer.SendScreenshot(); diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuApi.cs index d06e2c243e..21f280ae47 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuApi.cs @@ -14,7 +14,7 @@ using BizHawk.Emulation.Cores.WonderSwan; namespace BizHawk.Client.EmuHawk { [Description("A library for interacting with the currently loaded emulator core")] - public sealed class EmuApi : IEmu + public sealed class EmuApi : IEmuApi { [RequiredService] private IEmulator Emulator { get; set; } @@ -46,7 +46,7 @@ namespace BizHawk.Client.EmuHawk private readonly Action LogCallback; - /// Using this property to get a reference to GlobalWin.Config is a terrible, horrible, no good, very bad idea. That's why it's not in the interface. + /// Using this property to get a reference to GlobalWin.Config is a terrible, horrible, no good, very bad idea. That's why it's not in the interface. public Config ForbiddenConfigReference { get diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs index de40ef9846..04d9d8e17a 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs @@ -12,7 +12,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public sealed class GuiApi : IGui + public sealed class GuiApi : IGuiApi { [RequiredService] private IEmulator Emulator { get; set; } diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/InputApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/InputApi.cs index c8d9bdb796..bd3f5f5a51 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/InputApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/InputApi.cs @@ -7,7 +7,7 @@ using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk { - public sealed class InputApi : IInput + public sealed class InputApi : IInputApi { private readonly DisplayManager _displayManager; diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/JoypadApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/JoypadApi.cs index 3cda297783..01b377f754 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/JoypadApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/JoypadApi.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public sealed class JoypadApi : IJoypad + public sealed class JoypadApi : IJoypadApi { public JoypadApi(Action logCallback) { diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/MovieApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/MovieApi.cs index 5f6154ec8b..ec71f7f28c 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/MovieApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/MovieApi.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public sealed class MovieApi : IInputMovie + public sealed class MovieApi : IInputMovieApi { public MovieApi(Action logCallback) { diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateAPI.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateAPI.cs index 20d1740557..448c2ef774 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateAPI.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateAPI.cs @@ -6,7 +6,7 @@ using BizHawk.Common; namespace BizHawk.Client.EmuHawk { - public sealed class SaveStateApi : ISaveState + public sealed class SaveStateApi : ISaveStateApi { private readonly MainForm _mainForm; diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/ToolApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/ToolApi.cs index 6ef258818e..dbb8904879 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/ToolApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/ToolApi.cs @@ -6,7 +6,7 @@ using BizHawk.Common; namespace BizHawk.Client.EmuHawk { - public sealed class ToolApi : ITool + public sealed class ToolApi : IToolApi { public Type GetTool(string name) { diff --git a/src/BizHawk.Client.EmuHawk/Api/UserDataApi.cs b/src/BizHawk.Client.EmuHawk/Api/UserDataApi.cs index 3a1ed51cc7..9c43f30e7e 100644 --- a/src/BizHawk.Client.EmuHawk/Api/UserDataApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/UserDataApi.cs @@ -3,7 +3,7 @@ using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk { - public sealed class UserDataApi : IUserData + public sealed class UserDataApi : IUserDataApi { /// type of cannot be used in userdata public void Set(string name, object value)