summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2016-01-08 12:46:17 +0800
committerPeng Wu <alexepico@gmail.com>2016-01-08 12:46:17 +0800
commit1df99e805cb16bc8f9b46e1a45ea7e0eecb0aeff (patch)
tree4b6fbbecdacd769893c054cc70a5f4dda9369070
parent2952fef39edfd345905bee53460c3d2737a489dc (diff)
downloadlibpinyin-1df99e805cb16bc8f9b46e1a45ea7e0eecb0aeff.tar.gz
libpinyin-1df99e805cb16bc8f9b46e1a45ea7e0eecb0aeff.tar.xz
libpinyin-1df99e805cb16bc8f9b46e1a45ea7e0eecb0aeff.zip
use zhuyin_parser2.h
-rw-r--r--src/pinyin_internal.h1
-rw-r--r--src/storage/Makefile.am1
-rw-r--r--src/storage/pinyin_parser2.cpp1
-rw-r--r--src/storage/zhuyin_parser2.cpp2
-rw-r--r--src/storage/zhuyin_parser2.h2
-rw-r--r--tests/storage/test_parser2.cpp1
6 files changed, 5 insertions, 3 deletions
diff --git a/src/pinyin_internal.h b/src/pinyin_internal.h
index f789b43..c260f7c 100644
--- a/src/pinyin_internal.h
+++ b/src/pinyin_internal.h
@@ -29,6 +29,7 @@
#include "pinyin_custom2.h"
#include "chewing_key.h"
#include "pinyin_parser2.h"
+#include "zhuyin_parser2.h"
#include "pinyin_phrase2.h"
#include "pinyin_phrase3.h"
#include "chewing_large_table.h"
diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am
index 032459e..f96239d 100644
--- a/src/storage/Makefile.am
+++ b/src/storage/Makefile.am
@@ -27,6 +27,7 @@ libpinyininclude_HEADERS= pinyin_custom2.h
noinst_HEADERS = chewing_enum.h \
chewing_key.h \
pinyin_parser2.h \
+ zhuyin_parser2.h \
phrase_index.h \
phrase_index_logger.h \
phrase_large_table2.h \
diff --git a/src/storage/pinyin_parser2.cpp b/src/storage/pinyin_parser2.cpp
index c45e6e3..9425b6f 100644
--- a/src/storage/pinyin_parser2.cpp
+++ b/src/storage/pinyin_parser2.cpp
@@ -32,7 +32,6 @@
#include "chewing_key.h"
#include "pinyin_parser_table.h"
#include "double_pinyin_table.h"
-#include "zhuyin_table.h"
using namespace pinyin;
diff --git a/src/storage/zhuyin_parser2.cpp b/src/storage/zhuyin_parser2.cpp
index 847fc3f..584266b 100644
--- a/src/storage/zhuyin_parser2.cpp
+++ b/src/storage/zhuyin_parser2.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "pinyin_parser2.h"
+#include "zhuyin_parser2.h"
#include <ctype.h>
#include <assert.h>
#include <stdio.h>
diff --git a/src/storage/zhuyin_parser2.h b/src/storage/zhuyin_parser2.h
index 69108be..313158d 100644
--- a/src/storage/zhuyin_parser2.h
+++ b/src/storage/zhuyin_parser2.h
@@ -28,7 +28,7 @@
#include "pinyin_custom2.h"
#include "pinyin_parser2.h"
-namespace zhuyin{
+namespace pinyin{
/**
* ZhuyinParser2:
diff --git a/tests/storage/test_parser2.cpp b/tests/storage/test_parser2.cpp
index a9a34e8..8427ae8 100644
--- a/tests/storage/test_parser2.cpp
+++ b/tests/storage/test_parser2.cpp
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <string.h>
#include "pinyin_parser2.h"
+#include "zhuyin_parser2.h"
static const gchar * parsername = "";