summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2013-10-15 11:07:57 +0800
committerPeng Wu <alexepico@gmail.com>2013-10-15 11:07:57 +0800
commitf9c37981048738ca06b541e8de90cd346ae26fc0 (patch)
tree8451a3c2acad49a373a10286b53aa7b670619c61
parentef08572dbc39d4c5c4ebe264828da93e5f01b23c (diff)
downloadlibzhuyin-f9c37981048738ca06b541e8de90cd346ae26fc0.tar.gz
libzhuyin-f9c37981048738ca06b541e8de90cd346ae26fc0.tar.xz
libzhuyin-f9c37981048738ca06b541e8de90cd346ae26fc0.zip
rename PinyinScheme to FullPinyinScheme
-rw-r--r--src/storage/chewing_key.h2
-rw-r--r--src/storage/pinyin_custom2.h2
-rw-r--r--src/storage/pinyin_parser2.cpp4
-rw-r--r--src/storage/pinyin_parser2.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/storage/chewing_key.h b/src/storage/chewing_key.h
index a043404..9e115c4 100644
--- a/src/storage/chewing_key.h
+++ b/src/storage/chewing_key.h
@@ -66,7 +66,7 @@ public:
gint get_table_index();
/* Note: the return value should be freed by g_free. */
- gchar * get_pinyin_string(PinyinScheme scheme = PINYIN_DEFAULT);
+ gchar * get_pinyin_string(FullPinyinScheme scheme = PINYIN_DEFAULT);
gchar * get_bopomofo_string();
};
diff --git a/src/storage/pinyin_custom2.h b/src/storage/pinyin_custom2.h
index 2c72260..306be05 100644
--- a/src/storage/pinyin_custom2.h
+++ b/src/storage/pinyin_custom2.h
@@ -65,7 +65,7 @@ enum PinyinAmbiguity2{
* @brief enums of Pinyin Schemes.
*/
-enum PinyinScheme
+enum FullPinyinScheme
{
PINYIN_HANYU = 1,
PINYIN_LUOMA = 2,
diff --git a/src/storage/pinyin_parser2.cpp b/src/storage/pinyin_parser2.cpp
index d6fd8a6..0d5977e 100644
--- a/src/storage/pinyin_parser2.cpp
+++ b/src/storage/pinyin_parser2.cpp
@@ -91,7 +91,7 @@ gint _ChewingKey::get_table_index() {
return index == -1 ? 0 : index;
}
-gchar * _ChewingKey::get_pinyin_string(PinyinScheme scheme) {
+gchar * _ChewingKey::get_pinyin_string(FullPinyinScheme scheme) {
assert(m_tone < CHEWING_NUMBER_OF_TONES);
gint index = get_table_index();
assert(index < (int) G_N_ELEMENTS(content_table));
@@ -424,7 +424,7 @@ int FullPinyinParser2::final_step(size_t step_len, ChewingKeyVector & keys,
return parsed_len;
}
-bool FullPinyinParser2::set_scheme(PinyinScheme scheme){
+bool FullPinyinParser2::set_scheme(FullPinyinScheme scheme){
switch(scheme){
case PINYIN_HANYU:
m_pinyin_index = hanyu_pinyin_index;
diff --git a/src/storage/pinyin_parser2.h b/src/storage/pinyin_parser2.h
index df693f9..f90c0e9 100644
--- a/src/storage/pinyin_parser2.h
+++ b/src/storage/pinyin_parser2.h
@@ -142,7 +142,7 @@ public:
virtual int parse(pinyin_option_t options, ChewingKeyVector & keys, ChewingKeyRestVector & key_rests, const char *str, int len) const;
public:
- bool set_scheme(PinyinScheme scheme);
+ bool set_scheme(FullPinyinScheme scheme);
};