省略可能な部分を省略した

diff --git a/KCD/AncherageRepairTimerViewController.swift b/KCD/AncherageRepairTimerViewController.swift
index 19c0a69..67450d1 100644 (file)
--- a/KCD/AncherageRepairTimerViewController.swift
+++ b/KCD/AncherageRepairTimerViewController.swift
@@ -40,7 +40,7 @@ class AncherageRepairTimerViewController: NSViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        AppDelegate.shared.addCounterUpdate { [weak self] () in
+        AppDelegate.shared.addCounterUpdate { [weak self] _ in
             guard let `self` = self else { return }
             self.repairTime = self.calcRepairTime()
         }
@@ -59,14 +59,15 @@ class AncherageRepairTimerViewController: NSViewController {
                                       options: [.mouseEnteredAndExited, .activeInActiveApp],
                                       owner: self,
                                       userInfo: nil)
-        view.addTrackingArea(trackingArea!)
+        if let trackingArea = trackingArea {
+            view.addTrackingArea(trackingArea)
+        }
     }
     
     private func calcRepairTime() -> NSNumber? {
-        let time = anchorageRepairManager.repairTime
-        let complete = time.timeIntervalSince1970
-        let now = Date(timeIntervalSinceNow: 0.0)
-        let diff = complete - now.timeIntervalSince1970
+        let complete = anchorageRepairManager.repairTime.timeIntervalSince1970
+        let now = Date(timeIntervalSinceNow: 0.0).timeIntervalSince1970
+        let diff = complete - now
         return NSNumber(value: diff + 20.0 * 60)
     }
 }

diff --git a/KCD/DamageValueTransformer.swift b/KCD/DamageValueTransformer.swift
index 586ab28..1ff77f3 100644 (file)
--- a/KCD/DamageValueTransformer.swift
+++ b/KCD/DamageValueTransformer.swift
@@ -9,7 +9,7 @@
 import Cocoa
 
 class DamageValueTransformer: ValueTransformer {
-    override class func transformedValueClass() -> Swift.AnyClass {
+    override class func transformedValueClass() -> AnyClass {
         return NSAttributedString.self
     }
     override func transformedValue(_ value: Any?) -> Any? {

diff --git a/KCD/HistoryMarkTransformer.swift b/KCD/HistoryMarkTransformer.swift
index 3e633d0..ae82616 100644 (file)
--- a/KCD/HistoryMarkTransformer.swift
+++ b/KCD/HistoryMarkTransformer.swift
@@ -9,7 +9,7 @@
 import Cocoa
 
 class HistoryMarkTransformer: ValueTransformer {
-    override class func transformedValueClass() -> Swift.AnyClass {
+    override class func transformedValueClass() -> AnyClass {
         return NSColor.self
     }
     override func transformedValue(_ value: Any?) -> Any? {

diff --git a/KCD/IgnoreZeroTransformer.swift b/KCD/IgnoreZeroTransformer.swift
index 16d6b22..455d701 100644 (file)
--- a/KCD/IgnoreZeroTransformer.swift
+++ b/KCD/IgnoreZeroTransformer.swift
@@ -9,7 +9,7 @@
 import Cocoa
 
 class IgnoreZeroTransformer: ValueTransformer {
-    override class func transformedValueClass() -> Swift.AnyClass {
+    override class func transformedValueClass() -> AnyClass {
         return NSNumber.self
     }
     override func transformedValue(_ value: Any?) -> Any? {

diff --git a/KCD/OrderedSetToArrayTransformer.swift b/KCD/OrderedSetToArrayTransformer.swift
index 8025f3d..11694e3 100644 (file)
--- a/KCD/OrderedSetToArrayTransformer.swift
+++ b/KCD/OrderedSetToArrayTransformer.swift
@@ -9,7 +9,7 @@
 import Cocoa
 
 class OrderedSetToArrayTransformer: ValueTransformer {
-    override class func transformedValueClass() -> Swift.AnyClass {
+    override class func transformedValueClass() -> AnyClass {
         return NSArray.self
     }
     override class func allowsReverseTransformation() -> Bool {

diff --git a/KCD/PowerUpSupportViewController.swift b/KCD/PowerUpSupportViewController.swift
index 2e75e13..fc58820 100644 (file)
--- a/KCD/PowerUpSupportViewController.swift
+++ b/KCD/PowerUpSupportViewController.swift
@@ -79,7 +79,7 @@ class PowerUpSupportViewController: MainTabVIewItemViewController {
     }
     
     @IBAction func changeCategory(_ sender: AnyObject?) {
-        guard let type = ShipType(rawValue: Int(typeSegment.selectedSegment)) else { return }
+        guard let type = ShipType(rawValue: typeSegment.selectedSegment) else { return }
         shipController.filterPredicate = customPredicate(for: type)
         shipController.rearrangeObjects()
     }

diff --git a/KCD/PreferencePanelController.swift b/KCD/PreferencePanelController.swift
index 377eb7c..d6db870 100644 (file)
--- a/KCD/PreferencePanelController.swift
+++ b/KCD/PreferencePanelController.swift
@@ -56,7 +56,6 @@ class PreferencePanelController: NSWindowController {
         screenShotSaveDirectory = AppDelegate.shared.screenShotSaveDirectory
         guard let window = window,
             let items = window.toolbar?.items,
-            items.count != 0,
             let item = items.first
             else { return }
         window.toolbar?.selectedItemIdentifier = item.itemIdentifier

diff --git a/KCD/UpgradeShipExcludeColorTransformer.swift b/KCD/UpgradeShipExcludeColorTransformer.swift
index 9ff0233..d17ea08 100644 (file)
--- a/KCD/UpgradeShipExcludeColorTransformer.swift
+++ b/KCD/UpgradeShipExcludeColorTransformer.swift
@@ -9,7 +9,7 @@
 import Cocoa
 
 class UpgradeShipExcludeColorTransformer: ValueTransformer {
-    override class func transformedValueClass() -> Swift.AnyClass {
+    override class func transformedValueClass() -> AnyClass {
         return NSColor.self
     }
     override func transformedValue(_ value: Any?) -> Any? {