From e56b3abd3706b6b71a9094c15e920c85f86869ca Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 20 Nov 2021 07:06:14 +1000 Subject: [PATCH] Add missing `: IDialogParent`, remove unnecessary `IMainForm*` params --- src/BizHawk.Client.EmuHawk/MainForm.Events.cs | 14 ++++++++++---- src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs | 2 +- .../config/AmstradCPC/AmstradCPCPokeMemory.cs | 4 +--- .../config/FirmwaresConfig.cs | 8 +++----- src/BizHawk.Client.EmuHawk/config/SoundConfig.cs | 2 +- .../config/ZXSpectrum/ZXSpectrumPokeMemory.cs | 7 ++----- .../movie/EditSubtitlesForm.cs | 2 +- src/BizHawk.Client.EmuHawk/tools/BatchRun.cs | 2 +- .../tools/TAStudio/GreenzoneSettings.cs | 2 +- src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs | 2 +- 10 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index fccbef899d..46c8155a82 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -863,13 +863,19 @@ namespace BizHawk.Client.EmuHawk { if (e is RomLoader.RomErrorArgs args) { - using var configForm = new FirmwaresConfig(FirmwareManager, Config.FirmwareUserSpecifications, this, Config.PathEntries, retryLoadRom: true, reloadRomPath: args.RomPath); + using var configForm = new FirmwaresConfig( + this, + FirmwareManager, + Config.FirmwareUserSpecifications, + Config.PathEntries, + retryLoadRom: true, + reloadRomPath: args.RomPath); var result = configForm.ShowDialog(); args.Retry = result == DialogResult.Retry; } else { - using var configForm = new FirmwaresConfig(FirmwareManager, Config.FirmwareUserSpecifications, this, Config.PathEntries); + using var configForm = new FirmwaresConfig(this, FirmwareManager, Config.FirmwareUserSpecifications, Config.PathEntries); configForm.ShowDialog(); } } @@ -1877,7 +1883,7 @@ namespace BizHawk.Client.EmuHawk { if (Emulator is ZXSpectrum speccy) { - using var form = new ZxSpectrumPokeMemory(this, speccy); + using var form = new ZxSpectrumPokeMemory(speccy); form.ShowDialog(); } } @@ -2006,7 +2012,7 @@ namespace BizHawk.Client.EmuHawk { if (Emulator is AmstradCPC cpc) { - using var form = new AmstradCpcPokeMemory(this, cpc); + using var form = new AmstradCpcPokeMemory(cpc); form.ShowDialog(); } } diff --git a/src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs b/src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs index c0c19621a1..6877ebc47d 100644 --- a/src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs +++ b/src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs @@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk MameLaunchGame } - public partial class OpenAdvancedChooser : Form + public partial class OpenAdvancedChooser : Form, IDialogParent { private readonly Config _config; diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs index be58ab315a..668399f192 100644 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs +++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs @@ -7,12 +7,10 @@ namespace BizHawk.Client.EmuHawk { public partial class AmstradCpcPokeMemory : Form { - private readonly IMainFormForConfig _mainForm; private readonly AmstradCPC _cpc; - public AmstradCpcPokeMemory(IMainFormForConfig mainForm, AmstradCPC cpc) + public AmstradCpcPokeMemory(AmstradCPC cpc) { - _mainForm = mainForm; _cpc = cpc; InitializeComponent(); Icon = Properties.Resources.GameControllerIcon; diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs index a6b887dac8..d7e1ea0320 100644 --- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs @@ -30,11 +30,9 @@ namespace BizHawk.Client.EmuHawk { private readonly IDictionary _firmwareUserSpecifications; - private readonly IMainFormForConfig _mainForm; - private readonly PathEntryCollection _pathEntries; - public IDialogController DialogController => _mainForm.DialogController; + public IDialogController DialogController { get; } private readonly FirmwareManager Manager; @@ -102,16 +100,16 @@ namespace BizHawk.Client.EmuHawk private readonly ListViewSorter _listViewSorter; public FirmwaresConfig( + IDialogController dialogController, FirmwareManager firmwareManager, IDictionary firmwareUserSpecifications, - IMainFormForConfig mainForm, PathEntryCollection pathEntries, bool retryLoadRom = false, string reloadRomPath = null) { _firmwareUserSpecifications = firmwareUserSpecifications; - _mainForm = mainForm; _pathEntries = pathEntries; + DialogController = dialogController; Manager = firmwareManager; InitializeComponent(); diff --git a/src/BizHawk.Client.EmuHawk/config/SoundConfig.cs b/src/BizHawk.Client.EmuHawk/config/SoundConfig.cs index d2193a7840..23ffe312f2 100644 --- a/src/BizHawk.Client.EmuHawk/config/SoundConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/SoundConfig.cs @@ -7,7 +7,7 @@ using BizHawk.Common; namespace BizHawk.Client.EmuHawk { - public partial class SoundConfig : Form + public partial class SoundConfig : Form, IDialogParent { private readonly Config _config; diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs index 18eb71b7fb..5a2d980c0b 100644 --- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs +++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs @@ -6,13 +6,10 @@ namespace BizHawk.Client.EmuHawk { public partial class ZxSpectrumPokeMemory : Form { - private readonly IMainFormForConfig _mainForm; private readonly ZXSpectrum _speccy; - public ZxSpectrumPokeMemory( - IMainFormForConfig mainForm, - ZXSpectrum speccy) + + public ZxSpectrumPokeMemory(ZXSpectrum speccy) { - _mainForm = mainForm; _speccy = speccy; InitializeComponent(); diff --git a/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs b/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs index 87f447fd10..36188ac47b 100644 --- a/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs +++ b/src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs @@ -9,7 +9,7 @@ using BizHawk.Common.NumberExtensions; namespace BizHawk.Client.EmuHawk { - public partial class EditSubtitlesForm : Form + public partial class EditSubtitlesForm : Form, IDialogParent { private readonly IMovie _selectedMovie; diff --git a/src/BizHawk.Client.EmuHawk/tools/BatchRun.cs b/src/BizHawk.Client.EmuHawk/tools/BatchRun.cs index d27d26231b..4150cb2c57 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BatchRun.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BatchRun.cs @@ -10,7 +10,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public partial class BatchRun : Form + public partial class BatchRun : Form, IDialogParent { private readonly Config _config; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs index adf2efa0e0..e23c7b6146 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs @@ -5,7 +5,7 @@ using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk { - public partial class GreenzoneSettings : Form + public partial class GreenzoneSettings : Form, IDialogParent { private readonly Action _saveSettings; private ZwinderStateManagerSettings _settings; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs index dcb8488536..17aebcf7dc 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs @@ -9,7 +9,7 @@ using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk { // TODO: don't use textboxes as labels - public partial class RamPoke : Form + public partial class RamPoke : Form, IDialogParent { private readonly List _watchList; private readonly CheatCollection _cheats;