From 6dbf10b7f3f563ce341d22297927a82e76cdccc1 Mon Sep 17 00:00:00 2001 From: Qiu Yuzhou Date: Fri, 20 Oct 2017 19:58:14 +0800 Subject: [PATCH] Fix @objc --- ShadowsocksX-NG/AppDelegate.swift | 7 +++---- ShadowsocksX-NG/KcptunProfile.swift | 16 ++++++++-------- ShadowsocksX-NG/PreferencesWinController.swift | 2 +- ShadowsocksX-NG/ServerProfile.swift | 18 +++++++++--------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift index 66258e5..47dd796 100755 --- a/ShadowsocksX-NG/AppDelegate.swift +++ b/ShadowsocksX-NG/AppDelegate.swift @@ -323,12 +323,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele if preferencesWinCtrl != nil { preferencesWinCtrl.close() } - let ctrl = PreferencesWindowController(windowNibName: NSNib.Name(rawValue: "PreferencesWindowController")) - preferencesWinCtrl = ctrl + preferencesWinCtrl = PreferencesWindowController(windowNibName: NSNib.Name(rawValue: "PreferencesWindowController")) - ctrl.showWindow(self) + preferencesWinCtrl.showWindow(self) NSApp.activate(ignoringOtherApps: true) - ctrl.window?.makeKeyAndOrderFront(self) + preferencesWinCtrl.window?.makeKeyAndOrderFront(self) } @IBAction func showAllInOnePreferences(_ sender: NSMenuItem) { diff --git a/ShadowsocksX-NG/KcptunProfile.swift b/ShadowsocksX-NG/KcptunProfile.swift index e89f435..f874c52 100644 --- a/ShadowsocksX-NG/KcptunProfile.swift +++ b/ShadowsocksX-NG/KcptunProfile.swift @@ -11,15 +11,15 @@ import Foundation class KcptunProfile: NSObject, NSCopying { - var mode: String = "fast" + @objc var mode: String = "fast" - var key: String = "it's a secrect" - var crypt: String = "aes" - var nocomp: Bool = false - var datashard: uint = 10 - var parityshard: uint = 3 - var mtu: uint = 1350 - var arguments: String = "" + @objc var key: String = "it's a secrect" + @objc var crypt: String = "aes" + @objc var nocomp: Bool = false + @objc var datashard: uint = 10 + @objc var parityshard: uint = 3 + @objc var mtu: uint = 1350 + @objc var arguments: String = "" public func copy(with zone: NSZone? = nil) -> Any { diff --git a/ShadowsocksX-NG/PreferencesWinController.swift b/ShadowsocksX-NG/PreferencesWinController.swift index 5b4291a..268d739 100644 --- a/ShadowsocksX-NG/PreferencesWinController.swift +++ b/ShadowsocksX-NG/PreferencesWinController.swift @@ -22,7 +22,7 @@ class PreferencesWinController: NSWindowController { toolbar.selectedItemIdentifier = NSToolbarItem.Identifier(rawValue: "general") } - func windowWillClose(_ notification: Notification) { + @objc func windowWillClose(_ notification: Notification) { NotificationCenter.default .post(name: NOTIFY_CONF_CHANGED, object: nil) } diff --git a/ShadowsocksX-NG/ServerProfile.swift b/ShadowsocksX-NG/ServerProfile.swift index d7929fd..99fb692 100644 --- a/ShadowsocksX-NG/ServerProfile.swift +++ b/ShadowsocksX-NG/ServerProfile.swift @@ -11,17 +11,17 @@ import Cocoa class ServerProfile: NSObject, NSCopying { - var uuid: String + @objc var uuid: String - var serverHost: String = "" - var serverPort: uint16 = 8379 - var method:String = "aes-128-gcm" - var password:String = "" - var remark:String = "" - var ota: Bool = false // onetime authentication + @objc var serverHost: String = "" + @objc var serverPort: uint16 = 8379 + @objc var method:String = "aes-128-gcm" + @objc var password:String = "" + @objc var remark:String = "" + @objc var ota: Bool = false // onetime authentication - var enabledKcptun: Bool = false - var kcptunProfile = KcptunProfile() + @objc var enabledKcptun: Bool = false + @objc var kcptunProfile = KcptunProfile() override init() { uuid = UUID().uuidString