diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 61ec0e85bb..12d520eb49 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -1287,9 +1287,7 @@ namespace BizHawk.Client.EmuHawk if (column.Name.StartsWith("Key ")) { - keysMenus - .Where(m => m.DropDownItems.Count < maxRows) - .FirstOrDefault() + keysMenus.FirstOrDefault(m => m.DropDownItems.Count < maxRows) .DropDownItems .Add(menuItem); } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs index 5b81afb644..e0873e15e0 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs @@ -82,13 +82,9 @@ namespace BizHawk.Client.EmuHawk var schemaType = Assembly .GetExecutingAssembly() .GetTypes() - .Where(t => typeof(IVirtualPadSchema) - .IsAssignableFrom(t) && t.GetCustomAttributes(false) - .OfType() - .Any()) - .FirstOrDefault(t => t.GetCustomAttributes(false) - .OfType() - .First().SystemId == Emulator.SystemId); + .FirstOrDefault(t => typeof(IVirtualPadSchema).IsAssignableFrom(t) + && t.GetCustomAttributes(false).OfType().Any() + && t.GetCustomAttributes(false).OfType().First().SystemId == Emulator.SystemId); if (schemaType != null) { diff --git a/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs b/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs index 32ba4651e5..ad6f7f8aa5 100644 --- a/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs +++ b/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs @@ -387,15 +387,7 @@ namespace BizHawk.Emulation.Common public string ConfigKey => $"{SystemId}+{FirmwareId}"; } - public static FirmwareRecord LookupFirmwareRecord(string sysId, string firmwareId) - { - var found = - from fr in FirmwareRecords - where fr.FirmwareId == firmwareId - && fr.SystemId == sysId - select fr; - - return found.FirstOrDefault(); - } + public static FirmwareRecord LookupFirmwareRecord(string sysId, string firmwareId) => + FirmwareRecords.FirstOrDefault(fr => fr.FirmwareId == firmwareId && fr.SystemId == sysId); } // static class FirmwareDatabase } diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs index 7a05d74377..6ae2b1b40e 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs @@ -397,7 +397,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC var mtc = maxTransferCap; // get the current track - var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault(); + var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID); if (track == null || track.NumberOfSectors <= 0) { @@ -704,7 +704,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } // get the current track - var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault(); + var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID); if (track == null || track.NumberOfSectors <= 0) { @@ -1017,7 +1017,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } // get the current track - var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault(); + var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID); if (track == null || track.NumberOfSectors <= 0) { @@ -1209,7 +1209,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC break; } - var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault(); + var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID); if (track != null && track.NumberOfSectors > 0 && track.TrackNumber != 0xff) { @@ -2543,7 +2543,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC cmdByte = cByte; // lookup the command - var cmd = CommandList.Where(a => a.CommandCode == cmdByte).FirstOrDefault(); + var cmd = CommandList.FirstOrDefault(a => a.CommandCode == cmdByte); if (cmd == null) { diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs index b31e49f599..dd76d620f3 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs @@ -397,7 +397,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } // get the current track - var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault(); + var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID); if (track == null || track.NumberOfSectors <= 0) { @@ -704,7 +704,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } // get the current track - var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault(); + var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID); if (track == null || track.NumberOfSectors <= 0) { @@ -1017,7 +1017,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } // get the current track - var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault(); + var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID); if (track == null || track.NumberOfSectors <= 0) { @@ -1209,7 +1209,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum break; } - var track = ActiveDrive.Disk.DiskTracks.Where(a => a.TrackNumber == ActiveDrive.CurrentTrackID).FirstOrDefault(); + var track = ActiveDrive.Disk.DiskTracks.FirstOrDefault(a => a.TrackNumber == ActiveDrive.CurrentTrackID); if (track != null && track.NumberOfSectors > 0 && track.TrackNumber != 0xff) { @@ -2550,7 +2550,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum cmdByte = cByte; // lookup the command - var cmd = CommandList.Where(a => a.CommandCode == cmdByte).FirstOrDefault(); + var cmd = CommandList.FirstOrDefault(a => a.CommandCode == cmdByte); if (cmd == null) { diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs index 2b6ec8ed15..baa6f1aa61 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs @@ -327,10 +327,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// /// - protected IJoystick LocateUniqueJoystick(JoystickType type) - { - return JoystickCollection.Where(a => a.JoyType == type).FirstOrDefault(); - } + protected IJoystick LocateUniqueJoystick(JoystickType type) => JoystickCollection.FirstOrDefault(a => a.JoyType == type); /// /// Signs whether input read has been requested diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs index bff98bad32..0f4d400972 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs @@ -64,7 +64,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } // now process the blocks - var infoBlock = blocks.Where(a => a.RecordType == RecordHeaderType.INFO).FirstOrDefault(); + var infoBlock = blocks.FirstOrDefault(a => a.RecordType == RecordHeaderType.INFO); var IMGEblocks = blocks.Where(a => a.RecordType == RecordHeaderType.IMGE).ToList(); var DATAblocks = blocks.Where(a => a.RecordType == RecordHeaderType.DATA).ToList(); @@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum var trk = DiskTracks[t]; var blockCount = img.IMGEblockCount; - var dataBlock = DATAblocks.Where(a => a.DATAdataKey == img.IMGEdataKey).FirstOrDefault(); + var dataBlock = DATAblocks.FirstOrDefault(a => a.DATAdataKey == img.IMGEdataKey); trk.SideNumber = (byte)img.IMGEside; trk.TrackNumber = (byte)img.IMGEtrack; diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs index 38464f9c34..8d98733a96 100644 --- a/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs +++ b/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs @@ -728,7 +728,7 @@ namespace BizHawk.Emulation.DiscSystem { int relMSF = -1; - var track = mdsf.TOCEntries.Where(t => t.Point == i).FirstOrDefault(); + var track = mdsf.TOCEntries.FirstOrDefault(t => t.Point == i); if (track == null) break; @@ -743,9 +743,7 @@ namespace BizHawk.Emulation.DiscSystem // get the blob(s) for this track // its probably a safe assumption that there will be only one blob per track, // but i'm still not 100% sure on this - var tr = (from a in mdsf.TOCEntries - where a.Point == i - select a).FirstOrDefault(); + var tr = mdsf.TOCEntries.FirstOrDefault(a => a.Point == i); if (tr == null) throw new MDSParseException("BLOB Error!"); diff --git a/BizHawk.Emulation.DiscSystem/DiscIdentifier.cs b/BizHawk.Emulation.DiscSystem/DiscIdentifier.cs index b15f68c8f7..a3c9792145 100644 --- a/BizHawk.Emulation.DiscSystem/DiscIdentifier.cs +++ b/BizHawk.Emulation.DiscSystem/DiscIdentifier.cs @@ -186,7 +186,7 @@ namespace BizHawk.Emulation.DiscSystem if (appId == "PSP GAME") return DiscType.SonyPSP; // in case the appId is not set correctly... - if (iso.Root.Children.Where(a => a.Key == "PSP_GAME").FirstOrDefault().Value as ISODirectoryNode != null) + if (iso.Root.Children.FirstOrDefault(a => a.Key == "PSP_GAME").Value as ISODirectoryNode != null) return DiscType.SonyPSP; if (sysId == "SEGA SEGASATURN")