mirror of
https://github.com/goatcorp/Dalamud.git
synced 2026-01-03 06:13:40 +01:00
Fix CA1862: Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
This commit is contained in:
parent
e34c480290
commit
58aeb11268
5 changed files with 6 additions and 6 deletions
|
|
@ -159,7 +159,7 @@ public abstract class Hook<T> : IDalamudHook where T : Delegate
|
||||||
(int)Math.Min(pDataDirectory->Size + pDataDirectory->VirtualAddress - importDescriptor.Name, moduleNameLowerWithNullTerminator.Length));
|
(int)Math.Min(pDataDirectory->Size + pDataDirectory->VirtualAddress - importDescriptor.Name, moduleNameLowerWithNullTerminator.Length));
|
||||||
|
|
||||||
// Is this entry about the DLL that we're looking for? (Case insensitive)
|
// Is this entry about the DLL that we're looking for? (Case insensitive)
|
||||||
if (currentDllNameWithNullTerminator.ToLowerInvariant() != moduleNameLowerWithNullTerminator)
|
if (!currentDllNameWithNullTerminator.Equals(moduleNameLowerWithNullTerminator, StringComparison.InvariantCultureIgnoreCase))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (isPe64)
|
if (isPe64)
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ public static class FontAwesomeHelpers
|
||||||
{
|
{
|
||||||
var name = Enum.GetName(icon)?.ToLowerInvariant();
|
var name = Enum.GetName(icon)?.ToLowerInvariant();
|
||||||
var searchTerms = icon.GetSearchTerms();
|
var searchTerms = icon.GetSearchTerms();
|
||||||
if (name!.Contains(search.ToLowerInvariant()) || searchTerms.Contains(search.ToLowerInvariant()))
|
if (name!.Contains(search, StringComparison.InvariantCultureIgnoreCase) || searchTerms.Contains(search.ToLowerInvariant()))
|
||||||
{
|
{
|
||||||
result.Add(icon);
|
result.Add(icon);
|
||||||
}
|
}
|
||||||
|
|
@ -98,7 +98,7 @@ public static class FontAwesomeHelpers
|
||||||
var name = Enum.GetName(icon)?.ToLowerInvariant();
|
var name = Enum.GetName(icon)?.ToLowerInvariant();
|
||||||
var searchTerms = icon.GetSearchTerms();
|
var searchTerms = icon.GetSearchTerms();
|
||||||
var categories = icon.GetCategories();
|
var categories = icon.GetCategories();
|
||||||
if ((name!.Contains(search.ToLowerInvariant()) || searchTerms.Contains(search.ToLowerInvariant())) && categories.Contains(category))
|
if ((name!.Contains(search, StringComparison.InvariantCultureIgnoreCase) || searchTerms.Contains(search.ToLowerInvariant())) && categories.Contains(category))
|
||||||
{
|
{
|
||||||
result.Add(icon);
|
result.Add(icon);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ public partial class FileDialog
|
||||||
foreach (var file in this.files)
|
foreach (var file in this.files)
|
||||||
{
|
{
|
||||||
var show = true;
|
var show = true;
|
||||||
if (!string.IsNullOrEmpty(this.searchBuffer) && !file.FileName.ToLowerInvariant().Contains(this.searchBuffer.ToLowerInvariant()))
|
if (!string.IsNullOrEmpty(this.searchBuffer) && !file.FileName.Contains(this.searchBuffer, StringComparison.InvariantCultureIgnoreCase))
|
||||||
{
|
{
|
||||||
show = false;
|
show = false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -326,7 +326,7 @@ internal class DalamudCommands : IServiceType
|
||||||
var configuration = Service<DalamudConfiguration>.Get();
|
var configuration = Service<DalamudConfiguration>.Get();
|
||||||
var localization = Service<Localization>.Get();
|
var localization = Service<Localization>.Get();
|
||||||
|
|
||||||
if (Localization.ApplicableLangCodes.Contains(arguments.ToLowerInvariant()) || arguments.ToLowerInvariant() == "en")
|
if (Localization.ApplicableLangCodes.Contains(arguments.ToLowerInvariant()) || arguments.Equals("en", StringComparison.InvariantCultureIgnoreCase))
|
||||||
{
|
{
|
||||||
localization.SetupWithLangCode(arguments.ToLowerInvariant());
|
localization.SetupWithLangCode(arguments.ToLowerInvariant());
|
||||||
configuration.LanguageOverride = arguments.ToLowerInvariant();
|
configuration.LanguageOverride = arguments.ToLowerInvariant();
|
||||||
|
|
|
||||||
|
|
@ -557,7 +557,7 @@ internal unsafe class UiDebug
|
||||||
var name = unitBase->NameString;
|
var name = unitBase->NameString;
|
||||||
if (searching)
|
if (searching)
|
||||||
{
|
{
|
||||||
if (name == null || !name.ToLowerInvariant().Contains(searchStr.ToLowerInvariant())) continue;
|
if (name == null || !name.Contains(searchStr, StringComparison.InvariantCultureIgnoreCase)) continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
noResults = false;
|
noResults = false;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue