rename namespace from novel to pinyin

12 files changed, 27 insertions, 25 deletions

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;  
diff --git a/src/storage/ngram.h b/src/storage/ngram.h
index 1afda82..5cc4ec5 100644
--- a/src/storage/ngram.h
+++ b/src/storage/ngram.h
@@ -24,7 +24,7 @@
 
 #include <db.h>
 
-namespace novel{
+namespace pinyin{
 
 class Bigram;
 
@@ -116,7 +116,7 @@ public:
 
 };
 
-using namespace novel;
+using namespace pinyin;
 
 
 #endif
diff --git a/src/storage/phrase_index.h b/src/storage/phrase_index.h
index 145d9c5..d7fd4bc 100755
--- a/src/storage/phrase_index.h
+++ b/src/storage/phrase_index.h
@@ -46,7 +46,7 @@
 
 class PinyinLookup;
 
-namespace novel{
+namespace pinyin{
 
 /* Because this is not large,
  * Store this in user home directory.
@@ -265,7 +265,7 @@ public:
  
 };
 
-using namespace novel;
+using namespace pinyin;
 
 
 
diff --git a/src/storage/phrase_large_table.cpp b/src/storage/phrase_large_table.cpp
index ad3262f..9c09abe 100644
--- a/src/storage/phrase_large_table.cpp
+++ b/src/storage/phrase_large_table.cpp
@@ -26,7 +26,7 @@
 
 /* class definition */
 
-namespace novel{
+namespace pinyin{
 
 class PhraseLengthIndexLevel{
 protected:
@@ -65,7 +65,7 @@ public:
 
 };
 
-using namespace novel;
+using namespace pinyin;
 
 /* class implementation */
 
diff --git a/src/storage/phrase_large_table.h b/src/storage/phrase_large_table.h
index 42eeec4..423c457 100644
--- a/src/storage/phrase_large_table.h
+++ b/src/storage/phrase_large_table.h
@@ -26,7 +26,7 @@
 #include "novel_types.h"
 #include "memory_chunk.h"
 
-namespace novel{
+namespace pinyin{
 
 const size_t PHRASE_Number_Of_Bitmap_Index = 1<<(sizeof(utf16_t) * 8);
 
@@ -106,6 +106,6 @@ public:
 
 };
 
-using namespace novel;
+using namespace pinyin;
 
 #endif
diff --git a/src/storage/pinyin_base.cpp b/src/storage/pinyin_base.cpp
index 66587f0..c12c7ba 100644
--- a/src/storage/pinyin_base.cpp
+++ b/src/storage/pinyin_base.cpp
@@ -1350,7 +1350,7 @@ PinyinShuangPinParser::get_scheme (PinyinInitial initial_map[27], PinyinFinal fi
     }
 }
 
-namespace novel{
+namespace pinyin{
 
 //////////////////////////////////////////////////////////////////////////////
 // implementation of PinyinKey comparision classe
diff --git a/src/storage/pinyin_base.h b/src/storage/pinyin_base.h
index 4e7489f..4c15454 100644
--- a/src/storage/pinyin_base.h
+++ b/src/storage/pinyin_base.h
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-namespace novel{
+namespace pinyin{
 
 // Predefinition of some classes and structs
 struct PinyinKey;
@@ -722,6 +722,6 @@ int pinyin_compare_tone (const PinyinCustomSettings &custom,
 			 PinyinTone rhs);
 };
 
-using namespace novel;
+using namespace pinyin;
 
 #endif
diff --git a/src/storage/pinyin_large_table.cpp b/src/storage/pinyin_large_table.cpp
index 0a1a8db..c098ece 100644
--- a/src/storage/pinyin_large_table.cpp
+++ b/src/storage/pinyin_large_table.cpp
@@ -29,7 +29,7 @@
 
 /* class definition */
 
-namespace novel{
+namespace pinyin{
 
 class PinyinLengthIndexLevel{
 protected:
@@ -71,7 +71,7 @@ public:
 
 };
 
-using namespace novel;
+using namespace pinyin;
 
 /* class implementation */
 
diff --git a/src/storage/pinyin_large_table.h b/src/storage/pinyin_large_table.h
index 6e8bb85..83f4de9 100755
--- a/src/storage/pinyin_large_table.h
+++ b/src/storage/pinyin_large_table.h
@@ -26,7 +26,7 @@
 #include "novel_types.h"
 #include "memory_chunk.h"
 
-namespace novel{
+namespace pinyin{
 
 /* Because this is not large,
  * Store this in user home directory.
@@ -134,5 +134,5 @@ public:
 
 };
 
-using namespace novel;
+using namespace pinyin;
 #endif
diff --git a/src/storage/pinyin_phrase.h b/src/storage/pinyin_phrase.h
index 1902f23..cbcb742 100644
--- a/src/storage/pinyin_phrase.h
+++ b/src/storage/pinyin_phrase.h
@@ -25,7 +25,7 @@
 #include <string.h>
 #include "stl_lite.h"
 
-namespace novel{
+namespace pinyin{
 
 /*
 static inline int pinyin_utility_sign(int value){
@@ -294,6 +294,6 @@ class PhraseExactLessThanWithToken
 
 };
 
-using namespace novel;
+using namespace pinyin;
 
 #endif