swiftline 'variable_name'のエラーを修正

diff --git a/.swiftlint.yml b/.swiftlint.yml
index 57a78c6..1c72d0a 100644 (file)
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -1,6 +1,5 @@
 
 disabled_rules:
-    - variable_name
     - leading_whitespace
     - vertical_whitespace
     - cyclomatic_complexity

diff --git a/KCD/AirBase.swift b/KCD/AirBase.swift
index 5d54d5e..e2c045e 100644 (file)
--- a/KCD/AirBase.swift
+++ b/KCD/AirBase.swift
@@ -11,8 +11,8 @@ import Foundation
 class AirBase: KCManagedObject {
     @NSManaged var rid: Int
     @NSManaged var name: String
-    @NSManaged var area_id: Int
+    @NSManaged var area_id: Int // swiftlint:disable:this variable_name
     @NSManaged var distance: Int
-    @NSManaged var action_kind: Int
+    @NSManaged var action_kind: Int // swiftlint:disable:this variable_name
     @NSManaged var planeInfo: NSOrderedSet
 }

diff --git a/KCD/AirBasePlaneInfo.swift b/KCD/AirBasePlaneInfo.swift
index c0d2a82..69d5009 100644 (file)
--- a/KCD/AirBasePlaneInfo.swift
+++ b/KCD/AirBasePlaneInfo.swift
@@ -10,11 +10,11 @@ import Foundation
 import CoreData
 
 class AirBasePlaneInfo: KCManagedObject {
-    @NSManaged var squadron_id: Int
+    @NSManaged var squadron_id: Int // swiftlint:disable:this variable_name
     @NSManaged var state: Int
     @NSManaged var slotid: Int
     @NSManaged var cond: Int
     @NSManaged var count: Int
-    @NSManaged var max_count: Int
+    @NSManaged var max_count: Int   // swiftlint:disable:this variable_name
     @NSManaged var airBase: AirBase
 }

diff --git a/KCD/ArrayExtensions.swift b/KCD/ArrayExtensions.swift
index be52fb4..f965657 100644 (file)
--- a/KCD/ArrayExtensions.swift
+++ b/KCD/ArrayExtensions.swift
@@ -27,8 +27,8 @@ extension Array where Element: Hashable {
 }
 
 extension Array {
-    func appended(_ f: () -> Element) -> Array {
-        return self + [f()]
+    func appended(_ elem: () -> Element) -> Array {
+        return self + [elem()]
     }
 }
 

diff --git a/KCD/Basic.swift b/KCD/Basic.swift
index 1ee0dbc..dcb7bf8 100644 (file)
--- a/KCD/Basic.swift
+++ b/KCD/Basic.swift
@@ -9,45 +9,45 @@
 import Foundation
 
 class Basic: KCManagedObject {
-    @NSManaged var active_flag: NSNumber?
+    @NSManaged var active_flag: NSNumber?   // swiftlint:disable:this variable_name
     @NSManaged var comment: String?
-    @NSManaged var comment_id: NSNumber?
-    @NSManaged var count_deck: Int
-    @NSManaged var count_kdock: Int
-    @NSManaged var count_ndock: Int
+    @NSManaged var comment_id: NSNumber?    // swiftlint:disable:this variable_name
+    @NSManaged var count_deck: Int  // swiftlint:disable:this variable_name
+    @NSManaged var count_kdock: Int // swiftlint:disable:this variable_name
+    @NSManaged var count_ndock: Int // swiftlint:disable:this variable_name
     @NSManaged var experience: Int
     @NSManaged var fcoin: Int
     @NSManaged var firstflag: NSNumber?
     @NSManaged var fleetname: String?
-    @NSManaged var furniture_0: NSNumber?
-    @NSManaged var furniture_1: NSNumber?
-    @NSManaged var furniture_2: NSNumber?
-    @NSManaged var furniture_3: NSNumber?
-    @NSManaged var furniture_4: NSNumber?
-    @NSManaged var furniture_5: NSNumber?
-    @NSManaged var furniture_6: NSNumber?
-    @NSManaged var large_Dock: Int
+    @NSManaged var furniture_0: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var furniture_1: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var furniture_2: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var furniture_3: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var furniture_4: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var furniture_5: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var furniture_6: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var large_Dock: Int  // swiftlint:disable:this variable_name
     @NSManaged var level: Int
-    @NSManaged var max_chara: Int
-    @NSManaged var max_kagu: Int
-    @NSManaged var max_slotitem: Int
+    @NSManaged var max_chara: Int   // swiftlint:disable:this variable_name
+    @NSManaged var max_kagu: Int    // swiftlint:disable:this variable_name
+    @NSManaged var max_slotitem: Int    // swiftlint:disable:this variable_name
     @NSManaged var medals: Int
-    @NSManaged var member_id: NSNumber?
-    @NSManaged var ms_count: NSNumber?
-    @NSManaged var ms_success: NSNumber?
+    @NSManaged var member_id: NSNumber? // swiftlint:disable:this variable_name
+    @NSManaged var ms_count: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged var ms_success: NSNumber?    // swiftlint:disable:this variable_name
     @NSManaged var nickname: String
-    @NSManaged var nickname_id: NSNumber?
+    @NSManaged var nickname_id: NSNumber?   // swiftlint:disable:this variable_name
     @NSManaged var playtime: Int
-    @NSManaged var pt_challenged: NSNumber?
-    @NSManaged var pt_challenged_win: NSNumber?
-    @NSManaged var pt_lose: NSNumber?
-    @NSManaged var pt_win: NSNumber?
-    @NSManaged var pvp_0: NSNumber?
-    @NSManaged var pvp_1: NSNumber?
+    @NSManaged var pt_challenged: NSNumber? // swiftlint:disable:this variable_name
+    @NSManaged var pt_challenged_win: NSNumber? // swiftlint:disable:this variable_name
+    @NSManaged var pt_lose: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var pt_win: NSNumber?    // swiftlint:disable:this variable_name
+    @NSManaged var pvp_0: NSNumber? // swiftlint:disable:this variable_name
+    @NSManaged var pvp_1: NSNumber? // swiftlint:disable:this variable_name
     @NSManaged var rank: Int
-    @NSManaged var st_lose: NSNumber?
-    @NSManaged var st_win: NSNumber?
+    @NSManaged var st_lose: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var st_win: NSNumber?    // swiftlint:disable:this variable_name
     @NSManaged var starttime: Int
     @NSManaged var tutorial: NSNumber?
-    @NSManaged var tutorial_progress: NSNumber?
+    @NSManaged var tutorial_progress: NSNumber? // swiftlint:disable:this variable_name
 }

diff --git a/KCD/BroserWindowController.swift b/KCD/BroserWindowController.swift
index 75f7693..657d873 100644 (file)
--- a/KCD/BroserWindowController.swift
+++ b/KCD/BroserWindowController.swift
@@ -122,7 +122,7 @@ class BroserWindowController: NSWindowController {
         NotificationCenter.default
             .addObserver(forName: .CombinedDidCange, object: nil, queue: nil) { (notification) in
                 guard UserDefaults.standard.autoCombinedView,
-                    let type = notification.userInfo?[CombinedType] as? CombineType
+                    let type = notification.userInfo?[CombinedCommand.userInfoKey] as? CombineType
                     else { return }
                 if !Thread.isMainThread { Thread.sleep(forTimeInterval: 0.1) }
                 DispatchQueue.main.async {

diff --git a/KCD/ChangeHenseiCommand.swift b/KCD/ChangeHenseiCommand.swift
index d7b6bd6..fd9fdc7 100644 (file)
--- a/KCD/ChangeHenseiCommand.swift
+++ b/KCD/ChangeHenseiCommand.swift
@@ -18,7 +18,6 @@ enum ChangeHenseiType: Int {
 extension Notification.Name {
     static let HenseiDidChange = Notification.Name("com.masakih.KCD.Notification.HenseiDidChange")
 }
-let HenseiDidChangeUserInfoKey = "HenseiDidChangeUserInfoKey"
 
 class HenseiDidChangeUserInfo: NSObject {
     let type: ChangeHenseiType
@@ -55,7 +54,7 @@ class HenseiDidChangeUserInfo: NSObject {
 }
 
 class ChangeHenseiCommand: JSONCommand {
-    static let userInfoKey = HenseiDidChangeUserInfoKey
+    static let userInfoKey = "HenseiDidChangeUserInfoKey"
     
     override class func canExecuteAPI(_ api: String) -> Bool {
         if api == "/kcsapi/api_req_hensei/change" { return true }
@@ -186,6 +185,6 @@ class ChangeHenseiCommand: JSONCommand {
         NotificationCenter.default
             .post(name: .HenseiDidChange,
                   object: self,
-                  userInfo: [HenseiDidChangeUserInfoKey: userInfo])
+                  userInfo: [ChangeHenseiCommand.userInfoKey: userInfo])
     }
 }

diff --git a/KCD/CombinedCommand.swift b/KCD/CombinedCommand.swift
index bd6fcb6..a364275 100644 (file)
--- a/KCD/CombinedCommand.swift
+++ b/KCD/CombinedCommand.swift
@@ -18,9 +18,9 @@ enum CombineType: Int {
 extension Notification.Name {
     static let CombinedDidCange = Notification.Name("com.masakih.KCD.Notification.CombinedDidCange")
 }
-let CombinedType = "com.masakih.KCD.Notification.CombinedDidCange.CombinedType"
 
 class CombinedCommand: JSONCommand {
+    static let userInfoKey = "com.masakih.KCD.Notification.CombinedDidCange.CombinedType"
     override class func canExecuteAPI(_ api: String) -> Bool {
         if api == "/kcsapi/api_req_hensei/combined" { return true }
         return false
@@ -45,7 +45,7 @@ class CombinedCommand: JSONCommand {
     }
     
     private func postNotification(withType type: CombineType) {
-        let userInfo = [CombinedType: type]
+        let userInfo = [CombinedCommand.userInfoKey: type]
         NotificationCenter
             .default
             .post(name: .CombinedDidCange, object: self, userInfo: userInfo)

diff --git a/KCD/Deck.swift b/KCD/Deck.swift
index daebe51..25b0ee0 100644 (file)
--- a/KCD/Deck.swift
+++ b/KCD/Deck.swift
@@ -11,19 +11,19 @@ import Cocoa
 class Deck: KCManagedObject {
     @NSManaged var flagship: NSNumber?
     @NSManaged var id: Int
-    @NSManaged var member_id: NSNumber?
-    @NSManaged var mission_0: Int
-    @NSManaged var mission_1: Int
-    @NSManaged var mission_2: Int
-    @NSManaged var mission_3: Int
-    @NSManaged var name: String
-    @NSManaged var name_id: NSNumber?
-    @NSManaged var ship_0: Int
-    @NSManaged var ship_1: Int
-    @NSManaged var ship_2: Int
-    @NSManaged var ship_3: Int
-    @NSManaged var ship_4: Int
-    @NSManaged var ship_5: Int
+    @NSManaged var member_id: NSNumber? // swiftlint:disable:this variable_name
+    @NSManaged var mission_0: Int   // swiftlint:disable:this variable_name
+    @NSManaged var mission_1: Int   // swiftlint:disable:this variable_name
+    @NSManaged var mission_2: Int   // swiftlint:disable:this variable_name
+    @NSManaged var mission_3: Int   // swiftlint:disable:this variable_name
+    @NSManaged var name: String // swiftlint:disable:this variable_name
+    @NSManaged var name_id: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var ship_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged var ship_1: Int  // swiftlint:disable:this variable_name
+    @NSManaged var ship_2: Int  // swiftlint:disable:this variable_name
+    @NSManaged var ship_3: Int  // swiftlint:disable:this variable_name
+    @NSManaged var ship_4: Int  // swiftlint:disable:this variable_name
+    @NSManaged var ship_5: Int  // swiftlint:disable:this variable_name
 }
 
 extension Deck {

diff --git a/KCD/Fleet.swift b/KCD/Fleet.swift
index c5d3850..c21bab5 100644 (file)
--- a/KCD/Fleet.swift
+++ b/KCD/Fleet.swift
@@ -8,7 +8,7 @@
 
 import Cocoa
 
-fileprivate var DeckContext = 0
+fileprivate var pDeckContext = 0
 
 class Fleet: NSObject {
     let fleetNumber: Int
@@ -41,7 +41,7 @@ class Fleet: NSObject {
             return nil
         }
         deck = deckController.content as? Deck
-        deckObserveKeys.forEach { deckController.addObserver(self, forKeyPath: $0, context: &DeckContext) }
+        deckObserveKeys.forEach { deckController.addObserver(self, forKeyPath: $0, context: &pDeckContext) }
     }
     deinit {
         deckObserveKeys.forEach { deckController.removeObserver(self, forKeyPath: $0) }
@@ -63,7 +63,7 @@ class Fleet: NSObject {
     subscript(_ index: Int) -> Ship? { return deck?[index] }
     
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-        if context == &DeckContext {
+        if context == &pDeckContext {
             ships = (0..<6).flatMap { return self[$0] }
             return
         }

diff --git a/KCD/Graphics.swift b/KCD/Graphics.swift
index 70ad92e..b601d82 100644 (file)
--- a/KCD/Graphics.swift
+++ b/KCD/Graphics.swift
@@ -8,8 +8,8 @@
 
 import Cocoa
 
-func polygon(_ f: () -> [NSPoint]) -> NSBezierPath? {
-    let points = f()
+func polygon(_ point: () -> [NSPoint]) -> NSBezierPath? {
+    let points = point()
     let count = points.count
     guard count > 2 else { return nil }
     let path = NSBezierPath()
@@ -19,8 +19,8 @@ func polygon(_ f: () -> [NSPoint]) -> NSBezierPath? {
     
     return path
 }
-func polyline(_ f: () -> [NSPoint]) -> NSBezierPath? {
-    let points = f()
+func polyline(_ point: () -> [NSPoint]) -> NSBezierPath? {
+    let points = point()
     let count = points.count
     guard count > 1 else { return nil }
     let path = NSBezierPath()
@@ -29,9 +29,9 @@ func polyline(_ f: () -> [NSPoint]) -> NSBezierPath? {
     
     return path
 }
-func multiline(_ f: () -> [(NSPoint, NSPoint)]) -> NSBezierPath? {
+func multiline(_ lines: () -> [(NSPoint, NSPoint)]) -> NSBezierPath? {
     let path = NSBezierPath()
-    f().forEach {
+    lines().forEach {
         path.move(to: $0.0)
         path.line(to: $0.1)
     }

diff --git a/KCD/JSONMapper.swift b/KCD/JSONMapper.swift
index 7d625cd..da213b8 100644 (file)
--- a/KCD/JSONMapper.swift
+++ b/KCD/JSONMapper.swift
@@ -55,9 +55,9 @@ extension String {
 }
 
 extension JSONMapper {
-    private func isEqual(_ a: AnyObject?, _ b: AnyObject?) -> Bool {
-        if a == nil, b == nil { return true }
-        if let aa = a, let bb = b { return aa.isEqual(bb) }
+    private func isEqual(_ lhs: AnyObject?, _ rhs: AnyObject?) -> Bool {
+        if lhs == nil, rhs == nil { return true }
+        if let lhs = lhs, let rhs = rhs { return lhs.isEqual(rhs) }
         return false
     }
     func setValueIfNeeded(_ value: AnyObject?, to object: ObjectType, forKey key: String) {

diff --git a/KCD/KenzoDock.swift b/KCD/KenzoDock.swift
index 9399fa8..b1e3483 100644 (file)
--- a/KCD/KenzoDock.swift
+++ b/KCD/KenzoDock.swift
@@ -9,15 +9,15 @@
 import Foundation
 
 class KenzoDock: KCManagedObject {
-    @NSManaged var complete_time: Int
-    @NSManaged var complete_time_str: String?
-    @NSManaged var created_ship_id: Int
+    @NSManaged var complete_time: Int   // swiftlint:disable:this variable_name
+    @NSManaged var complete_time_str: String?   // swiftlint:disable:this variable_name
+    @NSManaged var created_ship_id: Int // swiftlint:disable:this variable_name
     @NSManaged var id: Int
     @NSManaged var item1: Int
     @NSManaged var item2: Int
     @NSManaged var item3: Int
     @NSManaged var item4: Int
     @NSManaged var item5: Int
-    @NSManaged var member_id: NSNumber?
+    @NSManaged var member_id: NSNumber? // swiftlint:disable:this variable_name
     @NSManaged var state: Int
 }

diff --git a/KCD/KenzoMark.swift b/KCD/KenzoMark.swift
index 57fc31a..d5d3438 100644 (file)
--- a/KCD/KenzoMark.swift
+++ b/KCD/KenzoMark.swift
@@ -12,7 +12,7 @@ class KenzoMark: NSManagedObject {
     @NSManaged var bauxite: Int
     @NSManaged var bull: Int
     @NSManaged var commanderLv: Int
-    @NSManaged var created_ship_id: Int
+    @NSManaged var created_ship_id: Int // swiftlint:disable:this variable_name
     @NSManaged var date: Date
     @NSManaged var flagShipLv: Int
     @NSManaged var flagShipName: String

diff --git a/KCD/MasterFurniture.swift b/KCD/MasterFurniture.swift
index 79a0333..fe93164 100644 (file)
--- a/KCD/MasterFurniture.swift
+++ b/KCD/MasterFurniture.swift
@@ -9,7 +9,7 @@
 import Cocoa
 
 class MasterFurniture: KCManagedObject {
-    @NSManaged var description_: String?
+    @NSManaged var description_: String?    // swiftlint:disable:this variable_name
     @NSManaged var id: NSNumber?
     @NSManaged var no: NSNumber?
     @NSManaged var price: NSNumber?

diff --git a/KCD/MasterMapInfo.swift b/KCD/MasterMapInfo.swift
index 5bdf7e9..29233d0 100644 (file)
--- a/KCD/MasterMapInfo.swift
+++ b/KCD/MasterMapInfo.swift
@@ -11,17 +11,17 @@ import Foundation
 class MasterMapInfo: KCManagedObject {
     @NSManaged var id: Int
     @NSManaged var infotext: String
-    @NSManaged var item_0: NSNumber?
-    @NSManaged var item_1: NSNumber?
-    @NSManaged var item_2: NSNumber?
-    @NSManaged var item_3: NSNumber?
+    @NSManaged var item_0: NSNumber?    // swiftlint:disable:this variable_name
+    @NSManaged var item_1: NSNumber?    // swiftlint:disable:this variable_name
+    @NSManaged var item_2: NSNumber?    // swiftlint:disable:this variable_name
+    @NSManaged var item_3: NSNumber?    // swiftlint:disable:this variable_name
     @NSManaged var level: NSNumber?
-    @NSManaged var maparea_id: Int
-    @NSManaged var max_maphp: NSNumber?
+    @NSManaged var maparea_id: Int  // swiftlint:disable:this variable_name
+    @NSManaged var max_maphp: NSNumber? // swiftlint:disable:this variable_name
     @NSManaged var name: String
     @NSManaged var no: Int
     @NSManaged var opetext: String?
-    @NSManaged var required_defeat_count: NSNumber?
-    @NSManaged var sally_flag_0: NSNumber?
-    @NSManaged var sally_flag_1: NSNumber?
+    @NSManaged var required_defeat_count: NSNumber? // swiftlint:disable:this variable_name
+    @NSManaged var sally_flag_0: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged var sally_flag_1: NSNumber?  // swiftlint:disable:this variable_name
 }

diff --git a/KCD/MasterMission.swift b/KCD/MasterMission.swift
index 11db35d..aef954e 100644 (file)
--- a/KCD/MasterMission.swift
+++ b/KCD/MasterMission.swift
@@ -12,14 +12,14 @@ class MasterMission: KCManagedObject {
     @NSManaged var details: String?
     @NSManaged var difficulty: NSNumber?
     @NSManaged var id: Int
-    @NSManaged var maparea_id: Int
+    @NSManaged var maparea_id: Int  // swiftlint:disable:this variable_name
     @NSManaged var name: String
-    @NSManaged var return_flag: NSNumber?
+    @NSManaged var return_flag: NSNumber?   // swiftlint:disable:this variable_name
     @NSManaged var time: NSNumber?
-    @NSManaged var use_bull: NSNumber?
-    @NSManaged var use_fuel: NSNumber?
-    @NSManaged var win_item1_0: NSNumber?
-    @NSManaged var win_item1_1: NSNumber?
-    @NSManaged var win_item2_0: NSNumber?
-    @NSManaged var win_item2_1: NSNumber?
+    @NSManaged var use_bull: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged var use_fuel: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged var win_item1_0: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var win_item1_1: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var win_item2_0: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged var win_item2_1: NSNumber?   // swiftlint:disable:this variable_name
 }

diff --git a/KCD/MasterShip.swift b/KCD/MasterShip.swift
index f12bbb5..786fb1a 100644 (file)
--- a/KCD/MasterShip.swift
+++ b/KCD/MasterShip.swift
@@ -14,43 +14,43 @@ class MasterShip: KCManagedObject {
     @NSManaged var afterlv: Int
     @NSManaged var aftershipid: Int
     @NSManaged var backs: NSNumber?
-    @NSManaged var broken_0: NSNumber?
-    @NSManaged var broken_1: NSNumber?
-    @NSManaged var broken_2: NSNumber?
-    @NSManaged var broken_3: NSNumber?
+    @NSManaged var broken_0: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged var broken_1: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged var broken_2: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged var broken_3: NSNumber?  // swiftlint:disable:this variable_name
     @NSManaged var buildtime: NSNumber?
-    @NSManaged var bull_max: Int
-    @NSManaged var fuel_max: Int
+    @NSManaged var bull_max: Int    // swiftlint:disable:this variable_name
+    @NSManaged var fuel_max: Int    // swiftlint:disable:this variable_name
     @NSManaged var getmes: NSNumber?
-    @NSManaged var houg_0: Int
-    @NSManaged var houg_1: Int
+    @NSManaged var houg_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged var houg_1: Int  // swiftlint:disable:this variable_name
     @NSManaged var id: Int
     @NSManaged var leng: Int
-    @NSManaged var luck_0: Int
-    @NSManaged var luck_1: Int
-    @NSManaged var maxeq_0: Int
-    @NSManaged var maxeq_1: Int
-    @NSManaged var maxeq_2: Int
-    @NSManaged var maxeq_3: Int
-    @NSManaged var maxeq_4: Int
+    @NSManaged var luck_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged var luck_1: Int  // swiftlint:disable:this variable_name
+    @NSManaged var maxeq_0: Int // swiftlint:disable:this variable_name
+    @NSManaged var maxeq_1: Int // swiftlint:disable:this variable_name
+    @NSManaged var maxeq_2: Int // swiftlint:disable:this variable_name
+    @NSManaged var maxeq_3: Int // swiftlint:disable:this variable_name
+    @NSManaged var maxeq_4: Int // swiftlint:disable:this variable_name
     @NSManaged var name: String
-    @NSManaged var powup_0: Int
-    @NSManaged var powup_1: Int
-    @NSManaged var powup_2: Int
-    @NSManaged var powup_3: Int
-    @NSManaged var raig_0: Int
-    @NSManaged var raig_1: Int
+    @NSManaged var powup_0: Int // swiftlint:disable:this variable_name
+    @NSManaged var powup_1: Int // swiftlint:disable:this variable_name
+    @NSManaged var powup_2: Int // swiftlint:disable:this variable_name
+    @NSManaged var powup_3: Int // swiftlint:disable:this variable_name
+    @NSManaged var raig_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged var raig_1: Int  // swiftlint:disable:this variable_name
     @NSManaged var sinfo: String?
-    @NSManaged var slot_num: Int
+    @NSManaged var slot_num: Int    // swiftlint:disable:this variable_name
     @NSManaged var soku: Int
     @NSManaged var sortno: NSNumber?
-    @NSManaged var souk_0: Int
-    @NSManaged var souk_1: Int
-    @NSManaged var taik_0: Int
-    @NSManaged var taik_1: Int
-    @NSManaged var tais_0: NSNumber?
-    @NSManaged var tyku_0: Int
-    @NSManaged var tyku_1: Int
+    @NSManaged var souk_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged var souk_1: Int  // swiftlint:disable:this variable_name
+    @NSManaged var taik_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged var taik_1: Int  // swiftlint:disable:this variable_name
+    @NSManaged var tais_0: NSNumber?    // swiftlint:disable:this variable_name
+    @NSManaged var tyku_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged var tyku_1: Int  // swiftlint:disable:this variable_name
     @NSManaged var voicef: NSNumber?
     @NSManaged var yomi: String?
     @NSManaged var ships: Set<Ship>

diff --git a/KCD/MasterSlotItem.swift b/KCD/MasterSlotItem.swift
index 0166808..a90b127 100644 (file)
--- a/KCD/MasterSlotItem.swift
+++ b/KCD/MasterSlotItem.swift
@@ -12,10 +12,10 @@ class MasterSlotItem: KCManagedObject {
     @NSManaged var atap: NSNumber?
     @NSManaged var bakk: NSNumber?
     @NSManaged var baku: NSNumber?
-    @NSManaged var broken_0: NSNumber?
-    @NSManaged var broken_1: NSNumber?
-    @NSManaged var broken_2: NSNumber?
-    @NSManaged var broken_3: NSNumber?
+    @NSManaged var broken_0: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged var broken_1: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged var broken_2: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged var broken_3: NSNumber?  // swiftlint:disable:this variable_name
     @NSManaged var houg: NSNumber?
     @NSManaged var houk: NSNumber?
     @NSManaged var houm: NSNumber?
@@ -36,10 +36,10 @@ class MasterSlotItem: KCManagedObject {
     @NSManaged var taik: NSNumber?
     @NSManaged var tais: NSNumber?
     @NSManaged var tyku: Int
-    @NSManaged var type_0: Int
-    @NSManaged var type_1: Int
-    @NSManaged var type_2: Int
-    @NSManaged var type_3: Int
+    @NSManaged var type_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged var type_1: Int  // swiftlint:disable:this variable_name
+    @NSManaged var type_2: Int  // swiftlint:disable:this variable_name
+    @NSManaged var type_3: Int  // swiftlint:disable:this variable_name
     @NSManaged var usebull: NSNumber?
     @NSManaged var slotItems: Set<SlotItem>
 }

diff --git a/KCD/MasterSlotItemEquipType.swift b/KCD/MasterSlotItemEquipType.swift
index a16e719..a6044a4 100644 (file)
--- a/KCD/MasterSlotItemEquipType.swift
+++ b/KCD/MasterSlotItemEquipType.swift
@@ -11,5 +11,5 @@ import Foundation
 class MasterSlotItemEquipType: KCManagedObject {
     @NSManaged var id: Int
     @NSManaged var name: String
-    @NSManaged var show_flg: NSNumber?
+    @NSManaged var show_flg: NSNumber?  // swiftlint:disable:this variable_name
 }

diff --git a/KCD/MasterUseItem.swift b/KCD/MasterUseItem.swift
index c32398d..4d7c00e 100644 (file)
--- a/KCD/MasterUseItem.swift
+++ b/KCD/MasterUseItem.swift
@@ -10,8 +10,8 @@ import Cocoa
 
 class MasterUseItem: KCManagedObject {
     @NSManaged var category: NSNumber?
-    @NSManaged var description_0: String?
-    @NSManaged var description_1: String?
+    @NSManaged var description_0: String?   // swiftlint:disable:this variable_name
+    @NSManaged var description_1: String?// swiftlint:disable:this variable_name
     @NSManaged var id: Int
     @NSManaged var name: String
     @NSManaged var price: NSNumber?

diff --git a/KCD/NyukyoDock.swift b/KCD/NyukyoDock.swift
index 33cf097..7e0fd8a 100644 (file)
--- a/KCD/NyukyoDock.swift
+++ b/KCD/NyukyoDock.swift
@@ -9,14 +9,14 @@
 import Foundation
 
 class NyukyoDock: KCManagedObject {
-    @NSManaged var complete_time: Int
-    @NSManaged var complete_time_str: String?
+    @NSManaged var complete_time: Int   // swiftlint:disable:this variable_name
+    @NSManaged var complete_time_str: String?   // swiftlint:disable:this variable_name
     @NSManaged var id: Int
     @NSManaged var item1: NSNumber?
     @NSManaged var item2: NSNumber?
     @NSManaged var item3: NSNumber?
     @NSManaged var item4: NSNumber?
-    @NSManaged var member_id: NSNumber?
-    @NSManaged var ship_id: Int
+    @NSManaged var member_id: NSNumber? // swiftlint:disable:this variable_name
+    @NSManaged var ship_id: Int // swiftlint:disable:this variable_name
     @NSManaged var state: Int
 }

diff --git a/KCD/Quest.swift b/KCD/Quest.swift
index 8df1ceb..a213914 100644 (file)
--- a/KCD/Quest.swift
+++ b/KCD/Quest.swift
@@ -9,16 +9,16 @@
 import Foundation
 
 class Quest: KCManagedObject {
-    @NSManaged var bonus_flag: Bool
+    @NSManaged var bonus_flag: Bool // swiftlint:disable:this variable_name
     @NSManaged var category: Int
     @NSManaged var detail: String
-    @NSManaged var get_material_0: Int
-    @NSManaged var get_material_1: Int
-    @NSManaged var get_material_2: Int
-    @NSManaged var get_material_3: Int
-    @NSManaged var invalid_flag: Int
+    @NSManaged var get_material_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged var get_material_1: Int  // swiftlint:disable:this variable_name
+    @NSManaged var get_material_2: Int  // swiftlint:disable:this variable_name
+    @NSManaged var get_material_3: Int  // swiftlint:disable:this variable_name
+    @NSManaged var invalid_flag: Int    // swiftlint:disable:this variable_name
     @NSManaged var no: Int
-    @NSManaged var progress_flag: Int
+    @NSManaged var progress_flag: Int   // swiftlint:disable:this variable_name
     @NSManaged var state: Int
     @NSManaged var title: String
     @NSManaged var type: Int

diff --git a/KCD/Ship.swift b/KCD/Ship.swift
index 4b7860d..2e03112 100644 (file)
--- a/KCD/Ship.swift
+++ b/KCD/Ship.swift
@@ -15,50 +15,50 @@ class Ship: KCManagedObject {
     @NSManaged dynamic var fleet: NSNumber?
     @NSManaged dynamic var fuel: Int
     @NSManaged dynamic var id: Int
-    @NSManaged dynamic var kaihi_0: Int
-    @NSManaged dynamic var kaihi_1: NSNumber?
-    @NSManaged dynamic var karyoku_0: Int
-    @NSManaged dynamic var karyoku_1: Int
-    @NSManaged dynamic var kyouka_0: Int
-    @NSManaged dynamic var kyouka_1: Int
-    @NSManaged dynamic var kyouka_2: Int
-    @NSManaged dynamic var kyouka_3: Int
-    @NSManaged dynamic var kyouka_4: Int
+    @NSManaged dynamic var kaihi_0: Int // swiftlint:disable:this variable_name
+    @NSManaged dynamic var kaihi_1: NSNumber?   // swiftlint:disable:this variable_name
+    @NSManaged dynamic var karyoku_0: Int   // swiftlint:disable:this variable_name
+    @NSManaged dynamic var karyoku_1: Int   // swiftlint:disable:this variable_name
+    @NSManaged dynamic var kyouka_0: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var kyouka_1: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var kyouka_2: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var kyouka_3: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var kyouka_4: Int    // swiftlint:disable:this variable_name
     @NSManaged dynamic var locked: Int
-    @NSManaged dynamic var locked_equip: NSNumber?
-    @NSManaged dynamic var lucky_0: Int
-    @NSManaged dynamic var lucky_1: Int
+    @NSManaged dynamic var locked_equip: NSNumber?  // swiftlint:disable:this variable_name
+    @NSManaged dynamic var lucky_0: Int // swiftlint:disable:this variable_name
+    @NSManaged dynamic var lucky_1: Int // swiftlint:disable:this variable_name
     @NSManaged dynamic var lv: Int
     @NSManaged dynamic var maxhp: Int
-    @NSManaged dynamic var ndock_time: NSNumber?
+    @NSManaged dynamic var ndock_time: NSNumber?    // swiftlint:disable:this variable_name
     @NSManaged dynamic var nowhp: Int
-    @NSManaged dynamic var onslot_0: Int
-    @NSManaged dynamic var onslot_1: Int
-    @NSManaged dynamic var onslot_2: Int
-    @NSManaged dynamic var onslot_3: Int
-    @NSManaged dynamic var onslot_4: Int
-    @NSManaged dynamic var raisou_0: Int
-    @NSManaged dynamic var raisou_1: Int
-    @NSManaged dynamic var sakuteki_0: Int
-    @NSManaged dynamic var sakuteki_1: NSNumber?
-    @NSManaged dynamic var sally_area: NSNumber?
-    @NSManaged dynamic var ship_id: Int
-    @NSManaged dynamic var slot_0: Int
-    @NSManaged dynamic var slot_1: Int
-    @NSManaged dynamic var slot_2: Int
-    @NSManaged dynamic var slot_3: Int
-    @NSManaged dynamic var slot_4: Int
-    @NSManaged dynamic var slot_ex: Int
+    @NSManaged dynamic var onslot_0: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var onslot_1: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var onslot_2: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var onslot_3: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var onslot_4: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var raisou_0: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var raisou_1: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var sakuteki_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged dynamic var sakuteki_1: NSNumber?    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var sally_area: NSNumber?    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var ship_id: Int // swiftlint:disable:this variable_name
+    @NSManaged dynamic var slot_0: Int  // swiftlint:disable:this variable_name
+    @NSManaged dynamic var slot_1: Int  // swiftlint:disable:this variable_name
+    @NSManaged dynamic var slot_2: Int  // swiftlint:disable:this variable_name
+    @NSManaged dynamic var slot_3: Int  // swiftlint:disable:this variable_name
+    @NSManaged dynamic var slot_4: Int  // swiftlint:disable:this variable_name
+    @NSManaged dynamic var slot_ex: Int // swiftlint:disable:this variable_name
     @NSManaged dynamic var sortno: NSNumber?
-    @NSManaged dynamic var soukou_0: Int
-    @NSManaged dynamic var soukou_1: Int
+    @NSManaged dynamic var soukou_0: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var soukou_1: Int    // swiftlint:disable:this variable_name
     @NSManaged dynamic var srate: NSNumber?
-    @NSManaged dynamic var taiku_0: Int
-    @NSManaged dynamic var taiku_1: Int
-    @NSManaged dynamic var taisen_0: Int
-    @NSManaged dynamic var taisen_1: NSNumber?
+    @NSManaged dynamic var taiku_0: Int // swiftlint:disable:this variable_name
+    @NSManaged dynamic var taiku_1: Int // swiftlint:disable:this variable_name
+    @NSManaged dynamic var taisen_0: Int    // swiftlint:disable:this variable_name
+    @NSManaged dynamic var taisen_1: NSNumber?  // swiftlint:disable:this variable_name
     @NSManaged dynamic var equippedItem: NSOrderedSet
-    @NSManaged dynamic var master_ship: MasterShip
+    @NSManaged dynamic var master_ship: MasterShip  // swiftlint:disable:this variable_name
     @NSManaged dynamic var extraItem: SlotItem?
 }
 

diff --git a/KCD/SlotItem.swift b/KCD/SlotItem.swift
index 74c8f08..5f3d757 100644 (file)
--- a/KCD/SlotItem.swift
+++ b/KCD/SlotItem.swift
@@ -13,9 +13,9 @@ class SlotItem: KCManagedObject {
     @NSManaged var id: Int
     @NSManaged var level: Int
     @NSManaged var locked: Bool
-    @NSManaged var slotitem_id: Int
+    @NSManaged var slotitem_id: Int // swiftlint:disable:this variable_name
     @NSManaged var equippedShip: Ship?
-    @NSManaged var master_slotItem: MasterSlotItem
+    @NSManaged var master_slotItem: MasterSlotItem  // swiftlint:disable:this variable_name
     @NSManaged var extraEquippedShip: Ship?
 }
 

diff --git a/KCD/SuppliesView.swift b/KCD/SuppliesView.swift
index 73feb2e..4dbfbed 100644 (file)
--- a/KCD/SuppliesView.swift
+++ b/KCD/SuppliesView.swift
@@ -8,7 +8,7 @@
 
 import Cocoa
 
-fileprivate var ShipStatusContext: Int = 0
+fileprivate var pShipStatusContext: Int = 0
 
 class SuppliesView: NSControl {
     private let observeKeys = ["fuel", "maxFuel", "bull", "maxBull"]
@@ -40,14 +40,14 @@ class SuppliesView: NSControl {
             }
             suppliesCell.shipStatus = newValue
             observeKeys.forEach {
-                suppliesCell.shipStatus?.addObserver(self, forKeyPath: $0, context: &ShipStatusContext)
+                suppliesCell.shipStatus?.addObserver(self, forKeyPath: $0, context: &pShipStatusContext)
             }
             needsDisplay = true
         }
     }
     
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
-        if context == &ShipStatusContext {
+        if context == &pShipStatusContext {
             needsDisplay = true
             return
         }