From 90b0574bc385bd4c1cb15a42c2e9b5ce5e06d22b Mon Sep 17 00:00:00 2001 From: James Groom Date: Sun, 13 Oct 2019 15:50:57 +0000 Subject: [PATCH] Remove unnecessary calls to ToList (e.g. in foreach) squashed PR #1591 --- BizHawk.Client.Common/RecentFiles.cs | 12 +-- BizHawk.Client.Common/config/Binding.cs | 7 +- BizHawk.Client.Common/config/PathEntry.cs | 2 +- .../lua/EmuLuaLibrary.Events.cs | 76 ++++++++----------- .../movie/bk2/Bk2ControllerAdapter.cs | 2 +- BizHawk.Client.Common/tools/CheatList.cs | 9 +-- .../tools/RamSearchEngine.cs | 3 +- .../DATTools/NOINTROParser.cs | 10 +-- BizHawk.Client.DBMan/DATTools/TOSECParser.cs | 10 +-- BizHawk.Client.EmuHawk/Api/ApiManager.cs | 15 ++-- BizHawk.Client.EmuHawk/BizBox.cs | 3 +- .../CustomControls/InputRoll.cs | 23 ++---- BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 5 +- .../Sound/Output/DirectSoundSoundOutput.cs | 2 +- .../Sound/Output/XAudio2SoundOutput.cs | 4 +- BizHawk.Client.EmuHawk/config/HotkeyConfig.cs | 4 +- .../config/NES/NESSyncSettingsForm.cs | 2 +- BizHawk.Client.EmuHawk/config/PathConfig.cs | 11 ++- BizHawk.Client.EmuHawk/movie/PlayMovie.cs | 18 ++--- .../tools/BasicBot/BasicBot.cs | 8 +- BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs | 9 ++- .../tools/Debugger/RegisterBoxControl.cs | 47 +++++------- .../tools/HexEditor/HexEditor.cs | 5 +- .../Lua/Libraries/EmuLuaLibrary.Console.cs | 3 +- .../Lua/Libraries/EmuLuaLibrary.Forms.cs | 6 +- .../tools/Lua/Libraries/EmuLuaLibrary.cs | 15 ++-- .../tools/Lua/LuaConsole.cs | 40 ++++------ .../tools/Lua/LuaRegisteredFunctionsList.cs | 2 +- .../MultiDiskBundler/MultiDiskBundler.cs | 4 +- .../tools/TAStudio/TAStudio.MenuItems.cs | 11 +-- .../tools/VirtualPads/VirtualPad.cs | 40 +++++----- .../tools/Watch/RamSearch.cs | 2 +- .../tools/Watch/RamWatch.cs | 6 +- BizHawk.Client.MultiHawk/Mainform.cs | 6 +- BizHawk.Client.MultiHawk/movie/PlayMovie.cs | 18 ++--- BizHawk.Common/BizInvoke/BizExvoker.cs | 3 +- BizHawk.Emulation.Common/ServiceAttributes.cs | 2 +- .../Hardware/Display/AmstradGateArray.cs | 3 +- .../AmstradCPC/Media/Tape/TapeDataBlock.cs | 7 +- .../Media/Disk/IPFFormat/IPFFloppyDisk.cs | 2 +- .../Media/Tape/TapeDataBlock.cs | 7 +- .../Consoles/Atari/2600/Atari2600.cs | 2 +- .../Gameboy/GambatteLink.IDebuggable.cs | 2 +- BizHawk.Emulation.Cores/CoreInventory.cs | 2 +- BizHawk.Emulation.Cores/Waterbox/ElfRunner.cs | 16 ++-- BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs | 4 +- 46 files changed, 198 insertions(+), 292 deletions(-) diff --git a/BizHawk.Client.Common/RecentFiles.cs b/BizHawk.Client.Common/RecentFiles.cs index b3fa4b91c6..19ca7df854 100644 --- a/BizHawk.Client.Common/RecentFiles.cs +++ b/BizHawk.Client.Common/RecentFiles.cs @@ -89,17 +89,7 @@ namespace BizHawk.Client.Common { if (!Frozen) { - var removed = false; - foreach (var recent in recentlist.ToList()) - { - if (string.Compare(newFile, recent, StringComparison.CurrentCultureIgnoreCase) == 0) - { - recentlist.Remove(newFile); // intentionally keeps iterating after this to remove duplicate instances, though those should never exist in the first place - removed = true; - } - } - - return removed; + return recentlist.RemoveAll(recent => string.Compare(newFile, recent, StringComparison.CurrentCultureIgnoreCase) == 0) != 0; // none removed => return false } return false; diff --git a/BizHawk.Client.Common/config/Binding.cs b/BizHawk.Client.Common/config/Binding.cs index c2ec1c1738..b2d9ad6d6a 100644 --- a/BizHawk.Client.Common/config/Binding.cs +++ b/BizHawk.Client.Common/config/Binding.cs @@ -96,13 +96,8 @@ namespace BizHawk.Client.Common } } - List entriesToRemove = (from entry in Bindings let binding = DefaultValues.FirstOrDefault(b => b.DisplayName == entry.DisplayName) where binding == null select entry).ToList(); - // Remove entries that no longer exist in defaults - foreach (Binding entry in entriesToRemove) - { - Bindings.Remove(entry); - } + Bindings.RemoveAll(entry => DefaultValues.All(b => b.DisplayName != entry.DisplayName)); } private static List _defaultValues; diff --git a/BizHawk.Client.Common/config/PathEntry.cs b/BizHawk.Client.Common/config/PathEntry.cs index 8f8e6776a5..2c91df1807 100644 --- a/BizHawk.Client.Common/config/PathEntry.cs +++ b/BizHawk.Client.Common/config/PathEntry.cs @@ -119,7 +119,7 @@ namespace BizHawk.Client.Common } // Add missing displaynames - var missingDisplayPaths = Paths.Where(p => p.SystemDisplayName == null).ToList(); + var missingDisplayPaths = Paths.Where(p => p.SystemDisplayName == null); foreach (PathEntry path in missingDisplayPaths) { path.SystemDisplayName = DefaultValues.First(p => p.System == path.System).SystemDisplayName; diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs index 1ec246820e..da03cbd7eb 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs @@ -50,78 +50,66 @@ namespace BizHawk.Client.Common public void CallSaveStateEvent(string name) { - var lfs = _luaFunctions.Where(l => l.Event == "OnSavestateSave").ToList(); - if (lfs.Any()) + var lfs = _luaFunctions.Where(l => l.Event == "OnSavestateSave"); + try { - try + foreach (var lf in lfs) { - foreach (var lf in lfs) - { - lf.Call(name); - } - } - catch (Exception e) - { - Log($"error running function attached by lua function event.onsavestate\nError message: {e.Message}"); + lf.Call(name); } } + catch (Exception e) + { + Log($"error running function attached by lua function event.onsavestate\nError message: {e.Message}"); + } } public void CallLoadStateEvent(string name) { - var lfs = _luaFunctions.Where(l => l.Event == "OnSavestateLoad").ToList(); - if (lfs.Any()) + var lfs = _luaFunctions.Where(l => l.Event == "OnSavestateLoad"); + try { - try + foreach (var lf in lfs) { - foreach (var lf in lfs) - { - lf.Call(name); - } - } - catch (Exception e) - { - Log($"error running function attached by lua function event.onloadstate\nError message: {e.Message}"); + lf.Call(name); } } + catch (Exception e) + { + Log($"error running function attached by lua function event.onloadstate\nError message: {e.Message}"); + } } public void CallFrameBeforeEvent() { - var lfs = _luaFunctions.Where(l => l.Event == "OnFrameStart").ToList(); - if (lfs.Any()) + var lfs = _luaFunctions.Where(l => l.Event == "OnFrameStart"); + try { - try + foreach (var lf in lfs) { - foreach (var lf in lfs) - { - lf.Call(); - } - } - catch (Exception e) - { - Log($"error running function attached by lua function event.onframestart\nError message: {e.Message}"); + lf.Call(); } } + catch (Exception e) + { + Log($"error running function attached by lua function event.onframestart\nError message: {e.Message}"); + } } public void CallFrameAfterEvent() { - var lfs = _luaFunctions.Where(l => l.Event == "OnFrameEnd").ToList(); - if (lfs.Any()) + var lfs = _luaFunctions.Where(l => l.Event == "OnFrameEnd"); + try { - try + foreach (var lf in lfs) { - foreach (var lf in lfs) - { - lf.Call(); - } - } - catch (Exception e) - { - Log($"error running function attached by lua function event.onframeend\nError message: {e.Message}"); + lf.Call(); } } + catch (Exception e) + { + Log($"error running function attached by lua function event.onframeend\nError message: {e.Message}"); + } } private bool N64CoreTypeDynarec() diff --git a/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs b/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs index 5c49ef6f5d..fbcd18319f 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs @@ -160,7 +160,7 @@ namespace BizHawk.Client.Common { var def = Global.Emulator.ControllerDefinition; var trimmed = mnemonic.Replace("|", ""); - var buttons = Definition.ControlsOrdered.SelectMany(c => c).ToList(); + var buttons = Definition.ControlsOrdered.SelectMany(c => c); var iterator = 0; foreach (var key in buttons) diff --git a/BizHawk.Client.Common/tools/CheatList.cs b/BizHawk.Client.Common/tools/CheatList.cs index 1ec255a96e..79a8cb95c7 100644 --- a/BizHawk.Client.Common/tools/CheatList.cs +++ b/BizHawk.Client.Common/tools/CheatList.cs @@ -222,7 +222,7 @@ namespace BizHawk.Client.Common public void RemoveRange(IEnumerable cheats) { - foreach (var cheat in cheats.ToList()) + foreach (var cheat in cheats.ToList()) // enumerate passed IEnumerable because it may depend on the value of _cheatList { _cheatList.Remove(cheat); } @@ -232,12 +232,7 @@ namespace BizHawk.Client.Common public void RemoveRange(IEnumerable watches) { - var removeList = _cheatList.Where(cheat => watches.Any(w => w == cheat)).ToList(); - foreach (var cheat in removeList) - { - _cheatList.Remove(cheat); - } - + _cheatList.RemoveAll(cheat => watches.Any(w => w == cheat)); Changes = true; } diff --git a/BizHawk.Client.Common/tools/RamSearchEngine.cs b/BizHawk.Client.Common/tools/RamSearchEngine.cs index 945312ff44..c65d589143 100644 --- a/BizHawk.Client.Common/tools/RamSearchEngine.cs +++ b/BizHawk.Client.Common/tools/RamSearchEngine.cs @@ -341,8 +341,7 @@ namespace BizHawk.Client.Common } var addresses = watches.Select(w => w.Address); - var removeList = _watchList.Where(w => addresses.Contains(w.Address)).ToList(); - _watchList = _watchList.Except(removeList).ToList(); + _watchList.RemoveAll(w => addresses.Contains(w.Address)); } public void RemoveRange(IEnumerable indices) diff --git a/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs b/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs index de710c70d2..b64be85b47 100644 --- a/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs +++ b/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs @@ -188,11 +188,11 @@ namespace BizHawk.Client.DBMan // process dump info flags and other info contained in [] if (nameString.Contains("[") && nameString.Contains("]")) { - List e = nameString.ToString().Split('[', ']').ToList(); - // remove first entry (this is the bit before the [] entries start - e.RemoveAt(0); - // remove empty entries - e = e.Where(s => !string.IsNullOrWhiteSpace(s)).Distinct().ToList(); + var e = nameString.Split('[', ']') + .Skip(1) // remove first entry (this is the bit before the [] entries start) + .Where(s => !string.IsNullOrWhiteSpace(s)) // remove empty entries + .Distinct() + .ToList(); if (e.Count > 0) { diff --git a/BizHawk.Client.DBMan/DATTools/TOSECParser.cs b/BizHawk.Client.DBMan/DATTools/TOSECParser.cs index 7ab55b2036..25f2834476 100644 --- a/BizHawk.Client.DBMan/DATTools/TOSECParser.cs +++ b/BizHawk.Client.DBMan/DATTools/TOSECParser.cs @@ -206,11 +206,11 @@ namespace BizHawk.Client.DBMan // process dump info flags and other info contained in [] if (nameString.Contains("[") && nameString.Contains("]")) { - List e = nameString.ToString().Split('[', ']').ToList(); - // remove first entry (this is the bit before the [] entries start - e.RemoveAt(0); - // remove empty entries - e = e.Where(s => !string.IsNullOrWhiteSpace(s)).Distinct().ToList(); + var e = nameString.Split('[', ']') + .Skip(1) // remove first entry (this is the bit before the [] entries start) + .Where(s => !string.IsNullOrWhiteSpace(s)) // remove empty entries + .Distinct() + .ToList(); if (e.Count > 0) { diff --git a/BizHawk.Client.EmuHawk/Api/ApiManager.cs b/BizHawk.Client.EmuHawk/Api/ApiManager.cs index 9dd5b71087..fdb3f836f7 100644 --- a/BizHawk.Client.EmuHawk/Api/ApiManager.cs +++ b/BizHawk.Client.EmuHawk/Api/ApiManager.cs @@ -23,15 +23,12 @@ namespace BizHawk.Client.EmuHawk .Where(t => typeof(IExternalApi).IsAssignableFrom(t)) .Where(t => t.IsSealed) .Where(t => ServiceInjector.IsAvailable(serviceProvider, t)) - .ToList(); - - apis.AddRange( - Assembly - .GetAssembly(typeof(ApiContainer)) - .GetTypes() - .Where(t => typeof(IExternalApi).IsAssignableFrom(t)) - .Where(t => t.IsSealed) - .Where(t => ServiceInjector.IsAvailable(serviceProvider, t))); + .Concat(Assembly + .GetAssembly(typeof(ApiContainer)) + .GetTypes() + .Where(t => typeof(IExternalApi).IsAssignableFrom(t)) + .Where(t => t.IsSealed) + .Where(t => ServiceInjector.IsAvailable(serviceProvider, t))); foreach (var api in apis) { diff --git a/BizHawk.Client.EmuHawk/BizBox.cs b/BizHawk.Client.EmuHawk/BizBox.cs index a233234d1d..9bff885393 100644 --- a/BizHawk.Client.EmuHawk/BizBox.cs +++ b/BizHawk.Client.EmuHawk/BizBox.cs @@ -48,8 +48,7 @@ namespace BizHawk.Client.EmuHawk .Select(t => t.GetCustomAttributes(false).OfType().FirstOrDefault()) .Where(a => a != null) .Where(a => a.Released) - .OrderByDescending(a => a.CoreName.ToLower()) - .ToList(); + .OrderByDescending(a => a.CoreName.ToLower()); foreach (var core in cores) { diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs index 5bab6dc2e7..e9489b93bb 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs @@ -1373,7 +1373,7 @@ namespace BizHawk.Client.EmuHawk { if (SelectedRows.Any() && LetKeysModifySelection && SelectedRows.First() > 0) { - foreach (var row in SelectedRows.ToList()) + foreach (var row in SelectedRows.ToList()) // clones SelectedRows { SelectRow(row - 1, true); SelectRow(row, false); @@ -1384,7 +1384,7 @@ namespace BizHawk.Client.EmuHawk { if (SelectedRows.Any() && LetKeysModifySelection) { - foreach (var row in SelectedRows.Reverse().ToList()) + foreach (var row in SelectedRows.Reverse()) // clones SelectedRows { SelectRow(row + 1, true); SelectRow(row, false); @@ -1695,14 +1695,7 @@ namespace BizHawk.Client.EmuHawk { if (toggle && _selectedItems.Any(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex)) { - var items = _selectedItems - .Where(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex) - .ToList(); - - foreach (var item in items) - { - _selectedItems.Remove(item); - } + _selectedItems.RemoveWhere(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex); } else { @@ -2054,13 +2047,11 @@ namespace BizHawk.Client.EmuHawk { int pos = 0; - var columns = VisibleColumns.ToList(); - - for (int i = 0; i < columns.Count; i++) + foreach (var col in VisibleColumns) { - columns[i].Left = pos; - pos += columns[i].Width.Value; - columns[i].Right = pos; + col.Left = pos; + pos += col.Width.Value; + col.Right = pos; } DoChangeCallback(); diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index 130d640a0f..464ea13f66 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -347,7 +347,10 @@ namespace BizHawk.Client.EmuHawk type = " (on)"; } - Global.CheatList.ToList().ForEach(x => x.Toggle()); + foreach (var x in Global.CheatList) + { + x.Toggle(); + } GlobalWin.OSD.AddMessage($"Cheats toggled{type}"); } diff --git a/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs b/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs index 21ca8bd90f..ba3ae8ba90 100644 --- a/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs +++ b/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs @@ -42,7 +42,7 @@ namespace BizHawk.Client.EmuHawk public static IEnumerable GetDeviceNames() { - return DirectSound.GetDevices().Select(d => d.Description).ToList(); + return DirectSound.GetDevices().Select(d => d.Description); } private int BufferSizeSamples { get; set; } diff --git a/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs b/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs index e5bf4f8dc0..5c37748096 100644 --- a/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs +++ b/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs @@ -49,7 +49,9 @@ namespace BizHawk.Client.EmuHawk { using (XAudio2 device = new XAudio2()) { - return Enumerable.Range(0, device.DeviceCount).Select(n => device.GetDeviceDetails(n).DisplayName).ToList(); + return Enumerable.Range(0, device.DeviceCount) + .Select(n => device.GetDeviceDetails(n).DisplayName) + .ToList(); // enumerate before local var device is disposed } } diff --git a/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs b/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs index 24adc44d21..4713321dc8 100644 --- a/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs +++ b/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs @@ -101,7 +101,7 @@ namespace BizHawk.Client.EmuHawk HotkeyTabControl.TabPages.Clear(); // Buckets - var tabs = Global.Config.HotkeyBindings.Select(x => x.TabGroup).Distinct().ToList(); + var tabs = Global.Config.HotkeyBindings.Select(x => x.TabGroup).Distinct(); foreach (var tab in tabs) { @@ -110,7 +110,7 @@ namespace BizHawk.Client.EmuHawk var tb = new TabPage {Name = tab, Text = tab}; - var bindings = Global.Config.HotkeyBindings.Where(x => x.TabGroup == tab).OrderBy(x => x.Ordinal).ThenBy(x => x.DisplayName).ToList(); + var bindings = Global.Config.HotkeyBindings.Where(x => x.TabGroup == tab).OrderBy(x => x.Ordinal).ThenBy(x => x.DisplayName); int iwOffsetX = UIHelper.ScaleX(110); int iwOffsetY = UIHelper.ScaleY(-4); diff --git a/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs b/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs index b343fe4355..3debf50624 100644 --- a/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs +++ b/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs @@ -64,7 +64,7 @@ namespace BizHawk.Client.EmuHawk typeof(NES.NESSyncSettings.Region), (string)RegionComboBox.SelectedItem); - List oldRam = _syncSettings.InitialWRamStatePattern?.ToList() ?? new List(); + var oldRam = _syncSettings.InitialWRamStatePattern ?? new List(); if (!string.IsNullOrWhiteSpace(RamPatternOverrideBox.Text)) { diff --git a/BizHawk.Client.EmuHawk/config/PathConfig.cs b/BizHawk.Client.EmuHawk/config/PathConfig.cs index b8f438b543..bb3e6e8820 100644 --- a/BizHawk.Client.EmuHawk/config/PathConfig.cs +++ b/BizHawk.Client.EmuHawk/config/PathConfig.cs @@ -114,8 +114,7 @@ namespace BizHawk.Client.EmuHawk var paths = pathCollection .Where(p => p.System == systemId) .OrderBy(p => p.Ordinal) - .ThenBy(p => p.Type) - .ToList(); + .ThenBy(p => p.Type); var y = UIHelper.ScaleY(14); foreach (var path in paths) @@ -243,10 +242,10 @@ namespace BizHawk.Client.EmuHawk private void DoRomToggle() { - AllPathControls - .Where(c => c.Name == "ROM") - .ToList() - .ForEach(control => control.Enabled = !RecentForROMs.Checked); + foreach (var control in AllPathControls.Where(c => c.Name == "ROM")) + { + control.Enabled = !RecentForROMs.Checked; + } } private IEnumerable AllPathBoxes diff --git a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs index 6365304e9f..b99913aeab 100644 --- a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs +++ b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs @@ -306,10 +306,10 @@ namespace BizHawk.Client.EmuHawk { var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop); - filePaths - .Where(path => MovieService.MovieExtensions.Contains(Path.GetExtension(path).Replace(".", ""))) - .ToList() - .ForEach(path => AddMovieToList(path, force: true)); + foreach (var path in filePaths.Where(path => MovieService.MovieExtensions.Contains(Path.GetExtension(path).Replace(".", "")))) + { + AddMovieToList(path, force: true); + } RefreshMovieList(); } @@ -468,11 +468,11 @@ namespace BizHawk.Client.EmuHawk private void EditMenuItem_Click(object sender, EventArgs e) { - MovieView.SelectedIndices - .Cast() - .Select(index => _movieList[index]) - .ToList() - .ForEach(movie => System.Diagnostics.Process.Start(movie.Filename)); + foreach (var movie in MovieView.SelectedIndices.Cast() + .Select(index => _movieList[index])) + { + System.Diagnostics.Process.Start(movie.Filename); + } } #endregion diff --git a/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs index 5f32d9ecc4..9c3361cdaa 100644 --- a/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs +++ b/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs @@ -449,10 +449,10 @@ namespace BizHawk.Client.EmuHawk CurrentFileName = ""; _bestBotAttempt = null; - ControlProbabilityPanel.Controls - .OfType() - .ToList() - .ForEach(cp => cp.Probability = 0); + foreach (var cp in ControlProbabilityPanel.Controls.OfType()) + { + cp.Probability = 0; + } FrameLength = 0; MaximizeAddress = 0; diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index cbc8cd2efe..ef614a8e74 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -486,7 +486,7 @@ namespace BizHawk.Client.EmuHawk Global.CheatList.Insert(index - 1, cheat); } - var newindices = indices.Select(t => t - 1).ToList(); + var newindices = indices.Select(t => t - 1); CheatListView.SelectedIndices.Clear(); foreach (var newi in newindices) @@ -515,7 +515,7 @@ namespace BizHawk.Client.EmuHawk UpdateMessageLabel(); - var newindices = indices.Select(t => t + 1).ToList(); + var newindices = indices.Select(t => t + 1); CheatListView.SelectedIndices.Clear(); foreach (var newi in newindices) @@ -533,7 +533,10 @@ namespace BizHawk.Client.EmuHawk private void ToggleMenuItem_Click(object sender, EventArgs e) { - SelectedCheats.ToList().ForEach(x => x.Toggle()); + foreach (var x in SelectedCheats) + { + x.Toggle(); + } CheatListView.Refresh(); } diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/RegisterBoxControl.cs b/BizHawk.Client.EmuHawk/tools/Debugger/RegisterBoxControl.cs index 9f6d273e8f..83dba6a59b 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/RegisterBoxControl.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/RegisterBoxControl.cs @@ -41,46 +41,37 @@ namespace BizHawk.Client.EmuHawk { if (Controls.OfType().Any(p => p.Name == "FlagPanel")) { - Controls - .OfType() + foreach (var checkbox in Controls.OfType() .First(p => p.Name == "FlagPanel") .Controls - .OfType() - .ToList() - .ForEach(checkbox => + .OfType()) + { + if (checkbox.Name == register.Key) { - if (checkbox.Name == register.Key) - { - checkbox.Checked = register.Value.Value == 1; - } - }); + checkbox.Checked = register.Value.Value == 1; + } + } } if (_canSetCpuRegisters) { - Controls - .OfType() - .ToList() - .ForEach(textbox => + foreach (var textbox in Controls.OfType()) + { + if (textbox.Name == register.Key) { - if (textbox.Name == register.Key) - { - textbox.Text = register.Value.Value.ToHexString(register.Value.BitSize / 4); - } - }); + textbox.Text = register.Value.Value.ToHexString(register.Value.BitSize / 4); + } + } } else { - Controls - .OfType