From 4ce3b364ccd464d270266bb3f7a723a8acf1b055 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 31 Mar 2011 11:09:21 +0800 Subject: rename namespace from novel to pinyin --- src/lookup/lookup.h | 4 +++- src/lookup/phrase_lookup.h | 6 +++--- src/lookup/pinyin_lookup.h | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src/lookup') diff --git a/src/lookup/lookup.h b/src/lookup/lookup.h index 8832fbc..6672b08 100644 --- a/src/lookup/lookup.h +++ b/src/lookup/lookup.h @@ -45,13 +45,15 @@ struct lookup_value_t{ typedef GArray * MatchResults; /* Array of phrase_token_t */ -namespace novel{ +namespace pinyin{ class PinyinLargeTable; class PhraseLargeTable; class FacadePhraseIndex; class Bigram; }; +using namespace pinyin; + /* Note: * LookupStepIndex: * the main purpose of lookup step index is served for an index diff --git a/src/lookup/phrase_lookup.h b/src/lookup/phrase_lookup.h index b4c43d2..254ab44 100644 --- a/src/lookup/phrase_lookup.h +++ b/src/lookup/phrase_lookup.h @@ -37,9 +37,9 @@ private: PhraseItem m_cache_phrase_item; protected: //saved varibles - novel::PhraseLargeTable * m_phrase_table; - novel::FacadePhraseIndex * m_phrase_index; - novel::Bigram * m_bigram; + PhraseLargeTable * m_phrase_table; + FacadePhraseIndex * m_phrase_index; + Bigram * m_bigram; //internal step data structure GPtrArray * m_steps_index; diff --git a/src/lookup/pinyin_lookup.h b/src/lookup/pinyin_lookup.h index c95d16d..1ff1f9f 100644 --- a/src/lookup/pinyin_lookup.h +++ b/src/lookup/pinyin_lookup.h @@ -85,10 +85,10 @@ protected: CandidateConstraints m_constraints; PinyinKeyVector m_keys; - novel::PinyinLargeTable * m_pinyin_table; - novel::FacadePhraseIndex * m_phrase_index; - novel::PinyinCustomSettings * m_custom; - novel::Bigram * m_bigram; + PinyinLargeTable * m_pinyin_table; + FacadePhraseIndex * m_phrase_index; + PinyinCustomSettings * m_custom; + Bigram * m_bigram; //internal step data structure GPtrArray * m_steps_index; -- cgit