From 62b0a79c8a3e4da8895258761ed99611ba321b62 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Thu, 14 Mar 2013 13:41:31 +0800
Subject: re-factor pinyin_custom2.h

---
 src/storage/chewing_key.h    | 28 ----------------------------
 src/storage/pinyin_custom2.h | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 28 deletions(-)

(limited to 'src/storage')

diff --git a/src/storage/chewing_key.h b/src/storage/chewing_key.h
index c853eb0..7b25933 100644
--- a/src/storage/chewing_key.h
+++ b/src/storage/chewing_key.h
@@ -32,34 +32,6 @@
 namespace pinyin{
 
 
-/**
- * @brief enums of Double Pinyin Schemes.
- */
-enum DoublePinyinScheme
-{
-    DOUBLE_PINYIN_ZRM        = 1,
-    DOUBLE_PINYIN_MS         = 2,
-    DOUBLE_PINYIN_ZIGUANG    = 3,
-    DOUBLE_PINYIN_ABC        = 4,
-    DOUBLE_PINYIN_PYJJ       = 6,
-    DOUBLE_PINYIN_XHE        = 7,
-    DOUBLE_PINYIN_CUSTOMIZED = 30,        /* for user's keyboard */
-    DOUBLE_PINYIN_DEFAULT    = DOUBLE_PINYIN_MS
-};
-
-/**
- * @brief enums of Chewing Schemes.
- */
-enum ChewingScheme
-{
-    CHEWING_STANDARD = 1,
-    CHEWING_IBM      = 2,
-    CHEWING_GINYIEH  = 3,
-    CHEWING_ETEN     = 4,
-    CHEWING_DEFAULT  = CHEWING_STANDARD
-};
-
-
 /** Note: The parsed pinyins are stored in the following two
  *          GArrays to speed up chewing table lookup.
  *    As the chewing large table only contains information of struct ChewingKey.
diff --git a/src/storage/pinyin_custom2.h b/src/storage/pinyin_custom2.h
index 499a9d4..7e107c1 100644
--- a/src/storage/pinyin_custom2.h
+++ b/src/storage/pinyin_custom2.h
@@ -77,6 +77,33 @@ enum PinyinCorrection2{
     PINYIN_CORRECT_ALL = 0xFFU << 21
 };
 
+/**
+ * @brief enums of Double Pinyin Schemes.
+ */
+enum DoublePinyinScheme
+{
+    DOUBLE_PINYIN_ZRM        = 1,
+    DOUBLE_PINYIN_MS         = 2,
+    DOUBLE_PINYIN_ZIGUANG    = 3,
+    DOUBLE_PINYIN_ABC        = 4,
+    DOUBLE_PINYIN_PYJJ       = 6,
+    DOUBLE_PINYIN_XHE        = 7,
+    DOUBLE_PINYIN_CUSTOMIZED = 30,        /* for user's keyboard */
+    DOUBLE_PINYIN_DEFAULT    = DOUBLE_PINYIN_MS
+};
+
+/**
+ * @brief enums of Chewing Schemes.
+ */
+enum ChewingScheme
+{
+    CHEWING_STANDARD = 1,
+    CHEWING_IBM      = 2,
+    CHEWING_GINYIEH  = 3,
+    CHEWING_ETEN     = 4,
+    CHEWING_DEFAULT  = CHEWING_STANDARD
+};
+
 };
 
 #endif
-- 
cgit