swiftlintの警告を修正

redundant_optional_initialization

diff --git a/.swiftlint.yml b/.swiftlint.yml
index 082a6b0..eb4b92c 100644 (file)
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -6,7 +6,6 @@ disabled_rules:
     - leading_whitespace
     - vertical_whitespace
     - cyclomatic_complexity
-    - redundant_optional_initialization
     - trailing_comma
     - function_parameter_count
     - opening_brace

diff --git a/KCD/BroserWindowController.swift b/KCD/BroserWindowController.swift
index 8e50898..75f7693 100644 (file)
--- a/KCD/BroserWindowController.swift
+++ b/KCD/BroserWindowController.swift
@@ -61,7 +61,7 @@ class BroserWindowController: NSWindowController {
     var flagShipName: String? {
         return ServerDataStore.default.ship(byId: flagShipID)?.name
     }
-    var changeMainTabHandler: ((Int) -> Void)? = nil
+    var changeMainTabHandler: ((Int) -> Void)?
     dynamic var selectedMainTabIndex: Int = 0 {
         didSet {
             changeMainTabHandler?(selectedMainTabIndex)

diff --git a/KCD/CustomHTTPProtocol.swift b/KCD/CustomHTTPProtocol.swift
index 2a3c2a3..f75a624 100644 (file)
--- a/KCD/CustomHTTPProtocol.swift
+++ b/KCD/CustomHTTPProtocol.swift
@@ -18,7 +18,7 @@ protocol CustomHTTPProtocolDelegate: class {
 
 class CustomHTTPProtocol: URLProtocol {
     fileprivate static let requestProperty = "com.masakih.KCD.requestProperty"
-    static var classDelegate: CustomHTTPProtocolDelegate? = nil
+    static var classDelegate: CustomHTTPProtocolDelegate?
     fileprivate static let cachedExtensions = ["swf", "flv", "png", "jpg", "jpeg", "mp3"]
     fileprivate static let cacheFileURL: URL = ApplicationDirecrories.support.appendingPathComponent("Caches")
     fileprivate static let kcdURLCache = URLCache(memoryCapacity: 32 * 1024 * 1024,
@@ -41,8 +41,8 @@ class CustomHTTPProtocol: URLProtocol {
     
     fileprivate var delegate: CustomHTTPProtocolDelegate? { return CustomHTTPProtocol.classDelegate }
     
-    fileprivate var session: URLSession? = nil
-    fileprivate var dataTask: URLSessionDataTask? = nil
+    fileprivate var session: URLSession?
+    fileprivate var dataTask: URLSessionDataTask? 
     fileprivate var cachePolicy: URLCache.StoragePolicy = .notAllowed
     fileprivate var data: Data = Data()
     fileprivate var didRetry: Bool = false

diff --git a/KCD/DocksViewController.swift b/KCD/DocksViewController.swift
index ba47c92..4d9265c 100644 (file)
--- a/KCD/DocksViewController.swift
+++ b/KCD/DocksViewController.swift
@@ -42,28 +42,28 @@ class DocksViewController: MainTabVIewItemViewController {
     let ndockStatus = (1...4).flatMap { NyukyoDockStatus(number: $0) }
     let kdockStatus = (1...4).flatMap { KenzoDockStatus(number: $0) }
     
-    var nDock1Time: NSNumber? = nil
-    var nDock2Time: NSNumber? = nil
-    var nDock3Time: NSNumber? = nil
-    var nDock4Time: NSNumber? = nil
+    var nDock1Time: NSNumber?
+    var nDock2Time: NSNumber?
+    var nDock3Time: NSNumber?
+    var nDock4Time: NSNumber?
     
-    var nDock1ShipName: String? = nil
-    var nDock2ShipName: String? = nil
-    var nDock3ShipName: String? = nil
-    var nDock4ShipName: String? = nil
+    var nDock1ShipName: String?
+    var nDock2ShipName: String?
+    var nDock3ShipName: String?
+    var nDock4ShipName: String?
     
-    var kDock1Time: NSNumber? = nil
-    var kDock2Time: NSNumber? = nil
-    var kDock3Time: NSNumber? = nil
-    var kDock4Time: NSNumber? = nil
+    var kDock1Time: NSNumber?
+    var kDock2Time: NSNumber?
+    var kDock3Time: NSNumber?
+    var kDock4Time: NSNumber?
     
-    var deck2Time: NSNumber? = nil
-    var deck3Time: NSNumber? = nil
-    var deck4Time: NSNumber? = nil
+    var deck2Time: NSNumber?
+    var deck3Time: NSNumber?
+    var deck4Time: NSNumber?
     
-    var mission2Name: String? = nil
-    var mission3Name: String? = nil
-    var mission4Name: String? = nil
+    var mission2Name: String?
+    var mission3Name: String?
+    var mission4Name: String?
     
     @IBOutlet var battleContoller: NSObjectController!
     @IBOutlet weak var questListViewPlaceholder: NSView!

diff --git a/KCD/ScreenshotListViewController.swift b/KCD/ScreenshotListViewController.swift
index 10ce903..6c952dc 100644 (file)
--- a/KCD/ScreenshotListViewController.swift
+++ b/KCD/ScreenshotListViewController.swift
@@ -43,9 +43,9 @@ class ScreenshotListViewController: NSViewController {
     }
     dynamic var maxZoom: Double = 1.0
     
-    fileprivate var collectionVisibleDidChangeHandler: ((Set<IndexPath>) -> Void)? = nil
-    fileprivate var reloadHandler: (() -> Void)? = nil
-    fileprivate var collectionSelectionDidChangeHandler: ((Int) -> Void)? = nil
+    fileprivate var collectionVisibleDidChangeHandler: ((Set<IndexPath>) -> Void)?
+    fileprivate var reloadHandler: (() -> Void)?
+    fileprivate var collectionSelectionDidChangeHandler: ((Int) -> Void)?
     fileprivate(set) var inLiveScrolling = false
     fileprivate var arrangedInformations: [ScreenshotInformation]? {
         return screenshotsController.arrangedObjects as? [ScreenshotInformation]

diff --git a/KCD/ScreenshotListWindowController.swift b/KCD/ScreenshotListWindowController.swift
index 9539be7..4e8277e 100644 (file)
--- a/KCD/ScreenshotListWindowController.swift
+++ b/KCD/ScreenshotListWindowController.swift
@@ -19,7 +19,7 @@ class ScreenshotListWindowController: NSWindowController {
     private var editorViewController: ScreenshotEditorViewController =
         { return ScreenshotEditorViewController() }()
     private var viewControllers: [NSViewController] = []
-    fileprivate weak var currentRightViewController: BridgeViewController? = nil
+    fileprivate weak var currentRightViewController: BridgeViewController?
     fileprivate lazy var listViewController: ScreenshotListViewController =
         { return ScreenshotListViewController() }()
     

diff --git a/KCD/StrengthenListViewController.swift b/KCD/StrengthenListViewController.swift
index 764a392..31c783f 100644 (file)
--- a/KCD/StrengthenListViewController.swift
+++ b/KCD/StrengthenListViewController.swift
@@ -142,7 +142,7 @@ fileprivate class EnhancementListItemDownloader: NSObject, URLSessionDownloadDel
     private var plistDownloadSession: URLSession!
     private var plistDownloadQueue: OperationQueue!
     private var plistDownloadTask: URLSessionDownloadTask?
-    private var finishOperation: (([EnhancementListItem]) -> Void)? = nil
+    private var finishOperation: (([EnhancementListItem]) -> Void)?
     
     func download(using block: @escaping ([EnhancementListItem]) -> Void) {
         if let _ = plistDownloadTask { return }

diff --git a/KCD/TiledImageView.swift b/KCD/TiledImageView.swift
index 4f1835d..07882f5 100644 (file)
--- a/KCD/TiledImageView.swift
+++ b/KCD/TiledImageView.swift
@@ -52,7 +52,7 @@ class TiledImageView: NSView {
             setTrackingArea()
         }
     }
-    fileprivate var currentSelection: TitledImageCellInformation? = nil
+    fileprivate var currentSelection: TitledImageCellInformation?
     
     private var imageCell: NSImageCell