From 865ff36262db2bd3fb016836dbb564e9b427c9c7 Mon Sep 17 00:00:00 2001 From: Kazuhiro Fujieda Date: Thu, 23 Aug 2018 20:12:35 +0900 Subject: [PATCH] =?utf8?q?ReSharper=E3=81=AE=E6=8C=87=E6=91=98=E3=81=AB?= =?utf8?q?=E5=BE=93=E3=81=84=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=A1=E3=82=BD?= =?utf8?q?=E3=83=83=E3=83=89=E7=AD=89=E3=82=92=E6=B6=88=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KancolleSniffer/Logger.cs | 8 -------- KancolleSniffer/MainForm.cs | 7 ------- KancolleSniffer/Model/ExMapInfo.cs | 1 + KancolleSniffer/Model/Inventry.cs | 1 + KancolleSniffer/Model/ItemInfo.cs | 5 ----- KancolleSniffer/Model/ItemSpec.cs | 3 --- KancolleSniffer/Model/MissionInfo.cs | 2 -- KancolleSniffer/Model/QuestInfo.cs | 2 +- KancolleSniffer/Model/ShipMaster.cs | 1 - KancolleSniffer/Model/ShipSpec.cs | 1 - KancolleSniffer/Net/SystemProxy.cs | 12 +++++++++--- KancolleSniffer/Util/JsonParser.cs | 5 +---- 12 files changed, 13 insertions(+), 35 deletions(-) diff --git a/KancolleSniffer/Logger.cs b/KancolleSniffer/Logger.cs index 341b8a0..08f0fe7 100644 --- a/KancolleSniffer/Logger.cs +++ b/KancolleSniffer/Logger.cs @@ -638,14 +638,6 @@ namespace KancolleSniffer public class LogIOException : Exception { - public LogIOException() - { - } - - public LogIOException(string message) : base(message) - { - } - public LogIOException(string message, Exception inner) : base(message, inner) { } diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs index ff995be..b3605f5 100644 --- a/KancolleSniffer/MainForm.cs +++ b/KancolleSniffer/MainForm.cs @@ -167,13 +167,6 @@ namespace KancolleSniffer public void Resume() => _manager.ResumeRepeat(); } - public class ConfigFileException : Exception - { - public ConfigFileException(string message, Exception innerException) : base(message, innerException) - { - } - } - private void HttpProxy_AfterSessionComplete(HttpProxy.Session session) { BeginInvoke(new Action(ProcessRequest), session); diff --git a/KancolleSniffer/Model/ExMapInfo.cs b/KancolleSniffer/Model/ExMapInfo.cs index abaf95a..782973a 100644 --- a/KancolleSniffer/Model/ExMapInfo.cs +++ b/KancolleSniffer/Model/ExMapInfo.cs @@ -107,6 +107,7 @@ namespace KancolleSniffer.Model } // テスト用 + // ReSharper disable once UnusedMember.Global public void ClearClearStatus() { _clearStatus.Clear(); diff --git a/KancolleSniffer/Model/Inventry.cs b/KancolleSniffer/Model/Inventry.cs index 90d79b1..b5efdf0 100644 --- a/KancolleSniffer/Model/Inventry.cs +++ b/KancolleSniffer/Model/Inventry.cs @@ -105,6 +105,7 @@ namespace KancolleSniffer.Model public bool Contains(int id) => _dict.ContainsKey(id); + // ReSharper disable once UnusedMember.Global public bool Contains(T item) => Contains(GetId(item)); public IEnumerable AllItems => diff --git a/KancolleSniffer/Model/ItemInfo.cs b/KancolleSniffer/Model/ItemInfo.cs index 237cead..f014e4a 100644 --- a/KancolleSniffer/Model/ItemInfo.cs +++ b/KancolleSniffer/Model/ItemInfo.cs @@ -88,11 +88,6 @@ namespace KancolleSniffer.Model DeleteItems((int[])json.api_use_slot_id); } - public void DeleteItems(IEnumerable items) - { - DeleteItems(items.Select(item => item.Id)); - } - private void DeleteItems(IEnumerable ids) { _itemInventry.Remove(ids); diff --git a/KancolleSniffer/Model/ItemSpec.cs b/KancolleSniffer/Model/ItemSpec.cs index 95c5196..d1bc3a8 100644 --- a/KancolleSniffer/Model/ItemSpec.cs +++ b/KancolleSniffer/Model/ItemSpec.cs @@ -19,7 +19,6 @@ namespace KancolleSniffer.Model { public class ItemSpec { - public static bool IncreaceLandPowerTp = false; public int Id; public bool Empty => Id == -1; public string Name; @@ -139,8 +138,6 @@ namespace KancolleSniffer.Model public bool IsRepairFacility => Type == 31; - public bool IsAntiAirGun => Type == 21; - public bool IsDrum => Id == 75; public double ContactTriggerRate diff --git a/KancolleSniffer/Model/MissionInfo.cs b/KancolleSniffer/Model/MissionInfo.cs index 4ec81bb..ab9d803 100644 --- a/KancolleSniffer/Model/MissionInfo.cs +++ b/KancolleSniffer/Model/MissionInfo.cs @@ -54,7 +54,5 @@ namespace KancolleSniffer.Model } public NameAndTimer[] Missions => _missions; - - public bool InMission(int fleet) => fleet != 0 && _missions[fleet - 1].Name != ""; } } \ No newline at end of file diff --git a/KancolleSniffer/Model/QuestInfo.cs b/KancolleSniffer/Model/QuestInfo.cs index 79dba45..cae1a3b 100644 --- a/KancolleSniffer/Model/QuestInfo.cs +++ b/KancolleSniffer/Model/QuestInfo.cs @@ -50,6 +50,7 @@ namespace KancolleSniffer.Model public enum QuestInterval { + // ReSharper disable once UnusedMember.Global Other, Daily, Weekly, @@ -71,7 +72,6 @@ namespace KancolleSniffer.Model { public string Rank { get; set; } public int[] Maps { get; set; } - public int[] ShipTypes { get; set; } public static int CompareRank(string a, string b) { diff --git a/KancolleSniffer/Model/ShipMaster.cs b/KancolleSniffer/Model/ShipMaster.cs index 30096b3..d1dc0ad 100644 --- a/KancolleSniffer/Model/ShipMaster.cs +++ b/KancolleSniffer/Model/ShipMaster.cs @@ -19,7 +19,6 @@ namespace KancolleSniffer.Model { public class ShipMaster { - public const int NumSlots = 5; private readonly Dictionary _shipSpecs = new Dictionary(); public AdditionalData AdditionalData { get; set; } diff --git a/KancolleSniffer/Model/ShipSpec.cs b/KancolleSniffer/Model/ShipSpec.cs index 6277f26..fd44535 100644 --- a/KancolleSniffer/Model/ShipSpec.cs +++ b/KancolleSniffer/Model/ShipSpec.cs @@ -19,7 +19,6 @@ namespace KancolleSniffer.Model public class ShipSpec { public int Id { get; set; } - public bool IsEnemy => ShipMaster.IsEnemyId(Id); public int SortId { get; set; } public string Name { get; set; } public int FuelMax { get; set; } diff --git a/KancolleSniffer/Net/SystemProxy.cs b/KancolleSniffer/Net/SystemProxy.cs index 589d848..b8e9e99 100644 --- a/KancolleSniffer/Net/SystemProxy.cs +++ b/KancolleSniffer/Net/SystemProxy.cs @@ -173,12 +173,15 @@ namespace KancolleSniffer.Net [FieldOffset(0)] public FILETIME ftValue; } -// ReSharper disable UnusedMember.Local -// ReSharper disable InconsistentNaming - + // ReSharper disable UnusedMember.Global + // ReSharper disable UnusedMember.Local + // ReSharper disable InconsistentNaming + // ReSharper disable IdentifierTypo private enum InternetOption : uint { + INTERNET_OPTION_REFRESH = 0x00000025, + INTERNET_OPTION_SETTINGS_CHANGED = 0x00000027, INTERNET_OPTION_PER_CONNECTION_OPTION = 0x0000004B, INTERNET_OPTION_PROXY_SETTINGS_CHANGED = 0x0000005F @@ -186,10 +189,13 @@ namespace KancolleSniffer.Net private enum PerConnOption { + INTERNET_PER_CONN_FLAGS = 1, + INTERNET_PER_CONN_PROXY_SERVER = 2, INTERNET_PER_CONN_PROXY_BYPASS = 3, INTERNET_PER_CONN_AUTOCONFIG_URL = 4, + INTERNET_PER_CONN_AUTODISCOVERY_FLAGS = 5 } diff --git a/KancolleSniffer/Util/JsonParser.cs b/KancolleSniffer/Util/JsonParser.cs index 362e8ea..7976fa7 100644 --- a/KancolleSniffer/Util/JsonParser.cs +++ b/KancolleSniffer/Util/JsonParser.cs @@ -255,6 +255,7 @@ namespace KancolleSniffer.Util public bool IsArray => _type == JsonType.Array; public bool IsObject => _type == JsonType.Object; + // ReSharper disable once UnusedMember.Global public bool IsDefined(string attr) => IsObject && _dict.Contains(attr); public JsonObject(bool b) @@ -544,10 +545,6 @@ namespace KancolleSniffer.Util public class JsonParserException : Exception { - public JsonParserException() - { - } - public JsonParserException(string message) : base(message) { } -- 2.11.0