From d50565f859e8949c81796200db7496eb03b53e08 Mon Sep 17 00:00:00 2001
From: Haoyu Qiu <timothyqiu32@gmail.com>
Date: Fri, 20 Oct 2017 23:58:52 +0800
Subject: [PATCH] Use StateValue constants instead of raw value

---
 ShadowsocksX-NG/AppDelegate.swift             | 20 +++++++++----------
 ShadowsocksX-NG/ProxyInterfacesViewCtrl.swift |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift
index 47dd796..7257088 100755
--- a/ShadowsocksX-NG/AppDelegate.swift
+++ b/ShadowsocksX-NG/AppDelegate.swift
@@ -411,17 +411,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
         serversMenuItem.title = serverMenuText
         
         if mode == "auto" {
-            autoModeMenuItem.state = NSControl.StateValue(rawValue: 1)
-            globalModeMenuItem.state = NSControl.StateValue(rawValue: 0)
-            manualModeMenuItem.state = NSControl.StateValue(rawValue: 0)
+            autoModeMenuItem.state = .on
+            globalModeMenuItem.state = .off
+            manualModeMenuItem.state = .off
         } else if mode == "global" {
-            autoModeMenuItem.state = NSControl.StateValue(rawValue: 0)
-            globalModeMenuItem.state = NSControl.StateValue(rawValue: 1)
-            manualModeMenuItem.state = NSControl.StateValue(rawValue: 0)
+            autoModeMenuItem.state = .off
+            globalModeMenuItem.state = .on
+            manualModeMenuItem.state = .off
         } else if mode == "manual" {
-            autoModeMenuItem.state = NSControl.StateValue(rawValue: 0)
-            globalModeMenuItem.state = NSControl.StateValue(rawValue: 0)
-            manualModeMenuItem.state = NSControl.StateValue(rawValue: 1)
+            autoModeMenuItem.state = .off
+            globalModeMenuItem.state = .off
+            manualModeMenuItem.state = .on
         }
         updateStatusMenuImage()
     }
@@ -493,7 +493,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
             let item = NSMenuItem()
             item.tag = i + kProfileMenuItemIndexBase
             item.title = profile.title()
-            item.state = NSControl.StateValue(rawValue: (mgr.activeProfileId == profile.uuid) ? 1 : 0)
+            item.state = (mgr.activeProfileId == profile.uuid) ? .on : .off
             item.isEnabled = profile.isValid()
             item.action = #selector(AppDelegate.selectServer)
             
diff --git a/ShadowsocksX-NG/ProxyInterfacesViewCtrl.swift b/ShadowsocksX-NG/ProxyInterfacesViewCtrl.swift
index 7512279..10cd210 100644
--- a/ShadowsocksX-NG/ProxyInterfacesViewCtrl.swift
+++ b/ShadowsocksX-NG/ProxyInterfacesViewCtrl.swift
@@ -48,9 +48,9 @@ class ProxyInterfacesViewCtrl: NSViewController, NSTableViewDataSource, NSTableV
         let networkService = networkServices[row] as! [String: Any]
         let key = networkService["key"] as! String
         if selectedNetworkServices.contains(key) {
-            cell.state = NSControl.StateValue(rawValue: 1)
+            cell.state = .on
         } else {
-            cell.state = NSControl.StateValue(rawValue: 0)
+            cell.state = .off
         }
         let userDefinedName = networkService["userDefinedName"] as! String
         cell.title = userDefinedName