From bab4399860954ca22c55878c6c247e7f9368bf2e Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Tue, 17 May 2022 16:45:36 +0800 Subject: [PATCH] Repo // Use enum in lieu of class when appropriate. --- Source/Modules/IMEModules/IME.swift | 2 +- Source/Modules/IMEModules/mgrPrefs.swift | 8 +++++--- Source/Modules/LangModelRelated/mgrLangModel.swift | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Source/Modules/IMEModules/IME.swift b/Source/Modules/IMEModules/IME.swift index 146316ec..4ae72006 100644 --- a/Source/Modules/IMEModules/IME.swift +++ b/Source/Modules/IMEModules/IME.swift @@ -28,7 +28,7 @@ import Cocoa // The namespace of this input method. public enum vChewing {} -public class IME { +public enum IME { static let arrSupportedLocales = ["en", "zh-Hant", "zh-Hans", "ja"] static let dlgOpenPath = NSOpenPanel() diff --git a/Source/Modules/IMEModules/mgrPrefs.swift b/Source/Modules/IMEModules/mgrPrefs.swift index 0419b3b1..fa2ff9b1 100644 --- a/Source/Modules/IMEModules/mgrPrefs.swift +++ b/Source/Modules/IMEModules/mgrPrefs.swift @@ -215,7 +215,7 @@ struct ComposingBufferSize { // MARK: - -public class mgrPrefs { +public enum mgrPrefs { static var allKeys: [String] { [ UserDef.kIsDebugModeEnabled, @@ -293,9 +293,11 @@ public class mgrPrefs { UserDefaults.standard.setDefault(mgrPrefs.phraseReplacementEnabled, forKey: UserDef.kPhraseReplacementEnabled) UserDefaults.standard.setDefault(mgrPrefs.shouldNotFartInLieuOfBeep, forKey: UserDef.kShouldNotFartInLieuOfBeep) UserDefaults.standard.setDefault( - mgrPrefs.showHanyuPinyinInCompositionBuffer, forKey: UserDef.kShowHanyuPinyinInCompositionBuffer) + mgrPrefs.showHanyuPinyinInCompositionBuffer, forKey: UserDef.kShowHanyuPinyinInCompositionBuffer + ) UserDefaults.standard.setDefault( - mgrPrefs.inlineDumpPinyinInLieuOfZhuyin, forKey: UserDef.kInlineDumpPinyinInLieuOfZhuyin) + mgrPrefs.inlineDumpPinyinInLieuOfZhuyin, forKey: UserDef.kInlineDumpPinyinInLieuOfZhuyin + ) UserDefaults.standard.synchronize() } diff --git a/Source/Modules/LangModelRelated/mgrLangModel.swift b/Source/Modules/LangModelRelated/mgrLangModel.swift index 09ce44a4..ab6a17d7 100644 --- a/Source/Modules/LangModelRelated/mgrLangModel.swift +++ b/Source/Modules/LangModelRelated/mgrLangModel.swift @@ -36,7 +36,7 @@ private var gLangModelCHT = vChewing.LMInstantiator() private var gUserOverrideModelCHS = vChewing.LMUserOverride() private var gUserOverrideModelCHT = vChewing.LMUserOverride() -class mgrLangModel { +enum mgrLangModel { /// 寫幾個回傳函數、供其餘控制模組來讀取那些被設為 fileprivate 的器外變數。 public static var lmCHS: vChewing.LMInstantiator { gLangModelCHS } public static var lmCHT: vChewing.LMInstantiator { gLangModelCHT }