From 75a3f308bb7ffdcac45826e86e03c5b66411f1dc Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Sun, 3 Apr 2022 12:38:51 +0800
Subject: [PATCH] KeyHandler & mgrPrefs // Aftermath of Swift Clang-Format.

---
 .../Modules/ControllerModules/KeyHandler.mm   | 18 +++++-----
 Source/Modules/IMEModules/mgrPrefs.swift      | 34 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Source/Modules/ControllerModules/KeyHandler.mm b/Source/Modules/ControllerModules/KeyHandler.mm
index 56dd029c..0509a9cb 100644
--- a/Source/Modules/ControllerModules/KeyHandler.mm
+++ b/Source/Modules/ControllerModules/KeyHandler.mm
@@ -176,33 +176,33 @@ static NSString *const kGraphVizOutputfile = @"/tmp/vChewing-visualization.dot";
 {
     NSInteger layout = mgrPrefs.keyboardLayout;
     switch (layout) {
-        case KeyboardLayoutStandard:
+        case KeyboardLayoutOfStandard:
             _bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::StandardLayout());
             break;
-        case KeyboardLayoutEten:
+        case KeyboardLayoutOfEten:
             _bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::ETenLayout());
             break;
-        case KeyboardLayoutHsu:
+        case KeyboardLayoutOfHsu:
             _bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::HsuLayout());
             break;
-        case KeyboardLayoutEten26:
+        case KeyboardLayoutOfEen26:
             _bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::ETen26Layout());
             break;
-        case KeyboardLayoutIBM:
+        case KeyboardLayoutOfIBM:
             _bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::IBMLayout());
             break;
-        case KeyboardLayoutMiTAC:
+        case KeyboardLayoutOfMiTAC:
             _bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::MiTACLayout());
             break;
-        case KeyboardLayoutFakeSeigyou:
+        case KeyboardLayoutOfFakeSeigyou:
             _bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::FakeSeigyouLayout());
             break;
-        case KeyboardLayoutHanyuPinyin:
+        case KeyboardLayoutOfHanyuPinyin:
             _bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::HanyuPinyinLayout());
             break;
         default:
             _bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::StandardLayout());
-            mgrPrefs.keyboardLayout = KeyboardLayoutStandard;
+            mgrPrefs.keyboardLayout = KeyboardLayoutOfStandard;
     }
 }
 
diff --git a/Source/Modules/IMEModules/mgrPrefs.swift b/Source/Modules/IMEModules/mgrPrefs.swift
index 1ab95969..d1f0a82a 100644
--- a/Source/Modules/IMEModules/mgrPrefs.swift
+++ b/Source/Modules/IMEModules/mgrPrefs.swift
@@ -156,32 +156,32 @@ struct ComposingBufferSize {
 // MARK: -
 
 @objc enum KeyboardLayout: Int {
-	case standard = 0
-	case eten = 1
-	case hsu = 2
-	case eten26 = 3
-	case ibm = 4
-	case mitac = 5
-	case fakeSeigyou = 6
-	case hanyuPinyin = 10
+	case ofStandard = 0
+	case ofEten = 1
+	case ofHsu = 2
+	case ofEen26 = 3
+	case ofIBM = 4
+	case ofMiTAC = 5
+	case ofFakeSeigyou = 6
+	case ofHanyuPinyin = 10
 
 	var name: String {
 		switch self {
-			case .standard:
+			case .ofStandard:
 				return "Standard"
-			case .eten:
+			case .ofEten:
 				return "ETen"
-			case .hsu:
+			case .ofHsu:
 				return "Hsu"
-			case .eten26:
+			case .ofEen26:
 				return "ETen26"
-			case .ibm:
+			case .ofIBM:
 				return "IBM"
-			case .mitac:
+			case .ofMiTAC:
 				return "MiTAC"
-			case .fakeSeigyou:
+			case .ofFakeSeigyou:
 				return "FakeSeigyou"
-			case .hanyuPinyin:
+			case .ofHanyuPinyin:
 				return "HanyuPinyin"
 		}
 	}
@@ -360,7 +360,7 @@ struct ComposingBufferSize {
 	@objc static var keyboardLayout: Int
 
 	@objc static var keyboardLayoutName: String {
-		(KeyboardLayout(rawValue: self.keyboardLayout) ?? KeyboardLayout.standard).name
+		(KeyboardLayout(rawValue: self.keyboardLayout) ?? KeyboardLayout.ofStandard).name
 	}
 
 	@UserDefault(