refactor code

3 files changed, 12 insertions, 9 deletions

diff --git a/src/storage/chewing_key.cpp b/src/storage/chewing_key.cpp
index 66be039..79e0402 100644
--- a/src/storage/chewing_key.cpp
+++ b/src/storage/chewing_key.cpp
@@ -22,6 +22,7 @@
 #include "chewing_key.h"
 #include <assert.h>
 #include "pinyin_parser2.h"
+#include "zhuyin_parser2.h"
 #include "pinyin_parser_table.h"
 #include "zhuyin_table.h"
 
diff --git a/src/storage/pinyin_parser2.h b/src/storage/pinyin_parser2.h
index 0135409..b8d1d9b 100644
--- a/src/storage/pinyin_parser2.h
+++ b/src/storage/pinyin_parser2.h
@@ -78,15 +78,6 @@ typedef struct {
     const char * m_yunmu;
 } double_pinyin_scheme_fallback_item_t;
 
-typedef struct {
-    const char m_input;
-    const char * m_chewing;
-} zhuyin_symbol_item_t;
-
-typedef struct {
-    const char m_input;
-    const char m_tone;
-} zhuyin_tone_item_t;
 
 typedef GArray * ParseValueVector;
 
diff --git a/src/storage/zhuyin_parser2.h b/src/storage/zhuyin_parser2.h
index 313158d..52f606f 100644
--- a/src/storage/zhuyin_parser2.h
+++ b/src/storage/zhuyin_parser2.h
@@ -30,6 +30,17 @@
 
 namespace pinyin{
 
+typedef struct {
+    const char m_input;
+    const char * m_chewing;
+} zhuyin_symbol_item_t;
+
+typedef struct {
+    const char m_input;
+    const char m_tone;
+} zhuyin_tone_item_t;
+
+
 /**
  * ZhuyinParser2:
  *