#keyPathが使用できない部分も#keyPathにしていたため修正

diff --git a/KCD/AirBaseWindowController.swift b/KCD/AirBaseWindowController.swift
index 93c28ce..de24185 100644 (file)
--- a/KCD/AirBaseWindowController.swift
+++ b/KCD/AirBaseWindowController.swift
@@ -38,7 +38,7 @@ class AirBaseWindowController: NSWindowController {
         
         rId = 1
         
-        airBaseController.addObserver(self, forKeyPath: #keyPath(airBaseController.content), context: nil)
+        airBaseController.addObserver(self, forKeyPath: "content", context: nil)
         
         updateAreaRadio()
         updatePlaneSegment()
@@ -48,7 +48,7 @@ class AirBaseWindowController: NSWindowController {
                                of object: Any?,
                                change: [NSKeyValueChangeKey: Any]?,
                                context: UnsafeMutableRawPointer?) {
-        guard keyPath == #keyPath(airBaseController.content) else {
+        guard keyPath == "content" else {
             super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
             return
         }

diff --git a/KCD/ExternalBrowserWindowController.swift b/KCD/ExternalBrowserWindowController.swift
index e4e74d2..3121d1c 100644 (file)
--- a/KCD/ExternalBrowserWindowController.swift
+++ b/KCD/ExternalBrowserWindowController.swift
@@ -21,8 +21,8 @@ class ExternalBrowserWindowController: NSWindowController {
     let managedObjectContext = BookmarkManager.shared().manageObjectContext
     
     deinit {
-        webView.removeObserver(self, forKeyPath: #keyPath(webView.canGoBack))
-        webView.removeObserver(self, forKeyPath: #keyPath(webView.canGoForward))
+        webView.removeObserver(self, forKeyPath: "canGoBack")
+        webView.removeObserver(self, forKeyPath: "canGoForward")
     }
     
     @IBOutlet var webView: WebView!
@@ -104,8 +104,8 @@ class ExternalBrowserWindowController: NSWindowController {
     override func windowDidLoad() {
         super.windowDidLoad()
         
-        webView.addObserver(self, forKeyPath: #keyPath(webView.canGoBack), context: nil)
-        webView.addObserver(self, forKeyPath: #keyPath(webView.canGoForward), context: nil)
+        webView.addObserver(self, forKeyPath: "canGoBack", context: nil)
+        webView.addObserver(self, forKeyPath: "canGoForward", context: nil)
         webView.applicationNameForUserAgent = AppDelegate.shared.appNameForUserAgent
         webView.frameLoadDelegate = self
     }
@@ -113,11 +113,11 @@ class ExternalBrowserWindowController: NSWindowController {
                                of object: Any?,
                                change: [NSKeyValueChangeKey: Any]?,
                                context: UnsafeMutableRawPointer?) {
-        if keyPath == #keyPath(webView.canGoBack) {
+        if keyPath == "canGoBack" {
             goSegment.setEnabled(webView.canGoBack, forSegment: 0)
             return
         }
-        if keyPath == #keyPath(webView.canGoForward) {
+        if keyPath == "canGoForward" {
             goSegment.setEnabled(webView.canGoForward, forSegment: 1)
             return
         }

diff --git a/KCD/ShipViewController.swift b/KCD/ShipViewController.swift
index 5eaef16..4ebf254 100644 (file)
--- a/KCD/ShipViewController.swift
+++ b/KCD/ShipViewController.swift
@@ -66,7 +66,7 @@ class ShipViewController: MainTabVIewItemViewController {
         }
         shipController.sortDescriptors = UserDefaults.standard.shipviewSortDescriptors
         shipController.addObserver(self, forKeyPath: NSSortDescriptorsBinding, context: nil)
-        shipController.addObserver(self, forKeyPath: #keyPath(shipController.arrangedObjects), context: nil)
+        shipController.addObserver(self, forKeyPath: "arrangedObjects", context: nil)
         
         let tableViews = [expTableView, powerTableView, power2TableView, power3TableView]
         tableViews
@@ -92,8 +92,8 @@ class ShipViewController: MainTabVIewItemViewController {
             UserDefaults.standard.shipviewSortDescriptors = shipController.sortDescriptors
             return
         }
-        if keyPath == #keyPath(shipController.arrangedObjects) {
-            notifyChangeValue(forKey: #keyPath(standardDeviation))
+        if keyPath == "arrangedObjects" {
+            notifyChangeValue(forKey: "standardDeviation")
             return
         }